yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,400 Commits 4 Branches 7 Tags
8ba319b9d9ad5347a13bc4b83bb6a9966aec32a4
Commit Graph

24400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Warren
8ba319b9d9 Fix up syntax error in JS from my merge/port upto V8 - oops :( 2018-08-08 12:53:23 +01:00
Warren
fc7c2523c2 Merge branch 'dev-v7' into temp8 (The small fixes that Shan suggested) 
# Conflicts:
#	src/Umbraco.Web/Editors/ContentController.cs
 2018-08-08 09:21:58 +01:00
Warren
7397541259 Minor fixes to notification dialog after some feedback from Shan when merging this up into V8 2018-08-08 09:04:09 +01:00
Warren
6372d393ee Merge branch 'dev-v7' into temp8 == Shan or Stephan please review this ! 
* Contains a change to work with V8 - content.notify.controller sends a string array
* C# ContentController methods reworked to newer services available & API POST is model bound to string array

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorsettings/editorsettings.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/dialogs/notifications.aspx
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.designer.cs
 2018-08-07 15:48:21 +01:00
Warren Buckley
abb88f20f9 Merge pull request #2839 from MMasey/U4-10801 
U4-10801 - Fix label UI bug and update Notification Settings UI to angular take 2.
 2018-08-07 11:00:55 +01:00
Warren
7c9652d966 Minor changes to controller methods 
* Renamed from SetNotificationOptions to PostNotificationsOptions
* Ditch CMSNode in the Get method - as we can use the content.path instead
* Use newer ActionsResolver instead of legacy BusinessLogic for getting Actions
 2018-08-07 10:36:09 +01:00
Warren
65571f4ee2 Change endpoint name to be inline with others prefixing with Post in the Controller method 2018-08-07 10:34:03 +01:00
Warren Buckley
5e01da2013 Merge pull request #2838 from umbraco/temp8-bye-umbraco_client 
Bye umbraco_client
 2018-08-07 10:09:36 +01:00
Warren Buckley
b0756b0b0e Fix typo selectedSting to selectedString 2018-08-07 09:24:59 +01:00
Warren Buckley
b4de7fd64a Removes unused dependancies notificationService & localizationService 2018-08-07 09:23:45 +01:00
Warren Buckley
1f1a4ac15c Remove 64Bit IISExpress config in CSProj 2018-08-07 09:16:36 +01:00
Warren
f0fb66be7d Fix unit test - One less Action class as Aduit has been removed from the context menu as its now part of the info tab on a content node 2018-08-07 08:58:36 +01:00
Mike
2b6c6b3022 http://issues.umbraco.org/issue/U4-10801 
Fixes label ui issue on template editor ui.

Updated notification settings ui to use angular instead of web forms.
 2018-08-06 19:52:29 +01:00
Warren
ef5fc2e7b2 Add back in bundle control - seems to fix up Macro Editor 2018-08-06 13:05:07 +01:00
Warren
a242d13bb9 Fix up missing .aspx tag control reference for ProtectPage dialog 2018-08-06 12:24:43 +01:00
Warren
2fb6588160 Fixes some YSODs with older dialogs 2018-08-06 12:21:31 +01:00
Warren
dd63ff850c Remove test paths to umbraco_client - makes no sense to test for this path as it no longer exists 2018-08-06 11:54:07 +01:00
Warren
4730ee317b Removes some unused .aspx files for dictionary editing - no longer needed as we now have this in Angular 2018-08-06 11:52:12 +01:00
Robert
398c75ca4d Merge pull request #2833 from umbraco/temp8-126 
fixes: Update UI on the dictionary editor to match V8 styles
 2018-08-06 11:04:20 +02:00
Warren Buckley
4b2ddbdbdd Merge pull request #2832 from umbraco/temp-92 
fixes temp-92: Code editing: Convert overlays into infinite editors
 2018-08-06 09:54:58 +01:00
Sebastiaan Janssen
5e9f73b114 Merge pull request #2837 from umbraco/temp-U4-11554 
Changed the Danish language file - added the Dictionary title
 2018-08-06 10:51:23 +02:00
Mads Rasmussen
85b18eec05 only allow to open template if user has access to settings section 2018-08-06 10:47:20 +02:00
elitsa
fc7db11c6c Changed the Danish language file - added the Dictionary title 2018-08-06 10:45:51 +02:00
Mads Rasmussen
41f5d7d113 This treeSync code doesn't work and I don't know why 2018-08-03 11:17:48 +02:00
Mads Rasmussen
18e0eda7d3 Merge branch 'temp8-bye-umbraco_client' of https://github.com/umbraco/Umbraco-CMS into temp8-bye-umbraco_client 2018-08-03 10:52:24 +02:00
Mads Rasmussen
85938e5432 fix sorting of root nodes 2018-08-03 10:52:09 +02:00
Warren
733fb7ed33 Merge branch 'temp8-bye-umbraco_client' of https://github.com/umbraco/Umbraco-CMS into temp8-bye-umbraco_client 2018-08-03 09:26:29 +01:00
Warren
237fcbead6 Last of the umbraco_client files removed 2018-08-03 09:25:33 +01:00
Mads Rasmussen
ad12026e29 add sorting for media 2018-08-03 10:24:44 +02:00
Warren
7f5d22b587 Adds in the email notification service taken from the old sorter WebService to use in the ContentEditor Controller 2018-08-03 08:35:01 +01:00
Warren
01a2988737 Tablesorting 3rd party lib is removed 2018-08-02 20:33:38 +01:00
Mads Rasmussen
8177d08df2 add sort by table headings 2018-08-02 20:59:55 +02:00
Mads Rasmussen
1e5db34679 add empty state and error handling for save 2018-08-02 19:22:17 +02:00
Mads Rasmussen
23c86ecc4a forgot the parentId was still in use 2018-08-02 17:37:29 +02:00
Mads Rasmussen
3dff904264 get children from the current node id and not the parent 2018-08-02 17:15:26 +02:00
Mads Rasmussen
f12091df5d Merge branch 'temp8-bye-umbraco_client' of https://github.com/umbraco/Umbraco-CMS into temp8-bye-umbraco_client 2018-08-02 17:10:06 +02:00
Mads Rasmussen
2b25de4ae6 save sort order 2018-08-02 16:17:53 +02:00
Warren
b0ca59b0ab OLD sort dialog.aspx & its JS assets from umbraco_client have vanished into thin air 2018-08-02 15:05:18 +01:00
Mads Rasmussen
0ea7bdfe7b get children for sort dialog 2018-08-02 15:51:41 +02:00
Warren
043437b725 Revert "Adds in new API endpoint in Content Editor - GetContentSortOrder (same logic & SortNode class from the WebService) - this may need to change depending on JSON structure required" 
This reverts commit 67b348df92.
 2018-08-02 14:45:31 +01:00
Warren
67b348df92 Adds in new API endpoint in Content Editor - GetContentSortOrder (same logic & SortNode class from the WebService) - this may need to change depending on JSON structure required 2018-08-02 14:25:46 +01:00
Warren
fee48e9dee To get the build to work - need to push these commented out classes for now that reference MenuButton (I think EditMacro, EditPackage & EditDictionaryItem) are no longer loaded this way AFAIK but I need to check 2018-08-02 14:06:05 +01:00
Warren
6967ed1846 Adds in Sort Angular dialog from Mads & removes some of the old sort dialog parts 2018-08-02 13:52:13 +01:00
Sebastiaan Janssen
af46e1a549 Merge pull request #2834 from andiih/TourWording 
Tour Step 7 Wording
 2018-08-02 14:45:54 +02:00
Andy Hawken (SP4)
afa27ce872 Tour Step 7 Wording 
Change wording of tour step 7 to "Now click on" to indicate that clicking on the avatar is a step in the tour, rather than a description of what it does at runtime
 2018-08-02 13:34:30 +01:00
Warren
08991dc98c Removes old modal js lib & references 2018-08-02 11:58:10 +01:00
Warren
c0ccc79604 Remove another AssignDomain dialog & Punycode lib which was only used in AssignDomain2 dialog 2018-08-02 11:36:13 +01:00
Warren
b59c7d8af6 Remove AssignDomain JS & CSS assets from umbraco_client 2018-08-02 11:33:14 +01:00
Warren
1b20f0be0d Scaffold HTML & Angular Controller to put in a UI (Probably with some help from Mads) 2018-08-02 11:16:31 +01:00
Sebastiaan Janssen
89bdbf500e Revert "Fixed issue with creating doctypes & templated with an Ampersand : http://issues.umbraco.org/issue/U4-11550 (#2828)" 
Revert "We need to create the template from it's alias, which is the safeAlias, which is the correct filename"
This reverts commit 9663cfde82 and commit 11aea0f515
 2018-08-02 11:48:12 +02:00