Stephan
18c382d888
in progress tags
2018-11-30 16:30:59 +01:00
Kenn Jacobsen
8e423d9c75
Sort the dictionary items alphabetically
2018-11-27 22:43:19 +01:00
Warren Buckley
7c5f5e873d
Merge pull request #3621 from umbraco/temp8-controllers
...
Refactor/fix registering controllers
2018-11-27 10:18:28 +00:00
Stephan
27c2b3ba5e
Cleanup
2018-11-26 14:43:19 +01: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
57074d3545
some code cleanup
2018-11-22 15:26:10 +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
d2a61e5b9c
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
2018-11-20 19:31:08 +11:00
Stephan
5f8e46e3cd
Merge branch 'temp8' into temp8-3713
2018-11-20 08:15:26 +01: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
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
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
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
Warren Buckley
31969cd767
Merge pull request #3625 from umbraco/temp8-login-screen
...
Temp8 login screen
2018-11-16 12:34:05 +00: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
243fa78edf
Fix scheduled publishing
2018-11-15 14:57:56 +01:00
Sebastiaan Janssen
06db9d2223
Reverts PR #3449 and #3493
2018-11-15 13:00:54 +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
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
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
Shannon
204c4e21fc
fix merge
2018-11-14 22:31:51 +11:00
Shannon
b029215933
Updates logic for PasswordChanger so when the ChangePasswordWithMembershipProvider it correctly updates the password and raises the right event
2018-11-14 20:09:29 +11:00
Shannon
d80ce16e66
Merge remote-tracking branch 'origin/temp8-224-db-updates-sched-publishing-with-variants' into temp8-226-sched-pub-angular
2018-11-14 17:40:04 +11:00
Robert
c1bbc22087
Merge pull request #3511 from umbraco/temp7-262-xss-updating-removing-publicAccess
...
Adding html encoding when updating or removing Public Access of a con…
2018-11-13 12:54:11 +01:00
Stephan
6cb20c1d79
Deal with events and contexts in scheduled publishing
2018-11-13 11:51:25 +01:00
Stephan
aa621f687e
Refactor/fix registering controllers
2018-11-13 10:07:30 +01:00
Shannon
c6ef3750df
Merge branch 'temp8-224-db-updates-sched-publishing-with-variants' into temp8-226-sched-pub-angular
2018-11-13 16:17:23 +11:00
Shannon
6e63cc8c19
Fixes ScheduledPublishing since nothing was actually happening because the IEnumerable wasn't being resolved since the method does a yield return. Adds logging.
2018-11-13 16:16:52 +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
Shannon
66394926c0
Gets some validation messages working for sched pub
2018-11-13 00:46:13 +11:00
Shannon
4d13956372
better logic for validating and persisting schedules
2018-11-12 17:29:38 +11:00
Shannon
45822dba1e
Merge remote-tracking branch 'origin/temp8-224-db-updates-sched-publishing-with-variants' into temp8-226-sched-pub-angular
2018-11-12 17:18:23 +11:00
Stephan
5381eec6a4
fix+cleanup publishing with variants
2018-11-09 09:35:11 +01:00
Shannon
76f6721c80
Got some of the angular bits wired up
2018-11-09 16:12:08 +11:00
Laura Weatherhead
1850d046e4
RelatedLinks2 validation in Nested content ( #3578 )
2018-11-08 16:53:25 +00:00
Bjarke Berg
c182428986
If a password is provided, then use this instead of an autogenerated one.
2018-11-07 10:51:55 +01:00
Shannon
92045c81bb
Merge remote-tracking branch 'origin/temp8' into temp8-224-db-updates-sched-publishing-with-variants
...
# Conflicts:
# src/Umbraco.Core/Models/Content.cs
# src/Umbraco.Tests/Services/ContentServiceTests.cs
2018-11-07 19:44:37 +11:00
Shannon
c57ac7752c
Merges UnpublishResult into PublishResult, fixes dirty tracking for unpublishing a culture and logs the correct info along with returning the correct status, fixes ContentService so that all publishing/unpublishing logic happens in one one place including all Audit/Logs, gets ContentService.PerformScheduledPublish in place
2018-11-07 19:42:49 +11:00
Claus
f764b46b8e
Merge pull request #3429 from umbraco/temp8-231-send-to-publish-with-variants
...
v8 - send to publish with variants
2018-11-06 14:19:28 +01:00
Warren Buckley
d420f61e13
Reduce VS Warnings: Remove ununused const string
2018-11-06 13:15:45 +00: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
Warren Buckley
812d9e2be9
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
2018-11-06 11:09:12 +00:00
