mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
55,606 Commits 36 Branches 519 Tags
Commit Graph

1925 Commits

Author SHA1 Message Date
Sam Hemelryk
c52c034064 Merge branch 'MDL-33531_master' of git://github.com/dmonllao/moodle 2012-08-15 11:24:45 +12:00
Petr Škoda
a8c7ff1aeb MDL-34741 remove old unused restore JS code 2012-08-11 20:40:10 +02:00
David Monllao
f4162effeb MDL-33531 backup Added format_string to course shortname 2012-08-10 08:45:26 +08:00
David Monllao
bde0eac589 MDL-33531 backup Avoiding possible Notice 2012-08-10 08:45:26 +08:00
Lorenzo Nicora
ab519e888b MDL-33531 Fixed the regexp to find old backup files, considering backup_shortname backup option 2012-08-10 08:45:26 +08:00
Sam Hemelryk
d68a9af478 Merge branch 'MDL-34471-master' of git://github.com/ankitagarwal/moodle 2012-08-09 13:23:18 +12:00
Ankit Agarwal
556e9404cc MDL-34471 backup: Update the php doc block 2012-08-08 17:11:02 +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
Aparup Banerjee
67ab929cbf Revert "Merge branch 'MDL-28531-master' of git://github.com/FMCorz/moodle" 
This reverts commit e5d9cc13ac85df5fbd501ed1bc609875c829d3e1, reversing
changes made to 20c3e2534342bba4f6379573fbe28c89e0ec1d54.
 2012-08-07 14:27:01 +08:00
Aparup Banerjee
e5d9cc13ac Merge branch 'MDL-28531-master' of git://github.com/FMCorz/moodle 2012-08-07 13:58:07 +08:00
Frederic Massart
3d515f4896 MDL-28531 Backup: Automated backups run when they are scheduled 2012-08-03 09:30:39 +08:00
Tim Hunt
9dfadf9e97 MDL-34707 backup UI: only include the JS once. 2012-08-02 18:40:49 +01:00
Sam Hemelryk
ac88177985 Merge branch 'MDL-32827-master' of git://github.com/ankitagarwal/moodle 2012-07-31 16:16:14 +12:00
Sam Hemelryk
7d5f2ac2e6 Merge branch 'MDL-29007-master-3' of git://git.luns.net.uk/moodle 2012-07-31 12:05:38 +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
Andrew Robert Nicols
d2a27ab01b MDL-29007 Rename moodle-enrol-notification to moodle-core-notification 2012-07-25 16:22:18 +01: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
Dan Poltawski
e1980f8bb9 Merge branch 'w28_MDL-8249_m24_roletranslations' of git://github.com/skodak/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-07-10 09:43:23 +08:00
Sam Hemelryk
5958b17eb0 Merge branch 'MDL-29470-master' of git://github.com/FMCorz/moodle 2012-07-10 12:13:03 +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
Petr Skoda
c52551dc3c MDL-8249 localise standard role names and descriptions if empty 2012-07-06 08:22:34 +02:00
Frederic Massart
d4a49ba291 MDL-29470 Backup: fixed unexpected next automated backup date 2012-07-05 09:29:03 +08: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
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