Shannon
e6718c6989
more manual merging
2018-11-20 17:44:24 +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
Shannon
80070e7332
Fixes how the new move method on MediaService deals with event messages
2018-11-20 12:20:16 +11:00
Shannon
f7f81945a0
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
2018-11-20 11:51:59 +11:00
Shannon Deminick
c981f5e1b0
Merge pull request #3711 from aaronpowell/temp8-3710
...
Fixes 3710: Removing the usage of HostingEnvironment.MapPath
2018-11-20 11:31:26 +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
Aaron Powell
8a809fe97a
Pushing crash handling on app domain into CoreRuntime
2018-11-19 22:02:51 +11:00
Aaron Powell
bcf542506d
setting up more of the core in CoreRuntime, this time the logger and Umbraco Core
2018-11-19 22:00:50 +11:00
Aaron Powell
c9b2cbc75f
Removing files that weren't meant to be added
2018-11-19 21:26:32 +11:00
Aaron Powell
71026d6d15
Fixes 3713
...
Moved the UmbracoApplicationBase from Core to Web
Moved the WebProfiler from Core to Web
Removed UmbracoApplicationBase from the CoreRuntime, it's still in the WebRuntime (and registered there in DI)
2018-11-19 21:23:08 +11:00
Shannon
543a34a6f3
Fixes how the new move method on MediaService deals with event messages
2018-11-19 17:58:42 +11:00
Shannon
99d9c49c9f
Gets sln building and manually merges the entity/media service changes
2018-11-19 17:54:36 +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
Aaron Powell
e1be4effca
Fixes 3710: Removing the usage of HostingEnvironment.MapPath
2018-11-19 14:31:20 +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
Stephan
35a5146cad
Fix ContentService branch publishing
2018-11-16 13:30:42 +01:00
Shannon
3e5e9aa9d7
temp refactor for fixing issue with return AlreadyPublishedStatus
2018-11-16 16:39:27 +11:00
Stephan
889e48ea4a
Detect incomplete migrations
2018-11-15 19:36:23 +01:00
Stephan
149dfda975
Merge branch 'temp8-224-db-updates-sched-publishing-with-variants' into temp8-3096-angular-bulk-publish
2018-11-15 14:58:51 +01:00
Stephan
6a8fc09acd
Fix ContentService branch publishing events
2018-11-15 14:58:10 +01:00
Stephan
243fa78edf
Fix scheduled publishing
2018-11-15 14:57:56 +01:00
Bjarke Berg
0fedeab45d
Merge pull request #3516 from umbraco/temp8-expr-visitor
...
Fix expression visitor for WHERE IN
2018-11-15 14:54:38 +01:00
Stephan
f316931a50
Merge branch 'temp8-224-db-updates-sched-publishing-with-variants' into temp8-3096-angular-bulk-publish
2018-11-15 13:34:02 +01:00
Stephan
eb37e03ebc
Deal with fixme/review
2018-11-15 13:25:21 +01: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
Stephan
c2a72ad98f
Fix tags migration
2018-11-15 10:11:22 +01:00
Stephan
42857ebc2a
Simplify version management, SolutionInfo is only the source now
2018-11-15 08:47:47 +01:00
Stephan
bd9a67f5a9
Fix dropdown migration
2018-11-15 08:43:54 +01:00
Bjarke Berg
94790e5eab
Merge pull request #3528 from umbraco/temp7-3015-change-password-should-not-reset
...
If a password is provided, then use this instead of an autogenerated …
2018-11-15 07:42:35 +01:00
Shannon
e5e2194316
Updates some messaging
2018-11-15 17:20:00 +11:00
Shannon
7f6da8bca7
Merge branch 'temp8-224-db-updates-sched-publishing-with-variants' into temp8-3096-angular-bulk-publish
2018-11-15 16:27:31 +11:00
Shannon
b515aea8dd
Fixes issue with *, fixes some of the logic in tests, adds another test, adds fixme notes
2018-11-15 16:25:08 +11:00
Shannon
b0e97ad772
Adds failing test that should work
2018-11-15 15:43:44 +11: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
Shannon
5135cc93ac
Merge branch 'temp8-226-sched-pub-angular' into temp8-3096-angular-bulk-publish
2018-11-15 10:04:18 +11:00
Mads Rasmussen
a067242f5e
fix list view card layout
2018-11-14 15:31:17 +01:00
