yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,500 Commits 4 Branches 7 Tags
710ec704b346ff301f12559987df7ff8b591b3be
Commit Graph

26500 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sebastiaan Janssen
0095429ff0 Fix package.json after merge 2018-12-07 09:24:15 +01:00
Stephan
04b2765d72 Document 2018-12-07 09:03:36 +01:00
Shannon
62d74f07bf fixes boolean change mistake to make sure that the Internal/external index has the correct PublishedOnlyFlag, latest examine update, fixes issue with queuing deletions before updates 2018-12-07 15:06:07 +11: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
3d3d249e7e adds notes 2018-12-07 13:13:00 +11:00
Shannon
413fea03aa reverts changes for published messaging with scheduled dates, we'll have to deal with that another day 2018-12-07 13:11:19 +11:00
Shannon
91af2c7708 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-12-07 12:50:09 +11:00
Shannon
5c49069805 removes XmlCacheComponent since we will never use the xml cache in a website 2018-12-07 12:49:41 +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
219a236069 removes unused lang keys 2018-12-07 12:06:16 +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
Sebastiaan Janssen
47287d9d80 Codebase now runs on VS2019 2018-12-06 13:19:04 +01:00
Sebastiaan Janssen
67f9d9d665 Codebase now runs on VS2019 2018-12-06 13:09:21 +01:00
Shannon
f671f41f7c removes commented out Relation type editor and the unused/disabled xml health check 2018-12-06 17:25:24 +11:00
Shannon
3e95d94726 fixes build 2018-12-06 17:24:06 +11: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
Shannon
3be300db09 Merge remote-tracking branch 'origin/revert-3745-temp8-tinymce' into temp8 2018-12-06 16:44:52 +11:00
Shannon
2216a40d01 Merge commit '2a0748fc1e85c468064f309c03b24a43ed42e177' into temp8 2018-12-06 16:41:45 +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
Sebastiaan Janssen
f26353a34e Fix broken build 2018-12-05 11:00:49 +01:00
Sebastiaan Janssen
901af2be8e Fix docs build 2018-12-05 10:44:06 +01:00
Sebastiaan Janssen
f002b371b9 Update npm marked reference 2018-12-05 10:42:44 +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
24300e76f9 oops committed a config change 2018-12-05 17:42:31 +11:00
Shannon
d549cb8e3d Merge remote-tracking branch 'origin/temp8' into temp8-3527-indexes-via-code 2018-12-05 17:36:50 +11:00
Shannon
cb9eec97e2 Fixes tests 2018-12-05 17:20:48 +11:00
Shannon
11d8d17156 Fixes build with ctor change to UmbracoHelper 2018-12-05 17:00:51 +11:00
Shannon
1eba69b070 Fixes build with ctor change to UmbracoHelper 2018-12-05 16:59:33 +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
50f4e12ca1 Merge pull request #3819 from umbraco/temp8-fix-dashboard-manifest 
Refactor package.manifest dashboards JSON structure
 2018-12-04 12:12:44 +01:00
Stephan
73f31dd800 Refactor manifest dashboards, security 2018-12-04 11:37:07 +01:00
Shannon
1717f94fcf Gets searching on dashboard working with paging and viewing field values 2018-12-04 15:41:54 +11:00
Shannon
56d1a317c0 Gets searching working in the dashboard, updates to latest examine 2018-12-04 14:25:37 +11:00
Kenn Jacobsen
9ad69c11cb Fix publish dates issues (#3507) 2018-12-03 18:45:50 +01:00
Warren Buckley
b361d1c950 Refactor package.manifest dashboards JSON structure 2018-12-03 14:26:16 +00:00
Sebastiaan Janssen
a8d7660150 So close, come on dependencies! 2018-12-03 13:30:25 +01:00
Sebastiaan Janssen
0410a788cb One more attempt to fix vulnerable dependencies 2018-12-03 13:23:37 +01:00
Shannon
fce5b29b1c index rebuilding updates 2018-12-03 23:15:18 +11:00
Warren Buckley
8b5eb1f0a4 Merge pull request #2478 from Shazwazza/U4-2827 
U4-2827 Allow dashboards via manifest
 2018-12-03 12:13:12 +00:00
Sebastiaan Janssen
763fda2857 Hopefully resolve the rest of the vulnerabilities 2018-12-03 13:11:39 +01:00
Sebastiaan Janssen
137439d6eb Fixes the flatmap-stream issue. package-lock went nuts, but couldn't figure it out even with Mads' help :/ 2018-12-03 12:43:39 +01:00
elitsa
41271c7fab Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-12-03 12:38:28 +01:00
Warren Buckley
53df1dfc82 Merge pull request #3815 from umbraco/temp8-upgrade-dev-dependencies 
Temp8 upgrade dev dependencies
 2018-12-03 11:19:51 +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