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

7338 Commits

Author SHA1 Message Date
Stephan
d3a894b7a3 Add package-lock.json back 2018-10-26 16:06:45 +02:00
Stephan
9958436f3b Merge branch 'temp8-di2690' into temp8-di2690c 2018-10-26 16:06:27 +02:00
Mads Rasmussen
ed4439e3d5 add ellipsis to more items 2018-10-26 13:36:05 +02:00
Mads Rasmussen
e0365d4214 add ellipsis to action menu items that opens a dialog + fix action menu not opening anything 2018-10-26 13:17:12 +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
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
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
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
Stephan
4dac5cc7a2 Merge branch temp8-di2690 into temp8-di2690c 2018-10-25 11:25:55 +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
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
Stephan
c0a1e7f2f6 Merge branch temp8 into temp8-dirty-tracking-on-variants 2018-10-23 17:43:52 +02: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
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
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
Mads Rasmussen
abed9ab331 show duplicate domain validation messages 2018-10-23 11:48:42 +02: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
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
Shannon
d9a4d1fa97 Manual merging 2018-10-23 16:12:23 +11:00
Stephan
3468351de8 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-10-22 17:20:19 +02:00
Mads Rasmussen
78fb52f788 fix size of publish state in publish dialog 2018-10-22 17:04:56 +02:00
Mads Rasmussen
7265d329ea Alwyas show ellipsis for unpublish. It will always open a dialog 2018-10-22 15:56:08 +02:00
Mads Rasmussen
9d1c12d7df this validation needs to happen server side 2018-10-22 15:13:25 +02:00
Mads Rasmussen
d3163aa00e show validation message when a domain name is missing 2018-10-22 13:34:57 +02:00
Mads Rasmussen
bc379e0b71 set domain and language to be required + add required markers in the table headings 2018-10-22 13:07:54 +02:00
Mads Rasmussen
5391934a76 remove domain validation regex 2018-10-22 12:59:23 +02:00
Mads Rasmussen
88857fa1b5 show load indicator when dialog loads 2018-10-22 12:53:26 +02:00
Mads Rasmussen
126ed536ed update casing to match model updates 2018-10-22 12:34:48 +02:00
Mads Rasmussen
9560548b46 temp remove domain validation because that is preventing the form from saving + show saving state 2018-10-22 11:03:25 +02:00
Mads Rasmussen
7a2b91c9a7 don't show culture selector for nodes with variants 2018-10-22 10:41:46 +02:00
Stephan
8976a6cce3 Show language ISO code in list 2018-10-22 10:34:14 +02:00
Mads Rasmussen
d3625f9569 first round of styling fixes 2018-10-22 10:31:34 +02:00
Shannon
93a52432cf Manual merging 2018-10-22 17:04:58 +11:00