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

1329 Commits

Author SHA1 Message Date
Stephan
1eee6dfb2f Cleanup 2018-12-07 14:05:47 +01:00
Shannon
d549cb8e3d Merge remote-tracking branch 'origin/temp8' into temp8-3527-indexes-via-code 2018-12-05 17:36:50 +11:00
Shannon
56d1a317c0 Gets searching working in the dashboard, updates to latest examine 2018-12-04 14:25:37 +11:00
Shannon
162b90194d Gets sln building, removes old legacy settings, removes ascx dashboard support 2018-12-03 16:14:49 +11:00
Shannon
340b8e6cef Latest examine, updates for dashboard, adds UmbracoExamineIndexDiagnostics 2018-11-29 13:55:51 +11:00
Shannon
d3057ea2e1 Merge remote-tracking branch 'origin/temp8' into temp8-3527-indexes-via-code 
# Conflicts:
#	src/Umbraco.Core/StringExtensions.cs
 2018-11-26 17:34:22 +11:00
Shannon
b6790261c4 Adds test 2018-11-26 17:20:15 +11:00
Shannon
08dc94a535 Merge branch 'temp8' into temp-tinymce 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
 2018-11-22 15:38:58 +11:00
Shannon
9e7384a330 Merge branch 'temp8' into temp8-3096-angular-bulk-publish 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
 2018-11-20 19:37:39 +11:00
Shannon
c3736ce7ab Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	.github/README.md
#	build.bat
#	src/Umbraco.Core/Migrations/Expressions/Alter/Table/AlterTableBuilder.cs
#	src/Umbraco.Core/Migrations/Expressions/Create/Column/CreateColumnBuilder.cs
#	src/Umbraco.Core/Migrations/Expressions/Create/Index/CreateIndexBuilder.cs
#	src/Umbraco.Core/Migrations/Expressions/Create/Table/CreateTableBuilder.cs
#	src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs
#	src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs
#	src/Umbraco.Core/Persistence/Factories/MediaFactory.cs
#	src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Column/AlterColumnBuilder.cs
#	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
#	src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs
#	src/Umbraco.Core/Services/EntityService.cs
#	src/Umbraco.Core/Services/IMediaService.cs
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Core/Services/NotificationService.cs
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js
#	src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
#	src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
#	src/Umbraco.Web.UI.Client/src/less/main.less
#	src/Umbraco.Web.UI.Client/src/less/panel.less
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html
#	src/Umbraco.Web.UI.Client/src/views/content/copy.html
#	src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
#	src/Umbraco.Web.UI.Client/src/views/content/move.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
#	src/Umbraco.Web.UI.Client/src/views/datatypes/move.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.controller.js
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html
#	src/Umbraco.Web.UI.Client/src/views/media/move.html
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
#	src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
#	src/Umbraco.Web.UI/Umbraco/developer/Macros/editMacro.aspx
#	src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/es.xml
#	src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx
#	src/Umbraco.Web/Controllers/UmbLoginController.cs
#	src/Umbraco.Web/Editors/ContentControllerBase.cs
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Editors/PasswordChanger.cs
#	src/Umbraco.Web/HttpRequestExtensions.cs
#	src/Umbraco.Web/Models/ContentEditing/Tab.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
#	src/Umbraco.Web/Templates/TemplateRenderer.cs
#	src/Umbraco.Web/Trees/ApplicationTreeController.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
#	src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web/Trees/MediaTreeController.cs
#	src/Umbraco.Web/_Legacy/Controls/TabView.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs
#	src/umbraco.cms/Actions/Action.cs
#	src/umbraco.providers/members/UmbracoMembershipProvider.cs
 2018-11-19 15:32:26 +11:00
Sebastiaan Janssen
06db9d2223 Reverts PR #3449 and #3493 2018-11-15 13:00:54 +01:00
Shannon
c8f1863e0d Getting publish with descendants working 2018-11-15 00:09:57 +11:00
Shannon
204c4e21fc fix merge 2018-11-14 22:31:51 +11:00
Shannon
76f6721c80 Got some of the angular bits wired up 2018-11-09 16:12:08 +11:00
Claus
8f43451519 Merge pull request #3503 from kjac/feature-angular-stylesheets-editing-in-tabs 
V8: Angular implementation of stylesheets editing
 2018-11-06 13:52:32 +01:00
Robert
7e8578c9fb Fixes unit test by ignoring VariesByCulture property on MemberMapperProfile and mapping on MediaMapperProfile. 2018-11-06 11:38:49 +01:00
Kenn Jacobsen
d0e6d0af2f Merge branch 'temp8' into feature-angular-stylesheets-editing-in-tabs 2018-11-02 08:46:57 +01:00
Warren Buckley
e07e12092c Adds 'VariesByCulture` property to ContentItemBasic model & its mapping - so that the GetChildren API call for list view can know if each child item varies by culture or not 2018-11-01 11:29:16 +00:00
Shannon
ffd08d0a2e Fixes unit test 2018-11-01 14:56:55 +11:00
Kenn Jacobsen
a3232bb55c WIP: split editing into tabs 2018-10-31 21:33:32 +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
Anders Bjerner
115de5854e Added new "CssClass" property to the "Tab" class 2018-10-30 16:56:38 +01:00
Shannon
77f4f0bbad Refactors how the 'OpensDialog' gets assigned to menu items, fixes permission check on rollback 2018-10-30 00:34: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
Shannon
cb9843b023 Removes IActions that shouldn't be IActions 2018-10-29 23:23:21 +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
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
3d29c0381e small refactor of trees for single page apps sections and some cleanup, puts the back button for dictionary back in with the correct route 2018-10-26 14:18:42 +11:00
Shannon Deminick
336f29fa3b Merge pull request #3420 from dawoe/temp-3419 
V8- #3419 - Fix dictionary tree
 2018-10-26 13:39:42 +11:00
Kenn Jacobsen
4cfac8da16 Make it possible to add ellipsis on actions that invokes dialogs by means of OpensDialog on IAction 2018-10-25 14:54:36 +02:00
Dave Woestenborghs
25a90ffbf5 #3419 added extra parameter to createSingleRoot node method so it will always show a single tree. If a single tree doesn't have children it does not show 2018-10-25 08:54:17 +02:00
Warren Buckley
9a1a13ba81 Fix the ordering logic - it helps if you actually assign the ordered items back to the list *facepalm* 2018-10-24 14:55:01 +01:00
Warren Buckley
a7b13e2b4b Merge remote-tracking branch 'origin/temp8' into temp8-153-invariant-properties 2018-10-24 09:22:52 +01:00
Warren Buckley
c94775608a When returning a collection of languages - such as through the GetAllLanguages API Controller call the model mapping ensures that rather than order by name we, also put the default lang first then order a-z 2018-10-24 09:18:26 +01:00
Stephan
c0a1e7f2f6 Merge branch temp8 into temp8-dirty-tracking-on-variants 2018-10-23 17:43:52 +02:00
Warren Buckley
79e3a35869 WIP - Ensures the default language variant is always first then the rest of the variants are organised by A-Z 2018-10-23 16:03:49 +01:00
Stephan
9320c1a061 Cleanup variants dirty tracking 2018-10-23 15:38:47 +02:00
Shannon
ce6b4f4a51 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 
# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
 2018-10-23 22:16:48 +11:00
Shannon
001ed50c7d fixes test 2018-10-23 22:13:50 +11:00
Shannon
dfd3e8f4c4 Fixes tests and issue with member list view not passing the GUID along in the route 2018-10-23 22:10:27 +11:00
Shannon
fa64f4a6a8 Fixes member group editing, removes old dialog tasks, removes old references in the old ui.xml file 2018-10-23 21:38:24 +11:00
Warren Buckley
2ec6216932 Merge pull request #3400 from umbraco/temp8-247-hostnames-dialog 
Temp8 247 hostnames dialog
 2018-10-23 11:28:08 +01:00
Stephan
9699e6cb71 Merge branch 'temp8' into temp8-dirty-tracking-on-variants 2018-10-23 10:51:28 +02:00
Shannon
69450791cf Fixes the new Id/Guid property on members, ensures all tabs are expanded by default and removes that init logic from JS since we don't want it there. 2018-10-23 19:25:48 +11:00
GwanYeong Kim
b539cc2a7a Remove this commented out code 2018-10-23 09:43:29 +02:00
Shannon
d9a4d1fa97 Manual merging 2018-10-23 16:12:23 +11:00
Warren Buckley
2062672eda Camel case models for the hostnames dialog 2018-10-22 10:20:02 +01:00