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

7604 Commits

Author SHA1 Message Date
Kenn Jacobsen
4b79819a8c Move the style sheet manipulation back to CodeFileController 2018-11-01 15:49:30 +01:00
Mads Rasmussen
888c08b56b wip list view publish 2018-11-01 14:44:12 +01:00
Kenn Jacobsen
2f643259c8 Include the rest of the CSS assets for the ACE editor 2018-11-01 13:31:31 +01:00
Kenn Jacobsen
2b60769d0d More localization 2018-11-01 13:26:08 +01:00
Kenn Jacobsen
c30b59b290 Oops. Broke the rules sorting. 2018-11-01 12:51:31 +01:00
Kenn Jacobsen
7e687b220b Ensure that rules are interpolated on save 2018-11-01 12:49:50 +01:00
Kenn Jacobsen
6b5a59c45f Fix rules validation 2018-11-01 12:23:25 +01:00
Kenn Jacobsen
fc387b9f23 Localize rules.html 2018-11-01 11:53:08 +01:00
Mads Rasmussen
828c915691 add ellipsis to list view buttons 2018-11-01 11:46:03 +01:00
Robert
4b0b97752c Merge pull request #3489 from umbraco/temp7-nested-content-overlay 
fixes position of nested content add item overlay
 2018-11-01 11:27:52 +01:00
Robert
54d6d581f1 removed unused function 2018-11-01 11:27:08 +01:00
Kenn Jacobsen
e726e6dffe Remove a bunch of inline styles 2018-11-01 11:08:41 +01:00
Robert
ae5e549a8e Only show "Add Template" button if the template does not currently exists. 2018-11-01 10:40:42 +01:00
Shannon
c5181607de Merge branch 'temp8' into temp8-231-send-to-publish-with-variants 
# Conflicts:
#	src/Umbraco.Web/Components/NotificationsComponent.cs
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/NotificationServiceExtensions.cs
#	src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/SendPublish.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs
 2018-11-01 14:02:43 +11:00
Shannon
83f1bbf6bd Merge remote-tracking branch 'origin/temp8' into temp8-231-send-to-publish-with-variants 
# Conflicts:
#	src/Umbraco.Core/Services/Implement/ContentService.cs
 2018-11-01 13:37:18 +11:00
Kenn Jacobsen
a3232bb55c WIP: split editing into tabs 2018-10-31 21:33:32 +01:00
Jesper Mayntzhusen
2cc440c7ff Prevent error label from moving input box 2018-10-31 19:30:34 +01:00
sofietoft
26aec86850 Update link to Our Forum 2018-10-31 19:29:44 +01:00
Kenn Jacobsen
f15d30b1b4 Assign the current main culture to GetChildren lookup if none is defined, as this is required for variant data 2018-10-31 19:23:52 +01:00
Daniel Brereton
4d5f952aa6 fixed typo 2018-10-31 19:21:15 +01:00
Poornima Nayar
14e503d0e9 3492 Added a property "Tooltip" to the tabs which can then be set in the the EditorModel Events (#3493) 2018-10-31 19:19:46 +01:00
bharanijayasuri
f73d55d496 Change to "MoveToRecycleBinDo" function of the MediaService and IMediaService (#3453) 2018-10-31 19:13:58 +01:00
Warren Buckley
c01cdf2fdb Merge pull request #3479 from umbraco/temp8-IAction-cleanup 
v8 IAction cleanup
 2018-10-31 14:18:38 +00:00
Mads Rasmussen
a32271f280 fixes position of nested content add item overlay 2018-10-31 14:33:23 +01:00
Robert
ee431cdf6d Deleted unnecessary "drag and drop" info text. 2018-10-31 12:44:00 +01:00
Robert
bdb782b27f Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-10-31 11:21:07 +01:00
Robert
83b30809d2 Fixes uploading files with comma in the file name. 2018-10-31 11:20:15 +01:00
Mads Rasmussen
fb5fa8c40a change toggles in media picker and create doc type collection to checkboxes. Toggles should only be used for settings. 2018-10-31 10:24:58 +01:00
Mads Rasmussen
21396a3042 fix border for color picker with labels 2018-10-30 21:21:39 +01:00
Mads Rasmussen
72f3739430 add pointer to list view content templates dropdown 2018-10-30 21:15:29 +01:00
Mads Rasmussen
6b0f393a65 use opacity instead of gray to set border color for color swatches so colors don't look blurry 2018-10-30 21:02:24 +01:00
Mads Rasmussen
a27cf7fb1b dont collapse color in color picker prevalues 2018-10-30 20:56:10 +01:00
Kenn Jacobsen
1d87ceaacf Fix user email validation in IE and Edge by using ng-required instead of required on input type=email. 2018-10-30 17:18:54 +01:00
Anders Bjerner
092d84a49d Exposed the "cssClass " property in the view 2018-10-30 16:56:38 +01:00
Mads Rasmussen
299af13c42 fixes the context menu node highlight bug 2018-10-30 15:51:32 +01:00
Mads Rasmussen
5537163c9f remove debug data in colorpicker prevalue editor 2018-10-30 15:19:48 +01:00
Kenn Jacobsen
4e85ede436 Fix the notifications footer 2018-10-30 11:19:14 +01:00
Shannon
1805d30aaf Merge remote-tracking branch 'origin/temp8' into temp8-remove-legacy-drop-downs 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
 2018-10-30 02:20:24 +11:00
Shannon
0d0d26d3e9 Fixes converting the Umbraco.DropDownMultiple to a multiple drop down, fixes boolean logic on the js single drop down 2018-10-30 02:05:43 +11:00
Shannon
b8a65febf4 Merge remote-tracking branch 'origin/temp8' into temp8-IAction-cleanup 
# Conflicts:
#	src/Umbraco.Tests/Composing/ActionCollectionTests.cs
#	src/Umbraco.Web/Models/Trees/MenuItem.cs
#	src/Umbraco.Web/_Legacy/Actions/Action.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionBrowse.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionChangeDocType.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionCopy.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionCreateBlueprintFromContent.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionDelete.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionEmptyTranscan.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionExport.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionImport.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionMove.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionNew.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionNotify.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionNull.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionPackage.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionPackageCreate.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionProtect.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionPublish.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionRePublish.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionRefresh.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionRestore.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionRights.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionRollback.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionSort.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionToPublish.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionTranslate.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionUnPublish.cs
#	src/Umbraco.Web/_Legacy/Actions/ActionUpdate.cs
#	src/Umbraco.Web/_Legacy/Actions/ContextMenuSeperator.cs
#	src/Umbraco.Web/_Legacy/Actions/IAction.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.cs
 2018-10-29 23:35:24 +11:00
Robert
bc20db5a46 Merge pull request #3432 from umbraco/temp8-153-invariant-properties 
Temp8 153 invariant properties
 2018-10-29 12:39:48 +01:00
Shannon
bae9bb6108 Initial cleanup of IActions, menu items, etc... 2018-10-29 17:27:33 +11:00
Kenn Jacobsen
1842aa4f11 Merge branch 'temp8' into feature-angular-stylesheets-editing 2018-10-28 12:12:34 +01:00
Kenn Jacobsen
68f05e05d1 Initial create and edit 2018-10-27 21:18:03 +02:00
Mads Rasmussen
ed4439e3d5 add ellipsis to more items 2018-10-26 13:36:05 +02:00
Mads Rasmussen
e0365d4214 add ellipsis to action menu items that opens a dialog + fix action menu not opening anything 2018-10-26 13:17:12 +02:00
Mads Rasmussen
bce2c43fdd small fixes to alignment and copy 2018-10-26 11:21:56 +02:00
Mads Rasmussen
5356d0a0ab Merge branch 'temp-3433' of git://github.com/dawoe/Umbraco-CMS into dawoe-temp-3433 2018-10-26 10:35:24 +02:00
Mads Rasmussen
78d4b452f5 Merge branch 'v8-feature-action-ellipsis' of git://github.com/kjac/Umbraco-CMS into kjac-v8-feature-action-ellipsis 
# Conflicts:
#	src/Umbraco.Web/_Legacy/Actions/ActionUnPublish.cs
 2018-10-26 09:59:57 +02:00
Shannon
02221f6dd0 Fixes how the content app view model works so dirty tracking continues to work properly, previously we tried to omit the apps so we didn' thave a circualar model reference but that doesn't work because that clones the object, so now the view model is just the variant index which works much better.Fixes other js probs 2018-10-26 15:07:21 +11:00