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
David Mudrák
fb3a57e2d4
MDL-33430 Fix strict standards warning
...
Only variables should be passed by reference.
2012-06-21 12:28:09 +02:00
David Mudrák
d129c3608f
MDL-33430 Add caching into choose_repository() method
...
Simply do not repeat expensive search once the restore process decides how
to deal with the given repositoryid or repositorytype.
2012-06-21 12:17:54 +02:00
David Mudrák
2c1426743a
MDL-33430 Add process_file_aliases_queue restore step to the final task
...
This execution step tries to actually restore all aliases that were
stashed in the file aliases queue.
2012-06-21 02:31:26 +02:00
David Mudrák
83b2cc562d
MDL-33430 Set newcontextid and newitemid when sending file to the pool
2012-06-21 02:31:18 +02:00
David Mudrák
4b6b087faf
MDL-33430 Do not restore aliases yet, stash them for later processing
2012-06-21 02:29:34 +02:00
David Mudrák
79b810fdc0
MDL-33430 Include repository type in files.xml in MBZ backup file
...
This is a valuable information needed especially when restoring the MBZ
at another site. The repositoryid itself is not enough there to identify
the type of the repository.
2012-06-21 01:32:25 +02:00
Sam Hemelryk
a9efc8ddb8
Merge branch 'MDL-32908' of git://github.com/danpoltawski/moodle
2012-06-20 10:31:52 +12:00
Dan Poltawski
a80b5a0cf0
MDL-32908 - drop $USER->ajax
...
Its not been respected for some time and is just confusing
2012-06-19 15:07:18 +08:00
Eloy Lafuente (stronk7)
f18ad1b781
Merge branch 'MDL-33523_master' of git://github.com/dmiletic/moodle
2012-06-19 03:09:30 +02:00
Dan Poltawski
ad9fa9712c
Merge branch 'MDL-33756' of git://github.com/stronk7/moodle
2012-06-15 18:38:35 +08:00
Eloy Lafuente (stronk7)
936402278b
MDL-33756 backup: converters only available in general course backups.
2012-06-15 02:27:18 +02:00
Darko Miletic
7547946580
MDL-33523: Fixed item C of the issue
2012-06-14 17:12:53 -03:00
Darko Miletic
42642f6c35
MDL-33523: for for missing image (the folder.gif is no longer available)
2012-06-14 12:34:10 -03:00
Eloy Lafuente (stronk7)
0961ca7998
MDL-33682 backup: keep old behavior, aka, use section number on empty section name.
2012-06-13 00:54:21 +02:00
Tim Hunt
ff5d6f8872
MDL-33682 backup: cope with sections called '0'
...
It was not previously possible to have a section called 0 because of
bugs in the standard course formats, but we hit this with the OU course
format. You got an exception because backup settings tested to see if
their lable was empty, which means a section name of '0' was fatal.
Should work now.
2012-06-12 17:46:47 +01:00
Eloy Lafuente (stronk7)
3ea1330949
MDL-33455 restore: process grade_grades only if user matches.
...
Note this has been applied both to individual activities grade_grades
and to general ones.
2012-06-11 11:30:20 +08:00
Eloy Lafuente (stronk7)
f0852f474b
MDL-33630 backup: invalidate ids cache on temptable drop.
2012-06-10 04:57:40 +02:00
Eloy Lafuente (stronk7)
78117cb1a4
MDL-33465 fix incorrect merge conflict resolution
2012-06-08 10:55:39 +02:00
Eloy Lafuente (stronk7)
61aaad4833
Merge branch 'w23_MDL-33583_m23_keepall' of git://github.com/skodak/moodle
2012-06-08 01:56:06 +02:00
Eloy Lafuente (stronk7)
a3974b0106
Merge branch 'w23_MDL-30725_m23_backuptrash' of git://github.com/skodak/moodle
2012-06-08 01:43:40 +02:00
Sam Hemelryk
76cc4fd177
Merge branch 'MDL-33080' of git://github.com/stronk7/moodle
2012-06-08 10:23:16 +12:00
Petr Skoda
dbf7784e67
MDL-33583 really keep all automated backup files when told to do so
2012-06-07 11:05:15 +02:00
Petr Skoda
096702f698
MDL-30725 save automated external only backups directly to ext storage, do not pollute file pool
...
This solution is based on code by Tony Levi, thanks!
2012-06-07 10:49:48 +02:00
Aparup Banerjee
ac16f14512
Merge branch 'MDL-33465-master' of git://github.com/ankitagarwal/moodle
...
Conflicts:
backup/moodle2/restore_stepslib.php
2012-06-07 14:04:08 +08:00
Sam Hemelryk
dd9e2c8d44
Merge branch 'MDL-33503' of git://github.com/stronk7/moodle
2012-06-06 10:18:43 +12:00
Sam Hemelryk
7df271d9b3
Merge branch 'MDL-27559-master-v2' of https://github.com/mackensen/moodle
2012-06-06 08:51:11 +12:00
Aparup Banerjee
2330cf7af1
Merge branch 'wip-mdl-33455' of git://github.com/rajeshtaneja/moodle
2012-06-05 15:15:26 +08:00
Dan Poltawski
66726f61d0
Merge branch 'MDL-33502' of git://github.com/stronk7/moodle
2012-06-05 13:10:28 +08:00
Rajesh Taneja
a1a2cc5994
MDL-33455 gradebook: Grade will not be inserted for unknown user
2012-06-05 09:46:40 +08:00