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 |
|
Claus
|
716020602d
|
adding using statement to preview file to prevent missing htmlhelper error.
|
2018-03-23 11:55:23 +01:00 |
|
Sebastiaan Janssen
|
8c0ec489c2
|
Bump version to 7.11
|
2018-03-23 09:54:11 +01:00 |
|
Stephan
|
59bac5c2a6
|
Fix a few things, the v8 way
|
2018-03-22 17:51:34 +01:00 |
|
Stephan
|
a2a4edb3be
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-22 17:41:13 +01:00 |
|
Claus
|
3a3d6239f0
|
U4-11144 GetManifestFiles fails if there's no App_Plugins folder
|
2018-03-22 15:35:51 +01:00 |
|
Claus
|
a4c9d8f1bf
|
typos
|
2018-03-22 15:34:28 +01:00 |
|
Claus
|
e6010fcd1e
|
Merge pull request #2534 from umbraco/temp-U4-11122
U4-11122 - Update DB and Service/Repo layer to handle language changes: mandatory, default
|
2018-03-22 15:18:15 +01:00 |
|
Sebastiaan Janssen
|
19e5715a84
|
Whoops, that was not supposed to say beta
|
2018-03-22 14:55:02 +01:00 |
|
Claus
|
730c4eaf2d
|
Merge pull request #2529 from umbraco/temp-U4-11123-take2
U4-11123 (Take 2) Updates Language Tree to not show having children or right click menu
|
2018-03-22 13:48:43 +01:00 |
|
Shannon
|
01b48a5aab
|
adds logic for repository and unit tests
|
2018-03-22 23:15:52 +11:00 |
|
Sebastiaan Janssen
|
59f9a64e81
|
Merge branch 'dev-v7' into dev-v7.10
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
|
2018-03-22 11:27:26 +01:00 |
|
Stephan
|
62c5f0f1ef
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-22 11:25:38 +01:00 |
|
Stephan
|
8bfb8e2b72
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-22 11:25:33 +01:00 |
|
Stephan
|
41948607d0
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-22 11:25:25 +01:00 |
|
Stephan
|
a9147f1473
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-22 11:25:22 +01:00 |
|
Stephan
|
8199b7710c
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-22 11:25:18 +01:00 |
|