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

5275 Commits

Author SHA1 Message Date
Bjarne Fyrstenborg
17abd53b1b More localization of labels 2017-09-23 02:10:08 +02:00
Bjarne Fyrstenborg
202a3e10b5 Localize cancel link in dialog 2017-09-22 23:30:07 +02:00
Bjarne Fyrstenborg
925f64c79d Localize "select user group" dialog heading 2017-09-22 23:26:09 +02:00
Bjarne Fyrstenborg
c28e5f4d55 Localize user group delete button 2017-09-22 23:25:19 +02:00
Bjarne Fyrstenborg
439c460220 Localize user management heading 2017-09-22 23:12:33 +02:00
Sebastiaan Janssen
9c0500325d Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-09-19 14:23:26 +02:00
Sebastiaan Janssen
018a066f86 U4-10428 Can't drag Image in Image Cropper (in Umbraco 7.6.7) 2017-09-19 14:10:20 +02:00
Sebastiaan Janssen
d0e99bf5d9 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-18 22:31:20 +02:00
Sebastiaan Janssen
c321d6dd44 Adds files missing from build output 2017-09-18 16:52:43 +02:00
Sebastiaan Janssen
3efba6b576 Update title of preview window 2017-09-15 13:52:26 +02:00
Sebastiaan Janssen
3803785569 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-15 13:51:23 +02:00
Sebastiaan Janssen
54407a66a4 Fixes canvas designer 2017-09-15 13:50:43 +02:00
Sebastiaan Janssen
3f82781c0f Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-14 16:15:43 +02:00
Sebastiaan Janssen
bca46f11ad Makes the sort order input same size as the one on tabs 2017-09-14 16:11:23 +02:00
Warren Buckley
a86b8f786d Merge pull request #1817 from marcemarc/temp-U4-6738 
Relates to Issue U4-6738 - Allow viewing/sorting of composition properties.
 2017-09-14 14:55:48 +01:00
Warren Buckley
ac3eaf43cb Forgot to revert the logic for the extra button/label click to show the sort order on properties 2017-09-14 14:16:47 +01:00
Robert
f6d4170010 Merge pull request #1633 from bjarnef/dev-v7-U4-9149 
fixes: U4-9149 - Fix z-index of focal point
 2017-09-14 15:15:51 +02:00
Warren Buckley
2b0ea45da9 Remove the extra button/click in the UI & show the property sortOrder value when we are sorting 2017-09-14 14:13:42 +01:00
Warren Buckley
07d05c9e0d Revert "toggle the show ordinals label button to hide, when in show ordinal mode" 
This reverts commit 51215f11af.
 2017-09-14 14:09:00 +01:00
Mads Rasmussen
9c2b0a3ef6 fixes: U4-10413 Composition/Reorder bar gets in the way when editing or adding a property 2017-09-14 11:04:34 +02:00
Stephan
058ad9f99a Merge branch 'dev-v7.7' into temp-U4-10401 2017-09-13 12:12:10 +02:00
Sebastiaan Janssen
83f08538c2 U4-10407 We should log unhandled exceptions that occur in webapi controllers and always have detailed errors returned to users even when not in debug mode 
# Conflicts:
#	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
 2017-09-13 12:05:02 +02:00
Shannon
7a71f64978 U4-10407 We should log unhandled exceptions that occur in webapi controllers and always have detailed errors returned to users even when not in debug mode 2017-09-12 21:54:55 +10:00
Sebastiaan Janssen
14ff7cbcc7 Comment out tests that are described in the file not to be working - so build server doesn't fail 2017-09-12 12:18:06 +02:00
Robert
8269203a47 Added missing "$" and missing rename icon to the DataTypeTreeController 2017-09-12 09:35:15 +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
Robert
9fd0e7771d Rename logic in place 2017-09-12 08:28:18 +02:00
Shannon
65b44137d4 Fixes JS unit test runner 2017-09-12 16:02:40 +10: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
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
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
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
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
34e3257ddb Ignore failing unit tests to check if VSTS will continue 2017-09-09 15:54:24 +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
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
Mads Rasmussen
35fc997d9f fix stylesheets for canvas designer/preview 2017-09-08 13:13:26 +02:00
Shannon
5398d24f58 disables deleting translator group 2017-09-08 16:07:58 +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
7ae95e31a1 Ensures the root node is not shown in the copy/media dialogs for content/media when start ndoes are assigned, fixes entity searching since there was js errors (maybe from a bad merge) 2017-09-08 15:16:13 +10:00
Shannon
858c21c79f Ensures Content header node isn't shown in copy/move dialogs when the user has a start node set that is not the root 2017-09-08 14:28:18 +10:00