 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 |
|
|
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
release-7.10.1
|
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
|
e5b0b2bfb7
|
Merge branch 'dev-v8' into temp-U4-11127
|
2018-04-04 16:01:23 +10:00 |
|
|
Shannon
|
471009cfd1
|
nuspec for examine was incorrect
|
2018-04-04 16:00:14 +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 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 |
|