598 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
71ff7c2c04 Merge branch 'MDL-29598_master' of git://github.com/dmonllao/moodle 2012-08-28 23:23:26 +02:00
Petr Škoda
882fb83519 MDL-35061 add more custom fields for enrol instances
This delays the splitting of plugin specific enrol info from shared enrol table.
2012-08-26 15:55:03 +02:00
sam marshall
1d1917aeaa MDL-31973 Groups: groups_members table should have 'component', 'itemid' fields 2012-08-24 15:30:13 +01:00
David Monllao
67d4424a6b 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:54:49 +08:00
Justin Filip
5bc8335c6f MDL-29598 backup Check whether a grade_letters record exists before trying to insert a new record 2012-08-24 08:54:49 +08:00
Dan Poltawski
34f5898f5e Merge branch 'MDL-34118' of git://github.com/timhunt/moodle 2012-08-21 12:29:16 +08:00
Tim Hunt
607b0a705f MDL-34118 question backup: API improvement following Eloy's review. 2012-08-17 13:15:41 +01:00
Juergen Zimmer
895d364bcf MDL-34118 question backup: fixes for usage prefixes in backups. 2012-08-17 11:15:11 +01:00
Tim Hunt
3e3ae0ee11 MDL-34118 question backup: a mod can use usages in different ways.
An activity module might want to use question_usages in different ways.
We should suppport this, because it lets people make interesting
activities.

At the moment, the backup and restore code does not support this,
because it uses fixed element names for the question_usage element and
its children. This fix changes things so that a prefix can be appended
to all the element names.
2012-08-17 11:13:10 +01:00
Frederic Massart
928928490d MDL-34872 Backup: Backup does not fail when a user is deleted 2012-08-14 17:28:31 +08:00
Tim Hunt
d0565885ae 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:36:09 +01:00
Sam Hemelryk
ac88177985 Merge branch 'MDL-32827-master' of git://github.com/ankitagarwal/moodle 2012-07-31 16:16:14 +12:00
Adrian Greeve
a689cd1def MDL-34469 - lib - replacement of the deprecated get_context_instance and get_context_by_id functions (group 15) 2012-07-30 14:59:57 +08:00
Ankit Agarwal
686ca2f5d1 MDL-32827 calendar: Added logic to handle calendar events with empty eventtypes during restore 2012-07-27 10:08:16 +08:00
Sam Hemelryk
8ab1529d8a MDL-34220 condition: Fixed up backup and restore of custom profile field conditions 2012-07-13 15:19:32 +12:00
Sam Hemelryk
a2a2e7fb4a Merge branch 'MDL-32119' of git://github.com/srynot4sale/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-07-09 16:02:49 +12:00
Sam Hemelryk
141d3c86d3 MDL-29538 condition: Tidied up user field condition code post merge 2012-07-09 11:45:44 +12:00
Mark Nelson
e01fbcf765 MDL-29538 core_condition: Integrated with the latest code, can now place user field conditions on sections as well 2012-06-26 15:18:53 +08:00
Sam Hemelryk
33e657c7e7 MDL-29538 core_condition: Pre-integration merge cleanup
* Fixed up database installation and upgrade code
* Reverted some whitespace optimisations to minimise conflicts
* Optimised commits made by Mark to reduce complexity and add tracker issue numbers
2012-06-26 15:18:53 +08:00
Mark Nelson
5fa220fbf3 MDL-29538 core_condition: backup and restore now works with the new DB structure and removed unneeded restore process 2012-06-26 15:18:52 +08:00
Mark Nelson
cb4492c200 MDL-29538 core_condition: changed the logic in the code so that it works with the new database structure as well as tidying up parts of the code 2012-06-26 15:18:52 +08:00
Mark Nelson
92fb7dd3a5 MDL-29538 core_condition: made changes to the DB structure - nb. had to rename the table due to length limit 2012-06-26 15:18:51 +08:00
Mark Nelson
76af15bb4c MDL-29538 core_condition: initial commit to add support for making things conditional on user profile fields 2012-06-26 15:18:51 +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
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
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
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
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
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)
78117cb1a4 MDL-33465 fix incorrect merge conflict resolution 2012-06-08 10:55:39 +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
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)
c76bd30885 Merge branch 'MDL-33133-master' of git://github.com/sammarshallou/moodle 2012-06-05 00:38:04 +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
Adam Olley
28729e23a4 mdl-27120 Fix static cache for backup_xml_transformer::register_link_encoders() 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