Merge branch 'MDL-29795_master' of https://github.com/dmonllao/moodle

diff --cc mod/assign/backup/moodle2/restore_assign_stepslib.php
Simple merge

diff --cc mod/assign/externallib.php
Simple merge

diff --cc mod/assign/gradingtable.php
Simple merge

diff --cc mod/assign/lang/en/assign.php
index 09cea5f,2184e30..8dd5d0a
--- 1/mod/assign/lang/en/assign.php
--- 2/mod/assign/lang/en/assign.php
+++ b/mod/assign/lang/en/assign.php
@@@ -135,10 -138,11 +138,11 @@@ $string['defaultsettings_help'] = 'Thes
  $string['defaultteam'] = 'Default group';
  $string['deleteallsubmissions'] = 'Delete all submissions';
  $string['description'] = 'Description';
+ $string['disabled'] = 'Disabled';
  $string['downloadall'] = 'Download all submissions';
  $string['download all submissions'] = 'Download all submissions in a zip file.';
 -$string['downloadasfolders'] = 'Download as separate folders';
 -$string['downloadasfolders_help'] = 'When enabled downloaded files will be placed in separate folders and files will not be renamed.';
 +$string['downloadasfolders'] = 'Download submissions in folders';
 +$string['downloadasfolders_help'] = 'If the assignment submission is more than a single file, then submissions may be downloaded in folders. Each submission is put in a separate folder, with the folder structure kept for any subfolders, and files are not renamed.';
  $string['downloadselectedsubmissions'] = 'Download selected submissions';
  $string['duedate'] = 'Due date';
  $string['duedatecolon'] = 'Due date: {$a}';

diff --cc mod/assign/lib.php
Simple merge

diff --cc mod/assign/locallib.php
Simple merge

diff --cc mod/assign/styles.css
Simple merge

diff --cc mod/assign/templates/grading_navigation.mustache
Simple merge

diff --cc mod/assign/tests/locallib_test.php
Simple merge

diff --cc theme/boost/templates/mod_assign/grading_navigation.mustache
Simple merge