Commit Graph

2012 Commits

Author SHA1 Message Date
Sam Hemelryk f44e7d0a77 Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
Conflicts:
	user/view.php
2013-01-09 09:34:22 +13:00
David Mudrák 0ab681d3e7 MDL-36977 Be more picky when it comes to migrating files in moodle1 backups 2013-01-08 08:53:38 +08:00
David Mudrák 7b66137f7b MDL-36977 Add more unit tests for moodle1 backup conversion 2013-01-08 08:53:37 +08:00
Sam Hemelryk dd89f61e68 Merge branch 'w51_MDL-29996_m25_oldfilters' of git://github.com/skodak/moodle 2013-01-07 15:22:37 +13:00
Simon Coggins fd1d829500 MDL-35991 - use PARAM_LOCALURL for local urls 2013-01-07 10:09:20 +08:00
Jean-Philippe Gaudreau 924b8d7274 MDL-37161 Backup: Database error caused by grade book settings when importing or restoring a course 2013-01-04 09:59:59 -05:00
Petr Škoda 0662bd677c MDL-29996 remove deprecated stuff from filter code 2012-12-30 17:02:18 +01:00
Dan Poltawski 3280819b20 Merge branch 'MDL-30899_master' of git://github.com/dmonllao/moodle 2012-12-18 09:10:42 +08:00
Jason Fowler c8d1e4aa8c MDL-35056 - Backup/Restore - Converting the 'Unmet Dependencies' Message to be a Developer Debug message to make moodle less confusing to the average user 2012-12-18 09:58:53 +13:00
Dan Poltawski 06ae410844 Merge branch 'MDL-37078-master' of git://github.com/sammarshallou/moodle 2012-12-17 11:36:57 +08:00
sam marshall 79e9e6049b MDL-37078: Restore - section restore fails with multiple availability conditions 2012-12-12 10:47:17 +00:00
Eloy Lafuente (stronk7) 12e13ce047 Merge branch 'MDL-32880_master_3' of git://github.com/pauln/moodle 2012-12-11 22:48:06 +01:00
Sam Hemelryk 6e68a3a93c Merge branch 'MDL-36650' of git://github.com/timhunt/moodle 2012-12-11 16:11:13 +13:00
Sam Hemelryk 0296e662a3 Merge branch 'w49_MDL-29442_m25_entityutf8' of git://github.com/skodak/moodle 2012-12-11 10:22:19 +13:00
Sam Hemelryk 13980de16b Merge branch 'MDL-33125' of git://github.com/aolley/moodle 2012-12-10 10:19:32 +13:00
Petr Škoda 1a4596e434 MDL-29442 add missing utf-8 to entity html encoding and decoding 2012-12-09 18:21:38 +01:00
Eloy Lafuente (stronk7) 03953061ca NOBUG: Bump backup relese for 2.5dev 2012-12-03 21:11:33 +01:00
Tim Hunt c23513dbe4 MDL-36650 don't change question timecreated or timemodified on restore. 2012-11-30 15:57:51 +00:00
Frederic Massart d9f95015f5 MDL-36777 usability: Theming fixes on backup steps 2012-11-30 16:53:39 +08:00
Eloy Lafuente (stronk7) 663dbbc2e6 MDL-36933 Bump everything to 2012112900
(versions, requires and dependencies)
2012-11-30 03:30:09 +01:00
Eloy Lafuente (stronk7) 08c05956e0 MDL-36933 Prepare main version and backup branch 2012-11-30 03:15:31 +01:00
Frederic Massart c384744304 MDL-36638 usability: Core changes for new quiz/question icons 2012-11-29 12:41:29 +08:00
David Monllao 4bcbdb3e88 MDL-30899 moodle-core-notification Adding close button title for accessibility 2012-11-27 14:41:42 +08:00
Adam Olley 8f27b77b26 MDL-33125: core_backup: Prevent import/activity duplication from duplicating manual grade items 2012-11-26 12:19:44 +10:30
David Mudrák 2c9689ed21 MDL-36204 Improve moodle1 conversion of embedded files
URL of files referenced in HTML fields via $@FILEPHP$@ are usually
encoded if they were linked using the HTML editor. So if they contain
spaces or plus signs in the name, their URL is encoded to use %20 and
%2B respectively.

Sometimes, for example when the HTML was edited manually in 1.9 without
the editor, non-encoded file names may be put into the HTML text. Such a
link used to work in 1.9 so we add an explicit support for it, too.

However, we do not support partially encoded URLs (e.g. only spaces are
encoded while plus signs are not). Such links are unmodified and will
rely on Legacy files support.
2012-11-23 03:39:17 +01:00
Paul Nicholls a374ba237c MDL-32880: moodle1 backup converter: add generic block handler
This handler will automatically be used for any block which does not provide its own handler, and should be subclassed by any block which needs to do anything extra (or different).

This commit incorporates contributions from Mike Churchward and API design suggestions from David Mudrak.
2012-11-23 09:28:50 +13:00
Petr Škoda 4c21b22043 MDL-36753 fix invalid sectionid in backup tests 2012-11-21 12:43:55 +01:00
Dan Poltawski c796b506be Merge branch 'MDL-33863' of git://github.com/timhunt/moodle 2012-11-20 16:15:16 +08:00
Dan Poltawski e741c4e4c0 Merge branch 'MDL-36204_master' of git://github.com/pauln/moodle 2012-11-20 12:45:08 +08:00
Jean-Michel Vedrine 334783a796 MDL-33863 question restore: better hint identification.
This is very similar to what MDL-30018 did for question_answers.
2012-11-19 23:27:44 +00:00
Dan Poltawski 0e35ba6ffc MDL-36357 cleanup - remove double semicolons 2012-11-15 09:51:26 +08:00
Paul Nicholls 36ab8f6cb6 MDL-36204: moodle1 backup converter: add unit test to cover this issue 2012-11-15 10:50:16 +13:00
Paul Nicholls bdc468f9a6 MDL-36204: moodle1 backup converter: urldecode filenames from links
If filenames are not run through urldecode(), those that contain spaces (or other url-encoded characters) will not be handled, as they can't be found in the backup file.
2012-11-15 09:26:55 +13:00
Dan Poltawski 81d7798996 Merge branch 'MDL-34520-master' of git://github.com/ankitagarwal/moodle 2012-11-14 09:55:51 +08:00
Dan Poltawski 20aea2ea0d Merge branch 'MDL-17444_localPluginBackupRestoreMaster' of https://github.com/moodlerooms/moodle 2012-11-07 14:49:15 +08:00
Mark Nielsen c7b05a1d1b MDL-17444: Backup hooks for local plugin (CR)
Code review changes
* Fixed PHPDoc
* Fixed missing MOODLE_INTERNAL check
2012-11-06 15:37:08 -08:00
Sam Chaffee a66e8bb3aa MDL-17444: Backup hooks for local plugin 2012-11-06 10:49:41 -08:00
Marina Glancy 92d38668ac MDL-35768 MDL-36017 code style corrections 2012-11-02 13:53:48 +08:00
Marina Glancy 8bc345339a MDL-36017 IMS-CC export does not filter result by numsections because it is now optional 2012-11-02 10:56:22 +08:00
Marina Glancy b5cf83f080 MDL-36017 Fields numsections, hiddensections and coursedisplay are now format-specific options
- Fields added to format_legacy as default course format options;
- Upgrade script copies fields values from table course to course_format_options;
- Fields removed from table course;
- Fields removed from edit course form;
- Since front-page course has a 'numsections' setting, format_site defines it as it's option;
- Removed accessing those fields in core code unless we know that format supports them and in this
  case instead of $course = $DB->get_record('course'); we use:
  $course = course_get_format($courseorid)->get_course(); This way all format-specific options
  are added to the $course object
2012-11-02 10:56:19 +08:00
Marina Glancy d6cd57deb6 MDL-35768 Backup and restore of course format-specific options 2012-11-02 10:55:24 +08:00
Marina Glancy 0360443020 MDL-35768 Backup and restore of section format-specific options 2012-11-02 10:55:24 +08:00
Ankit Agarwal af985a19bd MDL-34520 gradebook: Missing droplow setting in gradebook backup 2012-11-01 13:36:29 +08:00
Dan Poltawski 3b92a11098 Merge branch 'MDL-36315' of git://github.com/stronk7/moodle 2012-11-01 10:02:47 +08:00
Eloy Lafuente (stronk7) d4d7984308 MDL-36315 backup: reduce the DST tests failing-window
This reduces the period of time that some of the unit tests
for calculate_next_automated_backup() are failing right now
(from 1week to just some hours around the DST changes).

Note it's not the final solution because they will still fail
when New_York or Brussels DST changes are about to happen, but
to get this completely fixed we'll need to wait to switch from
current custom TZ/DST support to PHP built-in one.
2012-11-01 02:40:56 +01:00
Dan Poltawski 890988221c Merge branch 'MDL-35117-master' of git://github.com/FMCorz/moodle 2012-10-29 14:03:57 +08:00
Dan Poltawski 3dce356ac4 Merge branch 'MDL-34837-master' of git://github.com/FMCorz/moodle 2012-10-29 13:55:06 +08:00
Frederic Massart db6c8b82d2 MDL-35117 backup: Read information from backup XML file when removing excess backups 2012-10-18 15:13:50 +08:00
Sam Hemelryk 58e033193f Merge branch 'MDL-32148-master' of git://github.com/StudiUM/moodle 2012-10-16 11:16:33 +08:00
Mark Nielsen ac1f907e77 MDL-34837 backup: Restore does not fail when some courses have the same name 2012-10-15 17:18:34 +08:00