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

7857 Commits

Author SHA1 Message Date
Shannon
5324e0fc59 Fixes initial tree loading to ensure it gets passed the right culture params, puts any non-translated variant name in brackets in the tree 2018-08-17 00:50:05 +10:00
Shannon
54af649b78 Cleans up some models, adds another unit test, fixes the Info tab state updating when a content item is changed. 2018-08-16 23:30:33 +10:00
Shannon
9e131aa633 oooooh our first ContentController test :) 2018-08-15 17:44:06 +10:00
Shannon
cf39b2a54f Fixes server side check for publishing when a mandatory language isn't published 2018-08-15 15:23:02 +10:00
Shannon
2a15feec40 Fixes state issue to ensure that non-created variants show up as not-created 2018-08-15 15:13:27 +10:00
Shannon
66a00546d1 more work with saving, publishing and validation for variants, fixes up a few old things too 2018-08-14 23:19:32 +10:00
Shannon
9c84d5e3f9 more work with variants, saving, publishing and validation. 2018-08-14 20:21:33 +10:00
Shannon
758d09cd5c More work on save and publish overlays 2018-08-14 16:29:14 +10:00
Shannon
e41aad78b0 Updates the logic for the normal file upload for clearing files to be the same as the image cropper which makes more sense, now the upload editor also syncs properly with invariant propertes. 2018-08-10 16:52:33 +10:00
Shannon
3932ec0640 Fixes how invariant property are processed during saving on the server side. 2018-08-10 15:39:57 +10:00
Shannon
2d1bda54be Fixes: Deal with invariant property value syncing, componentizes umb-image-gravity, gets the image cropper syncing data correctly, ensures resizing for image cropper is done when variants change. 2018-08-10 13:53:19 +10:00
Shannon
d237fd7e26 Merge branch 'temp8' into temp-variants-with-file-uploads 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
 2018-08-09 15:27:21 +10:00
Warren
5389a018b3 Sets back the action alias to importDocumentType - It may break more than we expected 2018-08-08 14:32:58 +01:00
Warren
00487c87fc Merge branch 'temp8' into kows-hackathon-import-doc-type-to-angular 2018-08-08 13:23:41 +01:00
Robert
c2433a336c Merge branch 'temp8' into temp-editing-all-variants 2018-08-08 13:46:19 +02:00
Warren
44e76adbd1 Merge branch 'hackathon-import-doc-type-to-angular' of https://github.com/kows/Umbraco-CMS into kows-hackathon-import-doc-type-to-angular 
# Conflicts:
#	src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
 2018-08-08 12:01:15 +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
Shannon
f921e891a3 Fixes issue with IsEdited and state to make things consistent and easy 2018-08-08 16:29:07 +10:00
Shannon
69acaabec1 Fixes creating doc types, some null checks missing and an issue with how umbgridselector is responsible for syncing the template alias on a new doc type 2018-08-08 15:35:02 +10:00
Shannon
9e6947f62c Fixes issue of moving/deleting media along with other issues of us returning plain text responses with incorrect mime type results and an issue with our interceptors 2018-08-08 11:49:05 +10: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
copilaurobert
0b51cb703d Back arrow from list view children will redirect back to parrent, changed the order content apps get added to have the ListView app added first. 2018-08-07 15:59:19 +02: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
Shannon
08fe947575 Gets the image cropper posting files correctly 2018-08-07 18:37:55 +10:00
Shannon
96ea95b04a Files are uploading and clearing per variant now with the file upload control 2018-08-07 18:05:30 +10:00
Shannon
cd89d016d1 Adds culture to the properties and removes reliance on tabbed-content directive for culture, adds a new directive for file uploads for properties that is more like the image cropper and maintains state when switching between variants. 2018-08-07 17:10:02 +10:00
Shannon
7f09814973 Merge branch 'temp-editing-all-variants' into temp-variants-with-file-uploads 2018-08-07 09:18:48 +10:00
Shannon
96aa442855 fixes creating content 2018-08-07 09:09:34 +10:00
Shannon
19c39341f7 allowing more than 2 parts per file name 2018-08-07 09:03:37 +10: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
Shannon
e53fe669ef Start to setting files with a culture and catering for being able to set any metadata for files 2018-08-07 00:43:52 +10:00
Warren
ef5fc2e7b2 Add back in bundle control - seems to fix up Macro Editor 2018-08-06 13:05:07 +01:00
Warren
2fb6588160 Fixes some YSODs with older dialogs 2018-08-06 12:21:31 +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
Shannon
a0f7dbbc60 Only update variant info if it is dirty 2018-08-06 18:05:04 +10:00
Shannon
7aaf024397 more work on validation, saving and publishing 2018-08-06 16:50:40 +10:00
Warren
237fcbead6 Last of the umbraco_client files removed 2018-08-03 09:25:33 +01: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
b0ca59b0ab OLD sort dialog.aspx & its JS assets from umbraco_client have vanished into thin air 2018-08-02 15:05:18 +01:00
Shannon
9b067d3539 Merge remote-tracking branch 'origin/temp8' into temp-editing-all-variants 2018-08-02 23:57:43 +10:00
Shannon
be1fbcfe04 don't short circuit the property validation, run all of them for content for all variants so we get the correct response 2018-08-02 23:55:47 +10: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
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
Shannon
1f25847cd7 Gets contextual culture server validation working 2018-08-02 20:00:35 +10: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