yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,747 Commits 4 Branches 7 Tags
336f29fa3b6391c2dcbf2ce05cf72cb65cd41ae3
Commit Graph

25747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon Deminick
336f29fa3b Merge pull request #3420 from dawoe/temp-3419 
V8- #3419 - Fix dictionary tree
 2018-10-26 13:39:42 +11:00
Shannon Deminick
9453bb06e8 Merge pull request #3435 from umbraco/temp8-3129 
Temp8 3129
 2018-10-26 13:22:09 +11:00
Shannon
555a275e13 fixes build 2018-10-26 13:21:30 +11:00
Warren Buckley
972dc56d9a More dupe using's declared & tidied up - total number of warnings now at 48 2018-10-25 21:58:39 +01:00
Warren Buckley
20b9bb1032 Gets rid of a couple of VS SLN Warnings - due to dupe'd using's decared (done a tidy up) 2018-10-25 21:55:44 +01:00
Rasmus John Pedersen
93aa9dfe93 Fix sort audit parameters call 2018-10-25 14:41:24 +02:00
Stephan
4649fb2505 Fix merge 2018-10-25 10:51:46 +02:00
Stephan
a8110a0886 Merge branch temp8 into temp8-3129 2018-10-25 10:32:05 +02:00
Dave Woestenborghs
3a0981e02b #3419 fix error in backend for sections with no tree (forms when not installed) 2018-10-25 09:06:53 +02:00
Dave Woestenborghs
fe0176f97c Fixed unit test 2018-10-25 08:59:13 +02:00
Dave Woestenborghs
25a90ffbf5 #3419 added extra parameter to createSingleRoot node method so it will always show a single tree. If a single tree doesn't have children it does not show 2018-10-25 08:54:17 +02:00
Stephan
638f8b57b3 Fix content type variant changes 2018-10-24 18:47:17 +02:00
Stephan
56b9d36f53 Add content type variant changes tests 2018-10-24 18:47:13 +02:00
Dave Woestenborghs
d5cc658811 #3419 added check on tree items count back 2018-10-24 18:28:52 +02:00
Dave Woestenborghs
96c0b701a0 #3419 added always show root item to tree attribute 2018-10-24 18:27:00 +02:00
Shannon Deminick
3652a96687 Merge pull request #3352 from umbraco/temp8-dirty-tracking-on-variants 
v8 - allows audit trail/logging of changed cultures
 2018-10-25 01:11:53 +11:00
Dave Woestenborghs
2af2a9b77f #3419 don't show the back button in the edit screen of dictionary...doesn't make sense to go to settings section when the tree is in the translation section 2018-10-24 15:39:45 +02:00
Dave Woestenborghs
d23f5f8124 #3419 remove check on number of trees so dictoinary tree shows in the translation section and doesn't return a error when it's moved to the settings section 2018-10-24 15:31:45 +02:00
Mads Rasmussen
6920a7f0e0 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-10-24 11:12:00 +02:00
Kenn Jacobsen
024338790f Make sure to check the dirty state of the umbContent app viewModel when saving/publishing 2018-10-24 11:11:29 +02:00
Mads Rasmussen
ac14d38961 fix rename controller 2018-10-24 11:11:25 +02:00
Claus
aa4acb33e8 ensuring macros are using the correct section. 2018-10-24 09:59:40 +02:00
Claus
715083ef93 Merge pull request #3398 from umbraco/temp8-258-empty-trees-arrow 
Fixing right-pointing arrow for empty trees.
 2018-10-24 09:47:14 +02:00
Shannon
c7cb8b52cc Fixes AuthorizeUpgrade page since it was still referencing the old UmbracoClient folder 2018-10-24 15:23:21 +11:00
Stephan
4ec9350f54 Merge branch temp8 into temp8-3129 2018-10-23 17:44:31 +02:00
Stephan
c0a1e7f2f6 Merge branch temp8 into temp8-dirty-tracking-on-variants 2018-10-23 17:43:52 +02:00
Stephan
9320c1a061 Cleanup variants dirty tracking 2018-10-23 15:38:47 +02:00
Shannon
e34728c10c fixes drop down pre value editor 2018-10-23 23:04:53 +11:00
Shannon
ce6b4f4a51 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 
# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
 2018-10-23 22:16:48 +11:00
Shannon
001ed50c7d fixes test 2018-10-23 22:13:50 +11:00
Shannon
dfd3e8f4c4 Fixes tests and issue with member list view not passing the GUID along in the route 2018-10-23 22:10:27 +11:00
Shannon
fa64f4a6a8 Fixes member group editing, removes old dialog tasks, removes old references in the old ui.xml file 2018-10-23 21:38:24 +11:00
Warren Buckley
2ec6216932 Merge pull request #3400 from umbraco/temp8-247-hostnames-dialog 
Temp8 247 hostnames dialog
 2018-10-23 11:28:08 +01:00
Warren Buckley
03b363df21 Add some TODO's to consider removing references to MasterPages & UserControls 2018-10-23 10:53:55 +01:00
Warren Buckley
0e51b45e64 Make SystemDirectories.Bin non configurable, as the comment mentioned you cannot configure the bin folder for ASP.NET projects 2018-10-23 10:53:22 +01:00
Warren Buckley
3e4ecac4e3 Remove SystemDirectory.Base - this is a very legacy feature & no longer in use in codebase 2018-10-23 10:52:19 +01:00
Mads Rasmussen
abed9ab331 show duplicate domain validation messages 2018-10-23 11:48:42 +02:00
Warren Buckley
d88aab59a1 Remove all references to SystemDirectories.UmbracoClient - as Umbraco_Client folder no longer exists anymore 2018-10-23 10:41:44 +01:00
Claus
9438581621 Merge pull request #3240 from umbraco/temp8-sendToPublish 
Send to Publish changes
 2018-10-23 10:54:42 +02:00
Stephan
9699e6cb71 Merge branch 'temp8' into temp8-dirty-tracking-on-variants 2018-10-23 10:51:28 +02:00
Mads Rasmussen
1badcd0b29 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-10-23 10:32:33 +02:00
Mads Rasmussen
76eb809b2c Fix list view property editors. Use "display: block" for instead of "inline block" 2018-10-23 10:31:54 +02:00
Warren Buckley
e3c6cfa63c Merge pull request #3312 from umbraco/temp8-3298-move-rollback 
Temp8 3298 move rollback
 2018-10-23 09:28:41 +01:00
Shannon
69450791cf Fixes the new Id/Guid property on members, ensures all tabs are expanded by default and removes that init logic from JS since we don't want it there. 2018-10-23 19:25:48 +11:00
Shannon
1936cc5be9 Merge remote-tracking branch 'origin/temp8' into temp8 2018-10-23 18:39:16 +11:00
elitsa
127ecdf48e Right arrow appears only when there are child nodes. 2018-10-23 09:34:02 +02:00
Shannon
9dadecdcc1 Fixes boolean conversion logic in ColorPickerConfigurationEditor, Fixes tree grouping logic and moves groups cache to the ApplicationTreeService, fix other merge issues 2018-10-23 18:28:55 +11:00
elitsa
c5755e25c8 Revert commit not belonging to this PR. 2018-10-23 09:04:09 +02:00
Shannon
d9a4d1fa97 Manual merging 2018-10-23 16:12:23 +11:00
Stephan
d2cfe8f3b9 Fix GetVersionsSlim 2018-10-22 18:21:00 +02:00