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

20254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
68f1120b4f U4-10118 Umbraco.Core.IO.FileSystemProviderManager is simply not testable and cannot be properly used or setup in tests 2017-09-12 13:18:34 +10:00
Shannon
b884bed7cf updates db migrations to deal with very rare/old existing tables and indexes along with dealing with non standard collations 2017-09-12 12:43:21 +10:00
Shannon
1f083ca21c removes the Belle build stuff from the csproj 2017-09-12 12:41:39 +10:00
Shannon
b9ecb7e1d8 updates the upgrade nuget readme 2017-09-12 11:43:54 +10:00
Sebastiaan Janssen
ad8ef56920 Update version 2017-09-11 16:27:43 +02:00
Sebastiaan Janssen
1ff352ddc4 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-11 16:24:44 +02:00
Sebastiaan Janssen
f1d3b1a6d3 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2017-09-11 16:23:08 +02:00
Sebastiaan Janssen
45f9919e57 Don't include pdb files in the built zip files 2017-09-11 16:21:51 +02:00
Sebastiaan Janssen
3275f03aff Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	.gitignore
#	build/UmbracoVersion.txt
#	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-09-11 15:46:54 +02:00
Sebastiaan Janssen
857b7cc608 Merge pull request #2003 from umbraco/temp-u4-10006 
U4-10006 - VSTS/PS migration
 2017-09-11 15:43:50 +02:00
Sebastiaan Janssen
c23160f915 Merge remote-tracking branch 'origin/dev-v7' into temp-u4-10006 
# Conflicts:
#	src/Umbraco.Web.UI.Client/test/unit/app/content/edit-content-controller.spec.js
#	src/Umbraco.Web.UI.Client/test/unit/app/media/edit-media-controller.spec.js
#	src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/content-picker-controller.spec.js
#	src/Umbraco.Web.UI.Client/test/unit/common/services/content-factory.spec.js
 2017-09-11 15:08:15 +02:00
Mads Rasmussen
3e3a180fe4 found better check for unit test fixes 2017-09-11 14:35:17 +02:00
Mads Rasmussen
fb60647b5a fix failing unit test: fix karma syntax for spyOn 2017-09-11 12:55:46 +02:00
Shannon
d808438288 moves the rename menu item above delete (shouldn't be last) 2017-09-11 20:03:50 +10:00
Shannon
909319184c adds null check during folder rename 2017-09-11 19:51:28 +10:00
Claus
082e399293 Merge pull request #1215 from IurieM/Add-error-calback-handler-for-unpublish-even-in-contetn.edit.controller 
Add error callback handler for unpublish event in content.edit.controller
 2017-09-11 11:51:09 +02:00
Robert
026e46cec0 Merge pull request #2166 from umbraco/lars-erik-U4-7580-rename-containers 
Make U4-7580 (DocTypes/MediaTypes folder re-nameable feature) work with Deploy
 2017-09-11 11:19:30 +02:00
Shannon
7e794dd021 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-11 19:14:01 +10:00
Shannon
0b14f255d2 syncs more translation bits 2017-09-11 19:00:11 +10:00
Mads Rasmussen
c4ab25f1ac fixing first round of unit tests 2017-09-11 10:50:54 +02:00
Shannon
e6edaf1c3a Merge branch 'dev-v7.7' of https://github.com/umbraco/Umbraco-CMS into dev-v7.7 2017-09-11 18:44:17 +10:00
Shannon
c4810ba45a fixes quirk with change password directive and new members - fixes merge issue where the controller for the directive was cleared 2017-09-11 18:44:02 +10:00
Mads Rasmussen
b669741adb fixes missing language keys in invite user 2017-09-11 10:26:44 +02:00
Shannon
c232fa2add fixes tree header localization for the default (US) language, was missing partial views 2017-09-11 16:34:29 +10:00
Mads Rasmussen
29f3acc23e Merge pull request #2163 from umbraco/temp-U4-10275 
U4-10275 Render 'site' nodes for the content/media trees for users with non root access
 2017-09-10 18:04:59 +02:00
Sebastiaan Janssen
3f55abaf59 Create directories only when they don't exist 2017-09-09 16:48:13 +02:00
Sebastiaan Janssen
001e15f83c Documentation build goes through gulp now too 2017-09-09 16:41:02 +02:00
Sebastiaan Janssen
34e3257ddb Ignore failing unit tests to check if VSTS will continue 2017-09-09 15:54:24 +02:00
Sebastiaan Janssen
2b64cfb4b9 Update with the new gulp build 2017-09-09 15:15:56 +02:00
Sebastiaan Janssen
a499744084 Move BUILD.md to root, adds build.bat 2017-09-09 15:09:34 +02:00
Sebastiaan Janssen
c72ecda18c VS is always install in {major}.0 - currently so when running 15.3, don't use the minor version in the path 2017-09-09 15:08:08 +02:00
Sebastiaan Janssen
3423d8b2cc Merge branch 'dev-v7' into temp-u4-10006 
# Conflicts:
#	.gitignore
#	build/Build.bat
#	build/Build.proj
#	build/BuildBelle.bat
#	build/UmbracoVersion.txt
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-09-09 14:54:48 +02:00
Sebastiaan Janssen
e6bf4e6c69 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-09 00:02:36 +02:00
Sebastiaan Janssen
37c4fc5f74 Don't try to remove directories that don't exist 2017-09-09 00:02:08 +02:00
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