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

20888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
63343d89de Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-12 09:05:28 +02:00
Sebastiaan Janssen
1c5e2b5f73 No need for UmbracoBuild=True - the build scripts already manually build Belle once, this would just cause it to run again during MSBuild 2017-09-12 09:02:57 +02:00
Sebastiaan Janssen
26cce02984 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Web.UI.Client/test/config/karma.conf.js
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-09-12 08:52:10 +02:00
Sebastiaan Janssen
30af8cb928 Only build Belle when UmbracoBuild is set (from powershell input), lib folder doesn't exist or on rebuild 2017-09-12 08:47:36 +02:00
Robert
9fd0e7771d Rename logic in place 2017-09-12 08:28:18 +02:00
Shannon
68a30c3906 fixes issue when referencing a key that doesn't exist 2017-09-12 16:25:12 +10:00
Shannon
65b44137d4 Fixes JS unit test runner 2017-09-12 16:02:40 +10:00
Shannon
81155c2ff8 collate is not supported in sqlce 2017-09-12 15:24:17 +10:00
Shannon
59afcd8be7 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-12 13:38:34 +10:00
Shannon Deminick
41eeb38c5f Merge pull request #2043 from umbraco/TEMP-u4-10135 
Added TruncateByWords method + overloads
 2017-09-12 13:36:00 +10:00
Shannon
4356d3f94a publicizes class, fixes up some naming and removes unneeded DirectoryInfo allocations 2017-09-12 13:30:57 +10:00
Shannon Deminick
ba072aec7c Merge pull request #2183 from umbraco/temp-U4-10400 
U4-10400 Clear CDF temp files during upgrades
 2017-09-12 13:26:41 +10:00
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
Sebastiaan Janssen
c55cf75ada Use HttpContext from the controller 2017-09-11 13:30:06 +02:00
Mads Rasmussen
fb60647b5a fix failing unit test: fix karma syntax for spyOn 2017-09-11 12:55:46 +02:00
Sebastiaan Janssen
23950c0cac U4-10400 Clear CDF temp files during upgrades 2017-09-11 12:22:38 +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