Stephan
|
046f6f3cd9
|
Merge branch origin/temp8 into temp8-di2690
|
2018-12-10 17:49:11 +01:00 |
|
Stephan
|
f9967e2d7d
|
Fix e25e509d84 breaking tests, fix original issue
|
2018-12-10 17:48:24 +01:00 |
|
Stephan
|
e173ea6dac
|
Cleanup
|
2018-12-10 15:30:56 +01:00 |
|
Andy Neil
|
e25e509d84
|
Resolved check for removed properties
|
2018-12-09 14:31:53 +01:00 |
|
Stephan
|
710ec704b3
|
Merge branch temp8 into temp8-di2690
|
2018-12-07 09:52:46 +01:00 |
|
Shannon
|
8da992aabf
|
manually merges changed lang files and a few other things
|
2018-12-07 12:03:33 +11:00 |
|
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 |
|
Stephan
|
c23c7749b4
|
Composition fixes
|
2018-11-27 14:04:08 +01:00 |
|
Stephan
|
e47566ca4e
|
Fix build
|
2018-11-27 10:49:41 +01:00 |
|
Stephan
|
b8608f1b2e
|
Refactor runtimes, injection and composition
|
2018-11-26 16:54:32 +01:00 |
|
Stephan
|
6ffc340725
|
Merge branch temp8 into temp8-di2690
|
2018-11-23 14:58:08 +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
|
b4c2c8bd74
|
manually merging
|
2018-11-20 14:11:35 +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 |
|
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
|
bd9a67f5a9
|
Fix dropdown migration
|
2018-11-15 08:43:54 +01:00 |
|
Stephan
|
e08189cc25
|
ContentSchedule Guid identifier
|
2018-11-14 13:59:53 +01:00 |
|
Stephan
|
3104b02db4
|
Deal with fixme/review
|
2018-11-14 11:59:16 +01:00 |
|
Stephan
|
7a0040ce82
|
Bugfix visitor
|
2018-11-14 10:52:24 +01:00 |
|
Shannon
|
413791fb19
|
Fixes problem with UserRepository.GetProfile since it was looking up the wrong fields :( this meant that the security audit events were not being raised since it wasn't finding users by their login
|
2018-11-14 20:32:20 +11:00 |
|
Stephan
|
9ed7758d38
|
Deal with fixme/review
|
2018-11-14 09:16:22 +01:00 |
|
Stephan
|
76b1cd6573
|
Cleanup
|
2018-11-13 11:51:25 +01:00 |
|
Shannon
|
ae91da1adb
|
Updates the GetContentForExpiration, GetContentForRelease to ignore published/trashed flags so that callers can deal with those status, adds method to the repo to clear any schedule older than a given date.
|
2018-11-13 17:51:59 +11:00 |
|
Stephan
|
5381eec6a4
|
fix+cleanup publishing with variants
|
2018-11-09 09:35:11 +01:00 |
|
Shannon
|
99a8d899e0
|
Changes FullSchedule to just be a list
|
2018-11-08 13:15:56 +11:00 |
|
Shannon
|
607615c968
|
Adds another assert, fixes up issue
|
2018-11-07 21:40:19 +11:00 |
|
Shannon
|
adf52425d2
|
Adds test for PerformScheduledPublish, fixes issues with resetting dirty props, fixes other issues found
|
2018-11-07 21:32:12 +11: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 |
|
Stephan
|
f3e9e282fa
|
Fix expression visitor for WHERE IN
|
2018-11-06 15:29:56 +01:00 |
|
Shannon
|
9b1d9e02bf
|
Gets publishing validation working with scheduled cultures, cleans up some code, removes Status from IContent into an extension method
|
2018-11-06 21:33:24 +11:00 |
|
Shannon
|
24360a762c
|
Adds change tracking to the schedule collection, updates the DocumentRepository to add logic to fetch the schedule, adds/updates tests, all green
|
2018-11-05 17:20:26 +11:00 |
|
Shannon
|
0d35a6a140
|
Gets all tests fixed up, now to write some more
|
2018-11-05 13:59:55 +11:00 |
|
Shannon
|
f223024164
|
Got database and persistence models in place for scheduled publishing, now need to start writing tests, fixing tests and cleaning up fixme statements
|
2018-11-02 14:55:34 +11:00 |
|
Shannon
|
2320b51df2
|
Removes old TemplateDto.Design column
|
2018-11-01 16:18:13 +11:00 |
|
Shannon Deminick
|
0d06828b76
|
Merge pull request #3460 from umbraco/temp-3457-entityrepository
EntityRepository is fetching all property data for media
|
2018-11-01 14:58:38 +11:00 |
|
Shannon
|
1429053681
|
Slight refactor and cleanup
|
2018-11-01 13:12:47 +11:00 |
|
Warwick Buzacott
|
557905580b
|
Fix for #3296: Adding comments
|
2018-10-31 19:27:53 +01:00 |
|
Warwick Buzacott
|
a09660128a
|
Fix for #3296. Large paged Listview sorted by custom property has blank custom properties
|
2018-10-31 19:27:53 +01:00 |
|
Shannon
|
a383309e46
|
Gets indexes updating based on content type changes
|
2018-10-30 17:32:27 +11:00 |
|
Claus
|
c0109e0531
|
whitespace
|
2018-10-27 13:02:21 +02:00 |
|
Claus
|
c4ee9abe68
|
adds internal methods for getting media entities through the entity repository/service without fetching all property data.
ensures the trees use this method to avoid fetching property data in the media tree.
|
2018-10-27 12:51:05 +02:00 |
|
Stephan
|
a4c81b269f
|
Merge branch temp8 into temp8-di2690
|
2018-10-26 15:10:20 +02:00 |
|
Stephan
|
8af1da3661
|
Merge branch temp8 into temp8-di2690
|
2018-10-25 10:59:49 +02:00 |
|
Stephan
|
a8110a0886
|
Merge branch temp8 into temp8-3129
|
2018-10-25 10:32:05 +02:00 |
|
Stephan
|
638f8b57b3
|
Fix content type variant changes
|
2018-10-24 18:47:17 +02:00 |
|
Dave Woestenborghs
|
8262269592
|
Make sure indexes are created as unique when using .Unique() syntax builder (#3319) (#3363)
|
2018-10-24 11:51:07 +02:00 |
|
Stephan
|
d71c879374
|
Merge branch temp8 into temp8-di2690
|
2018-10-23 18:01:52 +02:00 |
|