Commit Graph

3665 Commits

Author SHA1 Message Date
Bjarke Berg
8e29810598 Merge remote-tracking branch 'origin/v7/dev' into v7/bugfix/AB-1085/antiforgery-per-form 2019-06-26 09:52:44 +02:00
Shannon
571a3bc257 fixes test 2019-06-26 16:48:39 +10:00
Shannon
23b8e1cce8 Removes the remaining part of the EntityRepository that was loading in ALL properties for media which we don't want whatsoever which means some other code is cleaned up/removed 2019-06-26 13:31:04 +10:00
Bjarke Berg
383a8617ce https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1479 - Fixed test 2019-06-25 08:19:50 +02:00
Shannon
3e74bbfb45 Creates a custom IAntiForgeryAdditionalDataProvider that provides and validates custom token data in the request which allows having a custom AF token per form created with BeginUmbracoForm 2019-06-25 14:35:28 +10:00
Sebastiaan Janssen
5faa71187d More Owin updates 2019-06-06 15:21:05 +02:00
Sebastiaan Janssen
c069f262dc Update MVC, Razor, WebApi and Owin 2019-06-06 14:50:01 +02:00
Sebastiaan Janssen
9f42e6a607 Update ImageProcessor and Newtonsoft.Json dependencies to the latest version 2019-06-06 14:37:57 +02:00
Sebastiaan Janssen
aaab14be3e fix csproj file 2019-06-06 13:48:48 +02:00
Sebastiaan Janssen
1c87176d80 Merge branch 'v7/dev' into pr/3064
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web/packages.config
#	src/umbraco.MacroEngines/packages.config
2019-06-06 12:50:48 +02:00
Shannon
34a3389c17 Updates to latest Examine 2019-03-05 12:50:51 +11:00
Damiaan Peeters
7656de693c Add unittest 2019-01-29 22:18:53 +01:00
Christian Alkærsig
7acafe67a4 Delete template2.cshtml
Auto-generated test file
2019-01-23 00:28:21 +01:00
Alkaersig
9eb2b28232 Added (Doctype) Name and Description to PublishedContentType 2019-01-23 00:28:21 +01:00
christophnz
282ac2b9c5 Added 2 HtmlHelper extension methods for rendering RelatedLinks, including Unit tests 2019-01-13 15:17:13 +01:00
Claus
71f2b7ee06 updating unit tests. 2019-01-04 09:40:55 +01:00
elitsa
0aa1dc1dc7 Adding tests for verifying that malicious code input will be cleaned for XSS. 2018-12-27 10:02:49 +01:00
George Jones
ea1a25eb84 Fix typo in SqlCeUpgradeTests.cs
Fix very minor typo in code comment
2018-11-27 22:59:16 +01:00
GIBE\jack.durcan
566459cb54 Fixed typo in base database factory test class 2018-11-27 22:58:18 +01:00
Warren Buckley
54a2aa00a7 Revert "Temp8 tinymce" 2018-11-22 14:05:51 +00:00
Stephan
64dd7c113c Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-11-20 15:19:07 +01:00
Stephan
e056f1b282 Fix tests 2018-11-20 15:17:01 +01:00
Shannon
63470c80dd fixes build 2018-11-20 20:28:17 +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
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
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
Stephan
35a5146cad Fix ContentService branch publishing 2018-11-16 13:30:42 +01:00
Stephan
889e48ea4a Detect incomplete migrations 2018-11-15 19:36:23 +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
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
8020092099 Merge remote-tracking branch 'origin/temp8-224-db-updates-sched-publishing-with-variants' into temp8-226-sched-pub-angular 2018-11-14 22:23:40 +11:00
Stephan
9ed7758d38 Deal with fixme/review 2018-11-14 09:16:22 +01: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
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
c4bce9ecb5 Adds publish status for mixed unpublish/publish action in the same operation 2018-11-08 12:49:37 +11:00
Shannon
3b3824c33a Fixes merge issues and issue with StrategyCanUnpublish, 1 tests failing i need to fix 2018-11-07 22:18:43 +11:00
Shannon
6888ed088b Merge remote-tracking branch 'origin/temp8-3336-publish-branch' into temp8-224-db-updates-sched-publishing-with-variants
# Conflicts:
#	src/Umbraco.Core/Services/Implement/ContentService.cs
2018-11-07 22:09:51 +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
df40a3d588 merge fixes 2018-11-07 20:12:07 +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