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

19556 Commits

Author SHA1 Message Date
Warren
05604880e0 Merge branch 'patch-v7' into dev-v8 
* Merging up into V8 the 7.10 regression with assetsService locale stuff #U4-11164
 2018-04-03 09:38:50 +01:00
Shannon
271a100759 Obsolete the methods we want to remove from ILogger 2018-04-03 16:38:31 +10:00
Shannon
9d5156d7f0 fixes some tests 2018-04-03 13:01:01 +10:00
Shannon
1719d33a48 Fixes tests, updates examine, fixes how __Path is stored 2018-04-03 12:33:21 +10:00
Shannon
047a05cfb3 bumps version 2018-04-03 11:38:13 +10:00
Shannon
e77ebc0c1c Fixes all references to assetsService.load* that do not pass in a required scope object and changes assets.service to always use the $rootScope of an explicit scope is not passed 2018-04-03 11:27:53 +10:00
Shannon
a27ea994b7 updates the loadMomentLocaleForCurrentUser to always return a promise 2018-04-03 10:59:55 +10:00
Shannon
e019c94207 changes back to correct version 2018-04-03 10:42:57 +10:00
Warren Buckley
1e9aad5a0c Merge pull request #2553 from umbraco/temp-U4-11165 
U4-11165 Integrate language UI with the language controller in the back end
 2018-03-30 21:03:20 +01:00
Warren
ad14fbd1f8 Set the language to be mandatory too as well 2018-03-30 21:01:24 +01:00
Dave Woestenborghs
28a0e30315 U4-11164 fixed blank screen for about 30 seconds after logging in. Because of q.all we don't need to wait until promise is resolved, because all promises are resolved when this is hit 2018-03-30 11:20:41 +02:00
Warren
a9c184b4fd Updates the JS to remove unneeded services injected in 
Updates view to be simpler if statement - that by having something set to it then we can show the UI
 2018-03-29 20:54:20 +01:00
Warren
14b4c12cdb Adds NPM package.json lock file - so we ensure dependencies are consistent for all 2018-03-29 20:11:14 +01:00
Warren
1049a7be12 Updates UI .csproj - to remove the broken Analyzers for now (Not sure we use the lovely VS C# analyzers & more of a R# team) 2018-03-29 20:09:58 +01:00
Shannon
6d2bf71824 adds required check back in 2018-03-30 01:23:51 +11:00
Shannon
7f27862943 Gets correct validation working with languages, we can now create and update 2018-03-30 01:20:40 +11:00
Shannon
b9d0c63002 Starts wiring up the language editor with the controller, ensure that you cannot delete a language at the repo level and makes sure that we return and show validation messages when the user tries to delete the default or last language. 2018-03-29 23:48:54 +11:00
Shannon Deminick
3489e66d64 Merge pull request #2546 from umbraco/temp-U4-11124 
U4-11124 - Prevents deleting a default language (API Controller & Service Layers)
 2018-03-29 22:48:24 +11: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
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
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
Warren
e9380b048b Throw a HTTP Bad Request if an API request in backoffice is made to try & delete the Default Language 2018-03-27 16:33:28 +01: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