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
Ankit Agarwal
336d8c49f4
MDL-33465 course: 'Course view section' logs should use sectionid instead of section number to generate action urls'
2012-06-05 09:33:45 +08:00
Eloy Lafuente (stronk7)
f61194e387
MDL-33080 IMSCC: look for imsmanifest.xml @ root dir
2012-06-05 01:04:29 +02:00
Eloy Lafuente (stronk7)
c76bd30885
Merge branch 'MDL-33133-master' of git://github.com/sammarshallou/moodle
2012-06-05 00:38:04 +02:00
Eloy Lafuente (stronk7)
d57e6d531f
MDL-33503 backup: Bump internal release and version information.
2012-06-04 02:35:51 +02:00
Eloy Lafuente (stronk7)
f4624b6b0b
MDL-33502 restore: there are no files with itemid based on section numbers.
2012-06-04 02:15:57 +02:00
Aparup Banerjee
380d472314
Merge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle
2012-05-30 14:22:34 +08:00
Rossiani Wijaya
6b0e5f4d6d
MDL-32766 course view section log: fixed the forth param for restore rule specification to use course_section
2012-05-30 15:41:07 +12:00
Dan Poltawski
0a16fa45ec
Merge branch 'wip-MDL-33373-master' of git://github.com/marinaglancy/moodle
2012-05-30 11:03:11 +08:00
Marina Glancy
f1bd371c79
MDL-33373 fixed bug in backup of files as a regression from MDL-28666
2012-05-30 10:11:41 +08:00
Rajesh Taneja
e7b24943e6
MDL-27120 backup: fixed docblock and code cleanup
2012-05-29 16:22:45 +08:00
Tony Levi
7f98b12f91
MDL-27120: Cache DB operations in restore_dbops
2012-05-29 14:44:07 +08:00
Tony Levi
066af1bbc7
MDL-27120: Cache dirname transformations in progressive_parser::dirname
2012-05-29 14:44:07 +08:00
Adam Olley
28729e23a4
mdl-27120 Fix static cache for backup_xml_transformer::register_link_encoders()
2012-05-29 14:44:07 +08:00
Jason Ilicic
ec404105ae
mdl-27120 Fixed incorrect variable in parameter when adding form dependencies.
2012-05-29 14:44:07 +08:00
Ashley Holman
d729ef29cf
MDL-27120 Add global cache to backup_xml_transformer::register_link_encoders()
2012-05-29 14:44:07 +08:00
Ashley Holman
631764ea2f
MDL-27120 More efficient use of QuickForms in backup UI
2012-05-29 14:44:06 +08:00
Ashley Holman
f213bbd77a
MDL-27120 backup: replace sequential scan search with hash-based lookup.
2012-05-29 14:44:06 +08:00
Aparup Banerjee
7f1fcda5ad
Revert "Merge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle"
...
MDL-27120 backup: reverting due to phpunit failure at backup/converter/moodle1/tests/fixtures/lib_test.php test_stash_storage()
This reverts commit c70b7fd81f
, reversing
changes made to e6f5528585
.
2012-05-29 14:29:09 +08:00
Aparup Banerjee
c70b7fd81f
Merge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle
2012-05-29 10:26:21 +08:00
Aaron Barnes
46eca1f77e
MDL-32119 course completion: Removed unused database structure
2012-05-29 14:17:22 +12:00
Sam Hemelryk
48cb6e0b1c
Merge branch 'MDL-33364' of git://github.com/stronk7/moodle
2012-05-28 13:51:22 +12:00
Eloy Lafuente (stronk7)
fde4c60911
MDL-33364 automated backup: return and log each course result correctly
2012-05-28 02:44:24 +02:00
Sam Hemelryk
c31081d0a4
Merge branch 'MDL-32766' of git://github.com/rwijaya/moodle
...
Conflicts:
version.php
2012-05-28 11:19:06 +12:00
Charles Fulton
80c27aab8c
MDL-27559 opendir: validate directory pointer on open
2012-05-25 08:52:12 -07:00
Dongsheng Cai
ac0628e913
MDL-33177 Fixed restore warning when backup has external contents
2012-05-22 14:43:06 +08:00
Rossiani Wijaya
15a848ba90
MDL-32766 course log: specify log for viewing course section
2012-05-22 13:50:40 +08:00
sam marshall
52e9dfc58f
MDL-33133 Conditional section: restore to existing course fix
2012-05-21 13:59:00 +01:00