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

22248 Commits

Author SHA1 Message Date
Stephan
45cb56b96c Fix ContentCultureInfos and collection 2018-10-26 12:36:59 +02:00
Stephan
0cb19e0dbd Document 2018-10-26 11:47:35 +02:00
Mads Rasmussen
bce2c43fdd small fixes to alignment and copy 2018-10-26 11:21:56 +02:00
Mads Rasmussen
5356d0a0ab Merge branch 'temp-3433' of git://github.com/dawoe/Umbraco-CMS into dawoe-temp-3433 2018-10-26 10:35:24 +02:00
Mads Rasmussen
78d4b452f5 Merge branch 'v8-feature-action-ellipsis' of git://github.com/kjac/Umbraco-CMS into kjac-v8-feature-action-ellipsis 
# Conflicts:
#	src/Umbraco.Web/_Legacy/Actions/ActionUnPublish.cs
 2018-10-26 09:59:57 +02:00
Shannon
83f73c085f Fixes unpublish, allows to be permission assigned and checks this permission when trying to perform that action 2018-10-26 16:40:28 +11:00
Shannon
02221f6dd0 Fixes how the content app view model works so dirty tracking continues to work properly, previously we tried to omit the apps so we didn' thave a circualar model reference but that doesn't work because that clones the object, so now the view model is just the variant index which works much better.Fixes other js probs 2018-10-26 15:07:21 +11:00
Shannon
e280226abc fix issue with content picker always setting a dirty state 2018-10-26 14:41:49 +11:00
Shannon
3d29c0381e small refactor of trees for single page apps sections and some cleanup, puts the back button for dictionary back in with the correct route 2018-10-26 14:18:42 +11:00
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
Kenn Jacobsen
4cfac8da16 Make it possible to add ellipsis on actions that invokes dialogs by means of OpensDialog on IAction 2018-10-25 14:54:36 +02:00
Rasmus John Pedersen
93aa9dfe93 Fix sort audit parameters call 2018-10-25 14:41:24 +02:00
Dave Woestenborghs
2fbe2bb3da #3433 added short cut for toglle allow culture variants to short cuts overview 2018-10-25 12:54:17 +02:00
Dave Woestenborghs
3c217adc2e #3433 added language keys for text of culture variant permissions 2018-10-25 12:49:32 +02:00
Dave Woestenborghs
3b2e473a9e #3433 changed layout so it looks better 2018-10-25 12:38:43 +02:00
Dave Woestenborghs
5199e8e901 #3433 replace checkbox with for setting culture variants with toggle box 2018-10-25 12:23:34 +02:00
Dave Woestenborghs
96a102decf #3433 fix build error 2018-10-25 12:13:54 +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