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

24474 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Warren
1842c78c5d Fix for navigation service for hideDialog(true) which is used to hide the current dialog & show the right click context/more options menu which was failing 2018-08-08 15:26:25 +01:00
Warren Buckley
da39eb3ceb Merge pull request #2808 from kows/hackathon-import-doc-type-to-angular 
Rewrite importDocumenttype.aspx to Angular [v8hackathon]
 2018-08-08 14:36:09 +01:00
Warren
baef12eb2a * Rename import to importdocumentype to match up with the action alias 
* Minor UI changes to match what we had previously & some simple validation if an incorrect file extension is chosen
 2018-08-08 14:35:09 +01: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
Warren
4dbcfc6907 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-08-08 13:22:04 +01:00
Warren
8ba319b9d9 Fix up syntax error in JS from my merge/port upto V8 - oops :( 2018-08-08 12:53:23 +01:00
Robert
2d6ea3c57c Merge pull request #2778 from umbraco/temp-editing-all-variants 
WIP Editing all variants at once
 2018-08-08 13:47:51 +02: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
copilaurobert
3f348e00cf Merge branch 'temp-editing-all-variants' of https://github.com/umbraco/Umbraco-CMS into temp-editing-all-variants 2018-08-08 11:58:55 +02:00
copilaurobert
bd40428ad9 Variants in NotCreated state are now considered as dirty. 2018-08-08 11:58:35 +02:00
Mads Rasmussen
9dc99d5e35 fix arrow on media boxes 2018-08-08 10:36:17 +02:00
Mads Rasmussen
ea92608f84 prefix new directives with "umb" 2018-08-08 10:25:43 +02: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
72b1fb1d60 fix sort issue on publish dialog 2018-08-08 13:31:35 +10:00
Shannon
34e7440517 Fixes issues with data re-syncing and underlying js exceptions causing problems 2018-08-08 13:29:25 +10:00
Shannon
0769b634e0 fixes status bar on info tab for content 2018-08-08 12:17:57 +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
Mads Rasmussen
4a43b97f64 fix media info tab 2018-08-07 20:18:34 +02: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
Mads Rasmussen
af8dc17f5e remove z-index from audit trail css so it doens't colide with language dropdown 2018-08-07 14:50:22 +02:00
Mads Rasmussen
a4155ad6d8 Update save and publish button text 2018-08-07 14:22:17 +02:00
Mads Rasmussen
0c727a2817 set active variant in language dropdown 2018-08-07 13:59:11 +02:00
Mads Rasmussen
8222234f86 Merge branch 'temp-editing-all-variants' of https://github.com/umbraco/Umbraco-CMS into temp-editing-all-variants 2018-08-07 13:43:56 +02:00
Mads Rasmussen
345aac8d5b remove hacky group filter + fix arrow 2018-08-07 13:43:33 +02:00
copilaurobert
0da9f108a3 Added null check for active variant on the publish dialog. 2018-08-07 13:41:12 +02: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
Shannon
7f09814973 Merge branch 'temp-editing-all-variants' into temp-variants-with-file-uploads 2018-08-07 09:18:48 +10:00
Shannon
dc5f3c1f27 only set the active culture if the content item is variant 2018-08-07 09:12:44 +10:00
Shannon
96aa442855 fixes creating content 2018-08-07 09:09:34 +10:00
Shannon
6dfaaffdfe adds null check in invariant content 2018-08-07 09:06:19 +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
Shannon
f37fe60bd5 Merge remote-tracking branch 'origin/temp8' into temp-editing-all-variants 2018-08-06 22:08:35 +10:00
Warren
ef5fc2e7b2 Add back in bundle control - seems to fix up Macro Editor 2018-08-06 13:05:07 +01:00
Shannon
3af09bfe9f fixes tests 2018-08-06 22:04:55 +10:00
Shannon
c000ef0b5c adding some code docs 2018-08-06 21:50:23 +10:00