swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,181 Commits 73 Branches 219 Tags
adc9957504dce78296f70c86557fc47f69af377c
Commit Graph

7925 Commits

Author SHA1 Message Date
Mads Rasmussen b685c04c51 Merge branch 'temp8' into temp8-remove-bootstrap-datepicker 2018-11-20 11:52:02 +01: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 82e7be4ae9 Fixes creating content type collections 2018-11-20 18:43:41 +11:00
Shannon fad566afba Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
 2018-11-20 18:14:36 +11:00
Shannon 3dfa3eaac7 fixes media picker svg handling to only use a single IMG tag, else this resulted in a number of 404's with invalid paths like [Object,object] 2018-11-20 18:13:19 +11:00
Shannon bc66d4cbc6 manually merges list view changes with new blueprint functionality, manually merges other files, fixes issue with Action drop down in v8 2018-11-20 17:00:37 +11:00
Shannon d5a8e7751b Removes the word "Kim" from the list view 2018-11-20 15:25:02 +11:00
Shannon 96d7cca68d Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js
 2018-11-20 14:12:26 +11:00
Shannon b4c2c8bd74 manually merging 2018-11-20 14:11:35 +11:00
Shannon 9ae4d1cdf5 fixes how the grid rte resizes when a tab changes to use the proper event handler 2018-11-20 14:10:20 +11:00
Mads Rasmussen bd23cbed20 null checks clean up debug data 2018-11-19 15:50:11 +01:00
Mads Rasmussen 0f07e6830d delete bootstrap datepicker files 2018-11-19 14:56:27 +01:00
Mads Rasmussen 301cc00e10 use flatpickr in query builder 2018-11-19 14:29:35 +01:00
Mads Rasmussen d6bd5e7e85 change query builder dropdowns to umb dropdowns 2018-11-19 14:14:37 +01:00
Mads Rasmussen 477a9bae0e use umb dropdown instead of boostrap dropdown in permissions context menu 2018-11-19 13:15:28 +01:00
Mads Rasmussen 138895d5e7 use umb dropdown component for actions menu 2018-11-19 12:48:31 +01:00
Mads Rasmussen 5e4770fd8c use umbraco components instead of bootstrap for button groups 2018-11-19 12:47:30 +01:00
Mads Rasmussen 24913128d1 add option to show a caret in a umb-button 2018-11-19 12:42:27 +01: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
Mads Rasmussen e84cbc7e19 wip swap out bootstrap datepicker for flatpickr 2018-11-16 14:07:41 +01:00
Warren Buckley 31969cd767 Merge pull request #3625 from umbraco/temp8-login-screen 
Temp8 login screen
 2018-11-16 12:34:05 +00:00
James Coxhead d019ba81f3 Get relation names 2018-11-15 22:34:43 +00:00
James Coxhead 10f6f8df90 Show relations in edit view 2018-11-15 22:22:15 +00:00
Mads Rasmussen 40c0b4ef2b delete angular-bootstrap file. It is never loaded anyway 2018-11-15 13:18:15 +01:00
Sebastiaan Janssen 06db9d2223 Reverts PR #3449 and #3493 2018-11-15 13:00:54 +01:00
Mads Rasmussen 29a2e4664b Remove global close dialog events and add them to each component so we can clean up correctly 2018-11-15 10:58:47 +01:00
Shannon 496ecf5c9a Cleans up how the content path permissions are checked, integrates the bulk publishing into the controller, adds security check to ensure the user can publish the whole branch, updates the UI messaging so they are grouped by publish statuses and deals with multiple publish status (i.e. in bulk), fixes some content tree issues 2018-11-15 15:24:09 +11:00
Mads Rasmussen a067242f5e fix list view card layout 2018-11-14 15:31:17 +01:00
Mads Rasmussen c7e1cdec17 delete dialogService 2018-11-14 14:49:11 +01:00
Mads Rasmussen 86e280f7d3 delete last dialogService views 2018-11-14 14:30:21 +01:00
Mads Rasmussen 136309dd29 remove dialogService from new login screen 2018-11-14 14:11:43 +01:00
Mads Rasmussen 10caf7b75b remove old login screen code 2018-11-14 14:11:11 +01:00
Shannon c8f1863e0d Getting publish with descendants working 2018-11-15 00:09:57 +11:00
Mads Rasmussen 4f2ed545da remove migration code for legacy views 2018-11-14 13:52:43 +01:00
Mads Rasmussen 9f8f1a1df2 This file doesn't seem to be in use 2018-11-14 13:49:04 +01:00
Mads Rasmussen 66fd184480 remove references to dialogService 2018-11-14 12:50:50 +01:00
Mads Rasmussen 49a624ade7 fix discard changes for permissions context dialog 2018-11-14 11:56:04 +01:00
Mads Rasmussen bea074c964 fix up "Do something else"-buttons 2018-11-14 11:17:44 +01:00
Mads Rasmussen b38547396b fix up more context menu close buttons 2018-11-14 09:46:11 +01:00
Shannon 0b403fe5e5 Merge remote-tracking branch 'origin/temp8' into temp8-226-sched-pub-angular 2018-11-14 19:07:54 +11:00
Shannon Deminick 5c255ba846 Merge pull request #3525 from umbraco/temp8-265-cant-create-partial-view-macro-files 
Change sections on views for partial view macros
 2018-11-14 19:07:26 +11:00
Shannon bcf5006e8c Merge remote-tracking branch 'origin/temp8' into temp8-226-sched-pub-angular 2018-11-14 18:58:13 +11:00
Shannon Deminick d4836d0cb8 Merge pull request #3523 from umbraco/temp8-264-cant-reload-tree-nodes-in-templating-area 
Bugfix: Can't reload tree Nodes in the Templating area of the Settings section
 2018-11-14 18:56:16 +11:00
Mads Rasmussen 17497e7cc7 fixing up a bunch of close buttons in the context menu dialogs 2018-11-13 17:38:22 +01:00
Mads Rasmussen d7f59adc64 dont get currentNode from dialogOptions 2018-11-13 14:26:43 +01:00
Mads Rasmussen 259e17b45d open context menu dialog based on appState instead of dialogService 2018-11-13 14:25:15 +01:00
Mads Rasmussen 530a3e2439 fix up invite user functionality 2018-11-13 10:41:09 +01:00
Mads Rasmussen 340ad8b853 add white background to user invite confirmation screen 2018-11-13 09:40:04 +01:00
Shannon ac5c76385c Fixes some logic with validation 2018-11-13 16:57:38 +11:00
Shannon 5827a8a3e1 I think i've finally got saving a schedule working with the correct validation 2018-11-13 14:31:37 +11:00