swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,342 Commits 73 Branches 219 Tags
146bbcec4bc7a2964a35d3d68b94fc0cec53a672
Commit Graph

7589 Commits

Author SHA1 Message Date
Stephan 146bbcec4b Merge branch temp8 into temp8-di2690 2018-11-29 12:38:44 +01:00
Stephan 49a0b68b28 IContainer is IRegister+IFactory 2018-11-28 11:05:41 +01:00
Kenn Jacobsen d62de961a0 Add a minimum height to the query builder dropdowns 2018-11-27 23:51:14 +01:00
Robert 2d30e57617 Merge pull request #3778 from umbraco/temp8-3777 
When a node is opened through a content picker don't allow editing do…
 2018-11-27 11:41:13 +01:00
Mads Rasmussen c0f5158b03 When a node is opened through a content picker don't allow editing doc type and template 2018-11-27 09:58:57 +01:00
Robert 4f7b9cd61a Update umbrangeslider.directive.js 
Updated comment
 2018-11-27 09:50:22 +01:00
Mads Rasmussen f8068801af add docs 2018-11-26 15:12:38 +01:00
Mads Rasmussen 99c5fdbd9d Merge branch 'temp8' into temp8-remove-bootstrap-slider 2018-11-26 14:30:17 +01:00
Mads Rasmussen d314361996 delete bootstrap slider javascript and css files 2018-11-26 14:28:51 +01:00
Mads Rasmussen d6b24ac92d Merge branch 'temp8' into temp8-remove-bootstrap-slider 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package.json
 2018-11-26 14:10:57 +01:00
Mads Rasmussen a7e53be079 Merge branch 'temp8' into temp8-remove-bootstrap-datepicker 2018-11-26 13:57:52 +01:00
Mads Rasmussen 16b57ac022 remove bootstrap logic from slider controller 2018-11-26 13:46:47 +01:00
Mads Rasmussen e169de917d remove unused config 2018-11-26 11:53:52 +01:00
Mads Rasmussen 6257416c4a remove a bunch of slider prevalues. 2018-11-26 11:38:15 +01:00
Mads Rasmussen f4728e5b83 add custom styling + add pips 2018-11-26 11:18:23 +01:00
Stephan 6ffc340725 Merge branch temp8 into temp8-di2690 2018-11-23 14:58:08 +01:00
Bjarke Berg 31b4e944e7 Fixed issue where tree root was not shown when moving items. Pair programming with @mads 2018-11-23 13:57:26 +01:00
Mads Rasmussen e54e1989ba format numbers to not have decimals 2018-11-22 10:52:48 +01:00
Mads Rasmussen f24a347b01 load in new slider + basic setup 2018-11-22 10:06:00 +01:00
Shannon 77f855a649 Removes a ton of duplicate code 2018-11-22 17:46:49 +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 3947a471be Fixes tree sync with sorting media 2018-11-21 16:59:23 +11:00
Shannon fda327a604 removes $routeParams from a dependency on content.resource, fixes event ordering during nav init, fixes tree re-syncing after sorting, removes some obsolete/old code 2018-11-21 16:40:13 +11:00
Mads Rasmussen d754aa94c0 Merge branch 'temp8' into temp8-remove-bootstrap-datepicker 2018-11-20 13:18:46 +01:00
Mads Rasmussen 219b38ff77 fix authorize upgrade screen 2018-11-20 12:33:26 +01:00
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
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