Warren Buckley
|
31b616f0ae
|
Merge branch 'temp8' into temp8-3087-tree-grouping
# Conflicts:
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
# src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
# src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
# src/Umbraco.Web/Trees/DictionaryTreeController.cs
|
2018-10-09 09:25:00 +01:00 |
|
Warren Buckley
|
2612f33283
|
Update trees using [CoreTree] attribute to use new property from our constants
|
2018-10-05 13:11:38 +01:00 |
|
elitsa
|
99257f2245
|
Updated the sortOrder also in the respective controllers, as well as updating to the new standards of string interpolation in those controllers.
|
2018-10-05 11:51:34 +02:00 |
|
Shannon
|
0a5db8f97b
|
Fixes up macros and file trees
|
2018-05-01 00:35:49 +10:00 |
|
Stephan
|
96c08f24ee
|
Port 7.7 - WIP
|
2017-09-12 16:22:16 +02:00 |
|
Stephan
|
7ea9c9c8e2
|
Move Web.Current to Composing
|
2017-05-30 18:13:11 +02:00 |
|
Stephan
|
8561d85f7a
|
porting 7.6-rc1 into 8
|
2017-05-24 12:25:39 +02:00 |
|
Stephan
|
0597eea72b
|
Resvolution - Components, Runtime & Booting
|
2016-09-19 16:33:43 +02:00 |
|
Shannon
|
74e1078c31
|
Merge branch 'U4-8198_file_system' of https://github.com/yannisgu/Umbraco-CMS into yannisgu-U4-8198_file_system
Conflicts:
src/Umbraco.Web/Umbraco.Web.csproj
|
2016-03-30 16:07:45 +02:00 |
|