mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-12 11:32:04 +01:00
Code Issues Projects Releases Wiki Activity
55,046 Commits 36 Branches 523 Tags
Commit Graph

1908 Commits

Author SHA1 Message Date
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
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