yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,747 Commits 4 Branches 7 Tags
c75d4e5b5b1a9f58cf92e07a6f7f2e0804d35279
Commit Graph

22747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
c75d4e5b5b Fix post-merge 2018-03-30 11:00:07 +02:00
Stephan
f7a3c97da0 Fix build 2018-03-30 10:29:19 +02:00
Stephan
62b6efc4da Fix upgrading 2018-03-30 10:28:49 +02:00
Shannon
826102ea4d Merge remote-tracking branch 'origin/temp-v8-UI' into dev-v8 2018-03-29 22:42:18 +11:00
Shannon
7fd9caf889 Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8 
# Conflicts:
#	src/Umbraco.Web/PublishedContentQuery.cs
 2018-03-29 22:35:46 +11:00
Shannon
83e90969b3 i guess trying to rename the thing didn't work 2018-03-29 22:15:46 +11:00
Shannon
8f01a2ab0a fixes merge issues 2018-03-29 22:13:41 +11:00
Stephan
23e8632df6 Merge pull request #2549 from umbraco/temp-U4-11102 
Examine v1.0.0 integration to Umbraco v8
 2018-03-29 11:32:13 +02:00
Stephan
c72ce0b759 Fix Examine PR, fix migrations and upgrades 2018-03-29 11:31:33 +02:00
Shannon
881fbb7f76 Merge remote-tracking branch 'origin/dev-v7' into dev-v8 
# Conflicts:
#	build/Modules/Umbraco.Build/Umbraco.Build.psm1
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/DatabaseContext.cs
#	src/Umbraco.Core/IO/FileSystemProviderManager.cs
#	src/Umbraco.Core/ObjectExtensions.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSevenZero/AddUserGroupTables.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs
#	src/Umbraco.Core/Services/IdkMap.cs
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Core/packages.config
#	src/Umbraco.Tests.Benchmarks/app.config
#	src/Umbraco.Tests/UI/LegacyDialogTests.cs
#	src/Umbraco.Web/Cache/MediaCacheRefresher.cs
#	src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
#	src/Umbraco.Web/Features/DisabledFeatures.cs
#	src/Umbraco.Web/Mvc/RenderRouteHandler.cs
#	src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
#	src/Umbraco.Web/PublishedCache/ContextualPublishedCache.cs
#	src/Umbraco.Web/PublishedCache/ContextualPublishedContentCache.cs
#	src/Umbraco.Web/PublishedCache/ContextualPublishedMediaCache.cs
#	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
#	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
#	src/Umbraco.Web/PublishedContentQuery.cs
#	src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs
#	src/Umbraco.Web/packages.config
#	src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
 2018-03-29 20:01:14 +11:00
Stephan
295f727c90 Merge origin/dev-v8 into temp-U4-11102 2018-03-29 10:57:38 +02:00
Stephan
8cb92b95cb Fix migration plan 2018-03-29 09:39:37 +02:00
Shannon
fb89f0a795 Merge commit '2aa0dfb2c5' into dev-v8 
Force merging v7 -> v8, ignoring any conflicts and choosing "our" version (v8)
since we've manually merged it alraedy
 2018-03-29 18:07:45 +11:00
Shannon
10dec4115d Updates to latest examine and replaces IExamineIndexCollectionAccessor since we now have IExamineManager 2018-03-29 16:42:11 +11:00
Shannon
5010cbbf30 Gets the examine stuff re-merged and updated after the great merge 2018-03-29 15:39:48 +11:00
Shannon
5482b8f2f0 Merge remote-tracking branch 'origin/dev-v8' into temp-U4-11102 
# Conflicts:
#	src/NuGet.Config
#	src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs
#	src/Umbraco.Web/IPublishedContentQuery.cs
#	src/Umbraco.Web/PublishedContentQuery.cs
#	src/Umbraco.Web/Search/ExamineComponent.cs
#	src/Umbraco.Web/WebServices/ExamineManagementApiController.cs
 2018-03-29 14:00:20 +11:00
Stephan
796d931f65 Fix tests & apps 2018-03-28 18:07:53 +02:00
Shannon
2c132fe15f ignores search properties that should not be discovered 2018-03-28 23:00:03 +11:00
Shannon
4b32387aec fixes bug with getting indexer properties in the mgmt controller 2018-03-28 22:50:31 +11:00
Shannon
3d42ce166f fixes bug with getting indexer properties in the mgmt controller 2018-03-28 22:48:04 +11:00
Shannon
53f66d2a1b removes unused class 2018-03-28 22:38:40 +11:00
Shannon
7d13704cf9 Updates to latest examine beta, cleans up more code, always reference a searcher by it's indexer 2018-03-28 22:23:17 +11:00
Stephan
14592a227b Merge origin/dev-v8 into v7 temp merge 2018-03-28 12:58:39 +02:00
Stephan
7adc986472 Cleanup various migration stuff 2018-03-28 12:40:52 +02:00
Stephan
0ecc333a90 Fix port, tests 2018-03-28 11:28:32 +02:00
Shannon
52aa02668f Gets examine working with proper events, tests are working, etc... 2018-03-28 16:12:43 +11:00
Shannon
f0a342d84e Merge branch 'dev-v8' into temp-U4-11102 2018-03-28 12:58:42 +11:00
Shannon
487e4cbe20 Fixes various migration stuff - language migration was broken (public ctor), the custom sql in KeyValueService was incorrect, moved to migration syntax, InsertDataExpression didn't work, fixed with v7 code that does work, changes some Database.Execute to Execute.Sql so logging occurs. Fixes packages.config inclusion 2018-03-28 12:50:15 +11:00
Shannon
c2707f3806 updates to latest examine and fixes a test 2018-03-28 12:46:34 +11:00
Stephan
0d22478186 Port v7@2aa0dfb2c5 - WIP 2018-03-27 17:59:53 +02:00
Stephan
6b1ed89cb0 Port v7@2aa0dfb2c5 - WIP 2018-03-27 16:42:52 +02:00
Stephan
c2e1ba21b2 Port v7@2aa0dfb2c5 - WIP 2018-03-27 16:18:51 +02:00
Stephan
d40a835701 Port v7@2aa0dfb2c5 - WIP 2018-03-27 10:51:41 +02:00
Stephan
0a4878d2a3 Port v7@2aa0dfb2c5 - WIP 2018-03-27 10:04:07 +02:00
Shannon
c66365e11a gets some tests working 2018-03-27 18:35:16 +11:00
Shannon
88d66cfb53 Examine v1.0.0 integration, it now builds! now to run tests and fixup 2018-03-27 18:14:21 +11:00
Robert
e5c7c5eb2d Merge pull request #2541 from umbraco/temp-U4-11121 
U4-11121 New LanguagesController (back office editor controller) for …
 2018-03-26 13:14:18 +02:00
Claus
19a408fcae U4-11121 New LanguagesController (back office editor controller) for persisting language changes 2018-03-26 10:55:49 +02:00
Mads Rasmussen
486ead0983 Merge pull request #2537 from umbraco/temp-U4-11129 
U4-11129 Updates Content Delete Dialog with new copy/warning about variants
 2018-03-23 14:57:46 +01:00
Warren Buckley
5449de6426 Merge pull request #2538 from umbraco/temp-U4-11126-variant-switch-prompt 
Temp u4 11126 variant switch prompt
 2018-03-23 13:50:31 +00:00
Mads Rasmussen
4fa27c09fa fix user dialog toggle 2018-03-23 14:47:12 +01:00
Mads Rasmussen
fe32481b6e bring dashboards back to life 2018-03-23 14:14:25 +01:00
Claus
716020602d adding using statement to preview file to prevent missing htmlhelper error. 2018-03-23 11:55:23 +01:00
Mads Rasmussen
cf81f97f73 show discard changes prompt when swithing variant 2018-03-23 11:28:27 +01:00
Mads Rasmussen
26b575b2f6 remove console log 2018-03-23 11:27:42 +01:00
Mads Rasmussen
8e8102a51d update styling for discard changes dialog 2018-03-23 11:27:24 +01:00
Warren
7b17539022 Merge branch 'temp-v8-UI' into temp-U4-11129 2018-03-23 10:05:01 +00:00
Warren
9269a257e8 Adds new info bar to content delete dialog with warning about variants/languages 2018-03-23 10:04:26 +00:00
Mads Rasmussen
edeb9c61ac Merge pull request #2535 from umbraco/temp-U4-11125 
U4-11125 - Updates Langugae Keys for when changing default language in info bar
 2018-03-23 10:07:48 +01:00
Warren
8d0441ee08 Update language keys for changing default language warning 2018-03-23 09:03:06 +00:00