Commit graph

1941 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
106c4841a7 Merge branch 'MDL-32880_23_3' of git://github.com/pauln/moodle into MOODLE_23_STABLE 2012-12-11 22:50:08 +01:00
Sam Hemelryk
39a36d7d7b Merge branch 'MDL-36650_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-12-11 16:11:08 +13:00
Petr Škoda
f6ca5cf303 MDL-29442 add missing utf-8 to entity html encoding and decoding 2012-12-11 10:23:12 +13:00
Sam Hemelryk
cf0451133f Merge branch 'MDL-33125_23' of git://github.com/aolley/moodle into MOODLE_23_STABLE 2012-12-10 10:19:22 +13:00
Eloy Lafuente (stronk7)
2a0ec98d6e Satisfy version checker requirements
In stable branches, 8 first digits of the backup version
must be >= than the 8 first digits of the main version.
2012-11-30 13:35:48 +01:00
Adam Olley
69b0d17436 MDL-33125: core_backup: Prevent import/activity duplication from duplicating manual grade items 2012-11-26 12:28:00 +10:30
Tim Hunt
d4eec64dc6 MDL-36650 don't change question timecreated or timemodified on restore. 2012-11-23 10:50:26 +00:00
David Mudrák
045053f641 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:51:55 +01:00
Paul Nicholls
afaabdaf27 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:01:35 +13:00
Petr Škoda
2b78a895fe MDL-36753 fix invalid sectionid in backup tests 2012-11-21 12:40:17 +01:00
Dan Poltawski
3ec8f9f74a Merge branch 'MDL-33863_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-11-20 16:16:41 +08:00
Dan Poltawski
d338726097 Merge branch 'MDL-36204_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE 2012-11-20 12:45:32 +08:00
Jean-Michel Vedrine
e2ba9a1d70 MDL-33863 question restore: better hint identification.
This is very similar to what MDL-30018 did for question_answers.
2012-11-19 23:29:32 +00:00
Paul Nicholls
bdc69570f5 MDL-36204: moodle1 backup converter: add unit test to cover this issue 2012-11-15 11:16:31 +13:00
Paul Nicholls
0dfc910131 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 11:09:58 +13:00
Ankit Agarwal
95b877b9b1 MDL-34520 gradebook: Missing droplow setting in gradebook backup 2012-11-01 15:53:23 +08:00
Dan Poltawski
35ce18a8b1 Merge branch 'MDL-36315_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE 2012-11-01 10:03:19 +08:00
Eloy Lafuente (stronk7)
391f8b395a 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:42:08 +01:00
Mark Nielsen
6e763244ed MDL-34837 backup: Restore does not fail when some courses have the same name 2012-10-15 17:19:37 +08:00
Eloy Lafuente (stronk7)
8722439751 MDL-30018 restore: better answer matching. Credit goes to Tyler Bannister, thanks!
On backup, contents are cleaned to be safe utf8. That was leading to
some matching problems on restore against not cleaned DB contents (for
already existing questions). This commit adds one fallback method to
perform the match against cleaned DB contents.
2012-09-09 20:30:02 +02:00
Eloy Lafuente (stronk7)
20182f8670 Merge branch 'MDL-33812-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-09-04 00:20:17 +02:00
Frederic Massart
3bae0b5916 MDL-28346 Backup: Backup does not fail when a file is missing 2012-09-03 14:11:37 +08:00
Frederic Massart
16ee63b4b8 MDL-28346 Backup: Restore does not fail when a file is missing 2012-09-03 14:11:37 +08:00
Frederic Massart
397afd71c3 MDL-28346 Backup: Added new status 'warning' for backup result 2012-09-03 14:11:37 +08:00
Frederic Massart
640f8eed6d MDL-33812 Backup: Added some upgrade information about the changes 2012-09-03 14:10:59 +08:00
Frederic Massart
2fd679c5e1 MDL-33812 Backup: Revert MDL-33521 2012-09-03 14:10:59 +08:00
Frederic Massart
905185dca4 MDL-33812 Backup: Respect of backup_auto_keep 2012-09-03 14:10:58 +08:00
David Monllao
b7da14f1c6 MDL-29598 backup Avoid possible future duplicate grade letters
More info in restore_activity_grades_structure_step->process_grade_letter() comments
2012-08-24 08:55:37 +08:00
Justin Filip
44ec173ea8 MDL-29598 backup Check whether a grade_letters record exists before trying to insert a new record 2012-08-24 08:55:37 +08:00
Dan Poltawski
82157094e5 Merge branch 'MDL-32705_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-08-21 12:37:54 +08:00
Eloy Lafuente (stronk7)
331d346e8f Merge branch 'MDL-34756-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-08-20 16:35:20 +02:00
Eloy Lafuente (stronk7)
8ee474b89e Merge branch 'MDL-28531-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-08-20 16:28:21 +02:00
Jason Ilicic
3f7df55d1c MDL-34529: Fixed ordering of course sections when performing import/restore by adding the sort parameter. 2012-08-20 14:00:26 +02:00
Nathan Mares
c6d7689621 MDL-34372: Fix query in backup_cron_helper so it works on Postgres 8.3
Amended by stronk7@moodle.org to use uppercase SQL keywords.
2012-08-20 13:28:37 +02:00
Frederic Massart
70746c433c MDL-34756 Unit Tests: Move backup helper tests 2012-08-20 10:26:16 +08:00
Frederic Massart
68576ef61d MDL-28531 Backup: Automated backups run when they are scheduled 2012-08-17 14:45:03 +08:00
Tim Hunt
c4f0004a0a MDL-32705 backup ui: add select all/none JavaScript on schema screens 2012-08-15 18:10:45 +01:00
David Monllao
3de32f8558 MDL-33531 backup Added format_string to course shortname 2012-08-10 08:40:18 +08:00
David Monllao
4af5c4ebf5 MDL-33531 backup Avoiding possible Notice 2012-08-10 08:40:18 +08:00
Lorenzo Nicora
203e8d4032 MDL-33531 Fixed the regexp to find old backup files, considering backup_shortname backup option 2012-08-10 08:40:18 +08:00
Tim Hunt
57f9291b23 MDL-34727 restore UI: use checkboxes for userdata.
It was using select menus for the convenience of the code, but the
inconvenience of users.

The way this fix is done is a bit hacky, but it works, makes users'
lives much better, but it would be good if someone would dehackify
this in the future.
2012-08-07 11:38:41 +01:00
Aparup Banerjee
e83629096b Revert "Merge branch 'MDL-28531-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE"
This reverts commit 162510801f, reversing
changes made to 5af69f5282.
2012-08-07 14:27:55 +08:00
Aparup Banerjee
162510801f Merge branch 'MDL-28531-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-08-07 13:58:15 +08:00
Frederic Massart
e9ec895d92 MDL-28531 Backup: Automated backups run when they are scheduled 2012-08-03 09:30:27 +08:00
Tim Hunt
7d45268bc6 MDL-34707 backup UI: only include the JS once. 2012-08-02 18:48:03 +01:00
Ankit Agarwal
0bdf18a7c9 MDL-32827 calendar: Added logic to handle calendar events with empty eventtypes during restore 2012-07-27 11:49:20 +08:00
Frederic Massart
8fb4b73f55 MDL-29470 Backup: fixed unexpected next automated backup date 2012-07-05 10:13:33 +08:00
Sam Hemelryk
088c374a6d Merge branch 'MDL-33430-reference-restore' of git://github.com/mudrd8mz/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
2012-06-22 11:56:49 +12:00
David Mudrák
7b5f67f77f MDL-33430 Notify user about file aliases failures at the final stage of the restore 2012-06-21 15:22:38 +02:00
David Mudrák
ff8734f21d MDL-33430 Give tasks an access to their current plan's results
This in turn provides access to the plan's results for both structure and
execution steps so they can register something useful there.
2012-06-21 12:28:09 +02:00