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

22804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
efeef98e55 fixes merge/build 2018-04-04 15:59:02 +10:00
Shannon
c655e9c2b1 Merge branch 'dev-v8' into temp-U4-11127 2018-04-04 15:55:13 +10:00
Shannon
d618151e4f Fixes the csproj, binding redirects and versions 2018-04-04 15:54:39 +10:00
Shannon
f775fd8672 removes sqlce build commands since no packages folder exists anymore 2018-04-04 15:35:13 +10:00
Shannon
cdd50b899a Merge remote-tracking branch 'origin/dev-v8' into temp-U4-11127 
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
 2018-04-04 15:04:11 +10:00
Shannon
a673babfb7 Fixes Content List View installation, removes unecessary properties from the RecycleBinEventArgs, updates both the upload and image cropper property editors to properly remove all files including any associated with variants, updates several other places to deal with variants and Property.GetValue(langId), adds notes, ensures we are returning the corect IDictionary instead of Dictionary for some interfaces 2018-04-04 13:11:12 +10:00
Shannon
b1d309aa16 Some updates based on PR review notes 2018-04-04 10:50:18 +10:00
Shannon
7a73175aa0 Starts wiring up the back office to the c# bits, updates controllers, mappers, models, property editors to support getting and saving data by language. The content editor now "works" with multi-lingual properties 2018-04-04 01:59:51 +10:00
Stephan
d4bd4256f1 Fix models mapping 2018-04-03 16:20:19 +02:00
Stephan
553de2ea68 Cleanup ILogger 2018-04-03 16:15:59 +02:00
Stephan
e3c6205d0c Fix 2018-04-03 15:32:46 +02:00
Stephan
75966dcfbd Merge branch origin/dev-v8 into dev-v8 2018-04-03 14:57:55 +02:00
Stephan
cdd064ba08 Upgrade Dependencies 2018-04-03 14:54:01 +02:00
MADSRASMUSSB4A1\madsrasmussen
fca9279322 update languages icon to globe instead of flag 2018-04-03 11:25:59 +02:00
Shannon
e7bc4986a5 Start updating the model/controller for editing variants in the back office and wiring up the angular side of things 2018-04-03 19:25:43 +10:00
Warren Buckley
c6814d41a9 Merge pull request #2557 from umbraco/dev-v8-merge-up-11164-regression 
Merge upto V8 - U4-11164 Blank Login Screen regression from 7.10
 2018-04-03 09:44:41 +01:00
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
26134cd616 updates nuspec and install.core.ps1 to not include the old dlls 2018-04-03 13:10:08 +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
Shannon
5b7193aa64 Merge branch 'temp-U4-11164' of https://github.com/dawoe/Umbraco-CMS into dawoe-temp-U4-11164 2018-04-03 10:41:01 +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
Stephan
f89816111b Wire NuCache and IdkMap 2018-03-30 14:00:44 +02: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
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
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
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