yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,171 Commits 4 Branches 7 Tags
ac8a0ddc58f7d85d71c19ed7cb132d399673f291
Commit Graph

20171 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
ac8a0ddc58 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-08 23:52:23 +02:00
Sebastiaan Janssen
406a206b03 Apparently we still have a node_modules folder, but no more xslt folder though! 2017-09-08 23:50:15 +02:00
Sebastiaan Janssen
e7fc252f4c Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-08 23:29:58 +02:00
Sebastiaan Janssen
55e0af118a Weirdly this errored out on 7.7 with a "Task 'cli' is not in your gulpfile" error.. 
not sure why this exact same file works in this branch
 2017-09-08 23:29:16 +02:00
Sebastiaan Janssen
c66a763406 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-08 18:58:48 +02:00
Sebastiaan Janssen
718ed19fb9 Forgot to remove this.. Seb is getting tired! 2017-09-08 15:05:15 +02:00
Sebastiaan Janssen
32999b7e19 Correction, we don't need this file after all :-) 2017-09-08 14:58:50 +02:00
Sebastiaan Janssen
ce63251206 Adds missing file to gulp build 2017-09-08 14:53:33 +02:00
Sebastiaan Janssen
7b641f4771 Adds missing files for the build server 2017-09-08 14:45:00 +02:00
Sebastiaan Janssen
708d060c3b Fix up BuildBelle.bat 2017-09-08 14:12:54 +02:00
Sebastiaan Janssen
e254dddbd4 Copy the js and lib files from the correct directories 2017-09-08 14:12:54 +02:00
Sebastiaan Janssen
87c2c5455c We don't have node_modules in this directory any more 2017-09-08 14:12:54 +02:00
Sebastiaan Janssen
8544aa685b VS loves managing whitespace.. go ahead then 2017-09-08 14:12:53 +02:00
Sebastiaan Janssen
09c23e93c2 Looks for the build output app.js to determine if we need to call BuildBelle.bat 2017-09-08 14:12:53 +02:00
Sebastiaan Janssen
9946d36d00 Ignore npm-debug.log 2017-09-08 14:12:53 +02:00
Sebastiaan Janssen
7012633fdd Install gulp before gulp-cli 2017-09-08 14:12:53 +02:00
Claus
6e348a3a1a Merge branch 'HarveyWilliams-patch-4' into dev-v7 2017-09-08 13:59:35 +02:00
Claus
733c920867 using string.replace instead of regex. 
adding unit test.
 2017-09-08 13:57:28 +02:00
Mads Rasmussen
35fc997d9f fix stylesheets for canvas designer/preview 2017-09-08 13:13:26 +02:00
Claus
921e8a2529 Merge pull request #2180 from umbraco/temp-U4-10392 
U4-10392 Culture and hostnames with special characters can register a…
 2017-09-08 11:27:25 +02:00
Claus
22bd6cd989 U4-10392 Culture and hostnames with special characters can register as collisions 2017-09-08 11:25:41 +02:00
Shannon
5398d24f58 disables deleting translator group 2017-09-08 16:07:58 +10:00
Shannon
d06c92d249 fixes send to translate to lookup the translate group by the correct alias 2017-09-08 16:00:04 +10:00
Shannon
719d520a82 null check for change password 2017-09-08 15:59:35 +10:00
Shannon
75ace2b162 Fixes deleting a template - uses the correct way to delete stuff with angular and not relying on legacy code 2017-09-08 15:45:10 +10:00
Shannon
38c961209e Ensure the user's administratively reset password doesn't get re-shown in the UI - that was based on an actual password reset 2017-09-08 13:48:32 +10:00
Shannon
c39e1175fd Fixes up some more password changing quirks 2017-09-08 13:43:38 +10:00
Shannon
1d5348763d Fixes up invite message, fixes reset password quirk, ensures password values are cleared after changing password, ensures that the confirm password value is not posted to the server 2017-09-08 13:15:03 +10:00
Shannon
3c6ab8d34f Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-08 12:49:36 +10:00
Shannon
0713f12ba6 makes new classes internal 2017-09-08 12:02:20 +10:00
Shannon
8981fd23a8 makes new classes internal 2017-09-08 11:41:49 +10:00
Shannon
ab3407a1aa Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
#	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
 2017-09-08 11:31:04 +10:00
Sebastiaan Janssen
dad4eafebd Enable RDP to figure out gulp build problem 2017-09-07 22:25:45 +02:00
Mads Rasmussen
96c9ecbdd7 fix calc functions 2017-09-07 21:39:41 +02:00
Sebastiaan Janssen
e7e04de22e Merge pull request #2179 from umbraco/temp-dperfs 
deploy-383 - dperfs
 2017-09-07 20:46:31 +02:00
Sebastiaan Janssen
7003ef8d26 Remove circular dependency 2017-09-07 20:42:26 +02:00
Mads Rasmussen
a5c78f6325 fix bower.json after merge - copy correct clipboard.js file 2017-09-07 20:27:52 +02:00
Shannon
6ea92daa70 fixes merge removes unused file 2017-09-07 23:03:01 +10:00
Shannon
65ece33ca9 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Models/UmbracoObjectTypes.cs
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/gruntFile.js
#	src/Umbraco.Web.UI.Client/src/installer/_module.js
#	src/Umbraco.Web.UI.Client/test/config/karma.conf.js
 2017-09-07 22:43:03 +10:00
Shannon Deminick
85758011b5 Merge pull request #2140 from umbraco/temp-U4-10268_2 
U4-10268 7.7 Beta - Changing password should be safe by default
 2017-09-07 22:38:45 +10:00
Shannon Deminick
49a48bbfce Merge pull request #2169 from umbraco/temp-deploy-391 
deploy-391 - allow for id reservation
 2017-09-07 22:35:21 +10:00
Warren Buckley
663d9fcfe8 Merge pull request #2075 from defsteph/U4-10197 
U4-10197 Added missing translations for Swedish
 2017-09-07 13:33:55 +01:00
Stephan
d6f8b878d2 perfs - cleanup 2017-09-07 13:45:56 +02:00
Stephan
b02b2a61f0 perfs - deploy context isCancelled 2017-09-07 12:44:08 +02:00
Claus
60f7211a80 Merge branch 'patch-4' of git://github.com/HarveyWilliams/Umbraco-CMS into HarveyWilliams-patch-4 2017-09-07 10:36:49 +02:00
Sebastiaan Janssen
56dc10a4f7 Merge pull request #2158 from umbraco/temp-gulp-spike 
U4-10261 Change frontend build setup from grunt to gulp
 2017-09-06 23:52:48 +02:00
Stephan
dbda6689b6 perfs - suspendable 2017-09-06 18:50:54 +02:00
Stephan
8d6c8ef282 perfs - support LocalDb 2017-09-06 18:50:41 +02:00
Warren Buckley
df8c75438a Merge pull request #2168 from ronaldbarendse/U4-9374 
U4-9374 Navigation panel header and editor panel header don't line up properly in Firefox
 2017-09-06 12:37:45 +01:00
Warren Buckley
2d53da55a7 Merge pull request #2173 from tomfulton/u4-8886-2 
U4-8886 - TinyMCE - highlight media picker toolbar icon when image selected
 2017-09-06 12:25:01 +01:00