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

19608 Commits

Author SHA1 Message Date
Shannon
0971aa0ab6 fixes null check on image cropper 2018-04-09 13:35:18 +10:00
Shannon
fb74b1b75f Merge remote-tracking branch 'origin/dev-v8' into temp-U4-11127 2018-04-09 13:25:02 +10:00
Mads Rasmussen
c5f27aeea5 fix language tree sync 2018-04-06 11:14:25 +02:00
Shannon
d03a8098da Merge branch 'dev-v8' into temp-U4-11127 2018-04-06 14:52:28 +10:00
Shannon
c760d25479 Merge remote-tracking branch 'origin/dev-v7' into dev-v8 2018-04-06 14:52:02 +10:00
Shannon Deminick
e25d648f44 Merge pull request #2556 from dawoe/temp-U4-11167 
U4-11167 Fixes rare syncTree error
 2018-04-06 14:46:23 +10:00
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
Shannon
8b88bb68ed must always register install components 2018-04-06 13:54:42 +10:00
Shannon
c90d6be8ab U4-8861 Extract GlobalSettings to an interface and expose on the standard UmbracoConfig.For settings singleton including a bunch of cleanup, getting the installer and steps to be DI 2018-04-06 13:51:54 +10:00
Shannon
7442c96be1 removes unused methods 2018-04-05 23:15:51 +10:00
Shannon
990ca51279 Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8 2018-04-05 23:11:24 +10:00
Shannon
262c4afb16 Removes FormsAuthentication cookie format and replaces with standard aspnet identity format, removes a bunch of old obsolete and unused code, fixes the culture setting issue, simplifies the UmbracoBackOfficeIdentity since it no longer needs to be a FormsIdentity and just a straight forward ClaimsIdentity 2018-04-05 23:10:51 +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
798236dc85 removes unused code, cleans up web.confgi 2018-04-05 18:13:50 +10:00
Shannon
9bfe9e6bbf Ensures that the thread culture is set both in owin and in aspnet 2018-04-05 18:11:15 +10:00
Shannon
a62422fac3 ensure that debug is true when developing 2018-04-05 15:09:12 +10: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
Stephan
612acfac15 Fix solution 2018-04-04 09:59:01 +02:00
Dave Woestenborghs
859cb6ce1a U4-11167 removed the time out..only check if the syncTree method exists 2018-04-04 09:44:29 +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
6d1e50c44d Merge branch 'dev-v8' into temp-U4-11127 
# Conflicts:
#	src/Umbraco.Web.UI/web.Template.config
 2018-04-04 16:51:00 +10:00
Stephan
683b47bae5 Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8 2018-04-04 08:32:10 +02:00
Stephan
1b804e07e5 Push web.template.config 2018-04-04 08:28:10 +02:00
Shannon
d89009bbe7 Changes targetFramework to 4.7, removes the huge assembly list, removes post build scripts since they don't work 2018-04-04 16:17:57 +10:00
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
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
Dave Woestenborghs
27b19a0a33 U4-11167 only wrap in time out when syncTree method is undefined 2018-04-03 07:37:37 +02: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