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

5996 Commits

Author SHA1 Message Date
Shannon
e10698532b Merge branch 'dev-v8' into temp-U4-11127 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
 2018-04-06 13:56:07 +10:00
Stephan
eb6a08af31 v7@11d4189c8d 2018-04-05 14:12:15 +02:00
Warren
0dba812053 Merge branch 'patch-v7' into dev-v8 2018-04-05 10:44:34 +01:00
Warren Buckley
43e32e66b6 Merge pull request #2550 from dawoe/temp-U4-11161 
U4-11161 fix for adding multiple items in a single content picker
 2018-04-05 10:15:39 +01:00
Shannon
f32e787816 fixes dashboard.tabs.controller 2018-04-05 15:08:52 +10:00
Stephan
6da91b7770 Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8 2018-04-04 17:43:26 +02:00
Stephan
f7a14a03f2 Fix build, still some weird csc.exe versionning 2018-04-04 17:41:55 +02:00
Warren
4047fb119d Adds in missing $scope dependency for Dynamic Dashboard Controller 2018-04-04 08:35:58 +01:00
Warren
bdaa70592f Adds in missing $scope dependency for Dynamic Dashboard Controller 2018-04-04 08:28:41 +01: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
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
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
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
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
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
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
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
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
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
Dave Woestenborghs
d1eb6b1aa8 U4-11161 don't show help text when it's not a multipicker 2018-03-28 17:07:56 +02:00
Dave Woestenborghs
458d023ff4 U4-11161 set min and max number in default config 2018-03-28 17:03:35 +02: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
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
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
9269a257e8 Adds new info bar to content delete dialog with warning about variants/languages 2018-03-23 10:04:26 +00:00
Mads Rasmussen
2250943c87 remove gray bg in context menu header 2018-03-22 15:43:13 +01:00
Warren Buckley
c5365b7d0d Merge pull request #2528 from umbraco/temp-U4-11120 
Temp u4 11120
 2018-03-22 11:37:44 +00:00
Stephan
0cbfebe21c Port v7@2aa0dfb2c5 - WIP 2018-03-22 11:25:08 +01:00
Mads Rasmussen
f3859f891e localize "add language" 2018-03-22 10:46:38 +01:00
Mads Rasmussen
bb7c96f408 better naming of tree language selector 2018-03-22 09:59:49 +01:00
Mads Rasmussen
c701bf5a74 fix unit tests 2018-03-21 16:51:08 +01:00
Mads Rasmussen
32daf0f8d7 only show default language info when toggle is turned on 2018-03-21 15:31:51 +01:00
Mads Rasmussen
a23f122f5f only delete language when allowed 2018-03-21 14:01:48 +01:00
Mads Rasmussen
bc4e97be48 fixes: U4-11120 Create new Language dashboard to create/remove/set default languages - angular 2018-03-21 13:39:16 +01:00
Shannon
b361cfebb7 updates npm build dependencies 2018-03-21 13:55:01 +11:00