Stephan
|
adced099be
|
Move UmbracoConfig singleton to Current
|
2018-12-12 23:31:16 +01:00 |
|
Stephan
|
e40c9cb227
|
Fix missing dependencies errors, simplify
|
2018-12-12 16:07:21 +01:00 |
|
Stephan
|
3e082f1a94
|
Restructure registration of essential services, validate
|
2018-12-12 14:28:57 +01:00 |
|
Stephan
|
8c31f69a6f
|
Merge branch origin/temp8 into temp8-di2690
|
2018-12-11 10:04:42 +01:00 |
|
James Jackson-South
|
64dc401be5
|
Merge branch 'temp8' into temp8
|
2018-12-11 06:28:23 +11:00 |
|
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 |
|
Kenn Jacobsen
|
852b44af0e
|
Fix member roles assignment YSOD
|
2018-12-09 17:56:41 +01:00 |
|
Andy Neil
|
e25e509d84
|
Resolved check for removed properties
|
2018-12-09 14:31:53 +01:00 |
|
Stephan
|
7f8eeeab83
|
Merge branch temp8 into temp8-di2690
|
2018-12-07 16:12:08 +01:00 |
|
Stephan
|
1eee6dfb2f
|
Cleanup
|
2018-12-07 14:05:47 +01:00 |
|
Stephan
|
6dad124d5b
|
Merge branch 'temp8' into temp8-manifest
|
2018-12-07 13:53:28 +01:00 |
|
Stephan
|
710ec704b3
|
Merge branch temp8 into temp8-di2690
|
2018-12-07 09:52:46 +01:00 |
|
Stephan
|
fb4717d31e
|
Merge branch 'temp8-3527-indexes-via-code' into temp8
|
2018-12-07 09:27:38 +01:00 |
|
Stephan
|
04b2765d72
|
Document
|
2018-12-07 09:03:36 +01:00 |
|
Shannon
|
ecce3604af
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# src/Umbraco.Core/StringExtensions.cs
# src/umbraco.presentation.targets
|
2018-12-07 13:16:13 +11:00 |
|
Shannon
|
9b3de7b655
|
manually merges in publishing messaging when publishing something that has an expire date
|
2018-12-07 12:49:20 +11:00 |
|
Shannon
|
8da992aabf
|
manually merges changed lang files and a few other things
|
2018-12-07 12:03:33 +11:00 |
|
Sebastiaan Janssen
|
ebcf011287
|
Revert the addition of + which was a leftover from debugging
|
2018-12-06 16:58:12 +01:00 |
|
Bjarke Berg
|
aee6156a09
|
Refactored the ManifestContentAppDefinition to have a factory and a seperate data class.
|
2018-12-06 10:02:23 +01:00 |
|
Shannon
|
07f15ec7b3
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# src/Umbraco.Core/Models/UserExtensions.cs
# src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
# src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Tests/Migrations/Upgrades/SqlCeUpgradeTest.cs
# src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI.Client/package.json
# src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.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/ru.xml
# src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/EditRelationType.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/Editors/ContentController.cs
# src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/XmlDataIntegrityHealthCheck.cs
# src/Umbraco.Web/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
# src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs
# src/umbraco.cms/businesslogic/language/Language.cs
|
2018-12-06 17:13:23 +11:00 |
|
Stephan
|
c3d0bee4d3
|
Fix boot issue
|
2018-12-05 17:34:34 +01:00 |
|
Stephan
|
c74fc7a8f9
|
Misc cleanup and renaming
|
2018-12-05 12:57:23 +01:00 |
|
Stephan
|
c6a9701e53
|
Merge branch temp8 into temp8-di2690
|
2018-12-05 09:05:47 +01:00 |
|
Stephan
|
e5d12117d5
|
Composition can set default renderMvc controller
|
2018-12-05 08:19:21 +01:00 |
|
Shannon
|
d549cb8e3d
|
Merge remote-tracking branch 'origin/temp8' into temp8-3527-indexes-via-code
|
2018-12-05 17:36:50 +11:00 |
|
Shannon
|
b48a7fa4a9
|
Gets search tools working for explicitly defined searchers, have tested with a multi index searcher, refactors SupportsUnpublished vs SupportSoftDelete vs OnlyPublishedContent booleans and made some sense out of the reindexing items in ExamineComponent which didn't really work, cleans up IPublishedContentQuery implementation
|
2018-12-05 16:53:25 +11:00 |
|
Stephan
|
73f31dd800
|
Refactor manifest dashboards, security
|
2018-12-04 11:37:07 +01:00 |
|
Shannon
|
56d1a317c0
|
Gets searching working in the dashboard, updates to latest examine
|
2018-12-04 14:25:37 +11:00 |
|
Warren Buckley
|
b361d1c950
|
Refactor package.manifest dashboards JSON structure
|
2018-12-03 14:26:16 +00:00 |
|
Shannon
|
69c939c444
|
Some cleanup and renames
|
2018-12-03 22:19:35 +11:00 |
|
elitsa
|
3ef4da0615
|
Reverting.
|
2018-12-03 12:15:34 +01:00 |
|
elitsa
|
ae36e02f4c
|
Reverting to the origin.
|
2018-12-03 08:54:08 +01:00 |
|
elitsa
|
3a26fe8fe2
|
Removing malicious code from the name of a Stylesheet.
|
2018-12-03 08:45:11 +01:00 |
|
Shannon
|
a5b331f6d7
|
Gets site running with dashboards
|
2018-12-03 16:40:28 +11:00 |
|
Shannon
|
162b90194d
|
Gets sln building, removes old legacy settings, removes ascx dashboard support
|
2018-12-03 16:14:49 +11:00 |
|
Shannon
|
953f37f2db
|
Merge remote-tracking branch 'umbraco/temp8' into U4-2827
# Conflicts:
# src/Umbraco.Core/Manifest/ManifestBuilder.cs
# src/Umbraco.Core/Manifest/ManifestParser.cs
# src/Umbraco.Core/Manifest/PackageManifest.cs
# src/Umbraco.Web/Editors/DashboardController.cs
# src/Umbraco.Web/Editors/SectionController.cs
|
2018-12-03 15:25:31 +11:00 |
|
Shannon
|
6103832b8a
|
Gets index rebuilding working
|
2018-11-30 12:22:23 +11:00 |
|
Stephan
|
2c2873492f
|
Fix merge
|
2018-11-29 12:48:13 +01:00 |
|
Stephan
|
146bbcec4b
|
Merge branch temp8 into temp8-di2690
|
2018-11-29 12:38:44 +01:00 |
|
Stephan
|
eb0d2464aa
|
Minor fixes
|
2018-11-29 12:27:16 +01:00 |
|
Stephan
|
c6891c6c70
|
RegisterUnique
|
2018-11-29 10:35:16 +01:00 |
|
Shannon
|
340b8e6cef
|
Latest examine, updates for dashboard, adds UmbracoExamineIndexDiagnostics
|
2018-11-29 13:55:51 +11:00 |
|
Stephan
|
ec3fd890ec
|
Merge pull request #3761 from kjac/v8-fix-move-copy-status-type-ysod
V8: Fix YSODs when moving and copying things in the Settings section
|
2018-11-28 21:45:15 +01:00 |
|
Stephan
|
e9de6c1fc9
|
Naming is hard
|
2018-11-28 17:35:12 +01:00 |
|
Stephan
|
e42f140a2c
|
Cleanup
|
2018-11-28 16:57:01 +01:00 |
|
Laura W
|
9ecc0f35f8
|
Saving content id against initial SavePublish action
|
2018-11-28 16:09:07 +01:00 |
|
Stephan
|
f9a19ada04
|
IContainer.die.die.die
|
2018-11-28 12:59:40 +01:00 |
|
Stephan
|
49a0b68b28
|
IContainer is IRegister+IFactory
|
2018-11-28 11:05:41 +01:00 |
|