mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-01 06:22:39 +01:00
Code Issues Projects Releases Wiki Activity
60,505 Commits 36 Branches 523 Tags
Commit Graph

2070 Commits

Author SHA1 Message Date
Dan Poltawski
bf11c1d128 Merge branch 'MDL-22153' of git://github.com/stronk7/moodle 2013-04-10 10:58:32 +08:00
Dan Poltawski
0fc2ab8047 Merge branch 'MDL-37676' of git://github.com/appalachianstate/moodle 2013-04-08 14:05:21 +08:00
Eloy Lafuente (stronk7)
c1782ec626 MDL-22153 backup: delete old, unused, 1.9 files 2013-04-07 17:20:41 +02:00
Aparup Banerjee
37240ce5c6 Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	version.php
 2013-04-04 15:07:01 +08:00
Dan Poltawski
0bcdbb7ff1 Merge branch 'MDL-38735' of git://github.com/stronk7/moodle 2013-04-03 09:59:01 +08:00
Eloy Lafuente (stronk7)
5ae69b2aed MDL-38735 backup: add missing setType() to forms 2013-04-03 02:17:40 +02:00
Eloy Lafuente (stronk7)
991dcb1b82 Merge branch 'MDL-38690_master' of git://github.com/dmonllao/moodle 2013-04-02 21:01:52 +02:00
Eloy Lafuente (stronk7)
d3f422bdc1 Merge branch 'MDL-38687_master' of git://github.com/dmonllao/moodle 2013-04-02 20:46:05 +02:00
Dan Poltawski
534ee16ec0 MDL-35603 backup: fix coding style issues 2013-04-02 14:30:50 +08:00
Dan Poltawski
92d1453bcb Merge branch 'MDL-35603-import-limit' of git://github.com/rlorenzo/moodle 2013-04-02 14:25:35 +08:00
David Monllao
bdf808de30 MDL-38687 behat: New test 
According to MDLQA-4590, an admin
can restore a course back up with
it's settings retained.
 2013-04-02 14:14:01 +08:00
David Monllao
6cf9a42f6f MDL-38690 behat: New test 
According to MDLQA-327, a teacher can
import data from another course.
 2013-04-02 13:00:30 +08:00
Eloy Lafuente (stronk7)
51cae58998 Merge branch 'MDL-38689_master' of git://github.com/dmonllao/moodle 2013-04-02 02:41:44 +02:00
Eloy Lafuente (stronk7)
d6dc3019b6 Merge branch 'MDL-38686_master' of git://github.com/dmonllao/moodle 2013-04-02 02:41:33 +02:00
Eloy Lafuente (stronk7)
1c49f7ad19 Merge branch 'MDL-38688_master' of git://github.com/dmonllao/moodle 2013-04-02 02:41:25 +02:00
Marina Glancy
d1f8c1bd62 MDL-38708 Added course overview files (most often images) to courses 2013-04-02 11:08:21 +11:00
Rex Lorenzo
c4dbfb2c91 MDL-35603 - Backup - Course import selector notice 
* added new config option to determine length of courses returned by import
* added text indicator if there are more than X number of courses, similar to how the restore course list currently works
 2013-03-28 15:24:51 -07:00
David Monllao
a3dd930ec0 MDL-38686 behat: New restore course test 
According to MDLQA-4596, a teacher can change
the format of a restored course
 2013-03-28 14:43:38 +08:00
David Monllao
135c685381 MDL-38689 behat: New test 
According to MDLQA-931, a teacher can
copy an activity.
 2013-03-28 14:41:41 +08:00
David Monllao
4bd605da79 MDL-38690 behat: Step definition to import a course 2013-03-28 14:35:22 +08:00
David Monllao
00f074620e MDL-38688 behat: Restore Moodle 2 courses tests 2013-03-28 14:27:14 +08:00
David Monllao
52e8f537b9 MDL-38688 behat: Backup tests 
Complemented by restore_moodle2_courses.feature
tests.
 2013-03-28 14:27:14 +08:00
David Monllao
030a606e49 MDL-38688 behat: Steps definitions for backup/restore 2013-03-28 14:27:12 +08:00
Damyon Wiese
86d66b5a1a Merge branch 'MDL-25631' of git://github.com/merrill-oakland/moodle 2013-03-28 09:39:05 +08:00
Eric Merrill
c9deaa8e79 MDL-25631 backup Decoupling legacy files from course config settigs. If they are present, they will be restored. 2013-03-26 17:01:55 -04:00
Fred Woolard
05b733703c MDL-37676 Use course grade category if mapping fails for manual grade items 2013-03-22 08:24:33 -04:00
Michael de Raadt
4b6bf04659 MDL-38543 Adjusted fieldset in select all-none fieldset check 2013-03-19 13:49:47 +08:00
Eloy Lafuente (stronk7)
63b738a177 Merge branch 'MDL-38212' of git://github.com/timhunt/moodle 2013-03-12 16:02:39 +01:00
Jean-Michel Vedrine
3f28674535 MDL-33424 Images missing when restoring a 1.9 backup 2013-03-09 13:51:34 +01:00
Tim Hunt
658b9372ee MDL-38212 cron: display time and memory usage before each task. 
This helps diagnose problems.

Also, call gc_collect_cycles between tasks, which may reduce the
frequency of out-of-memory errors.
 2013-03-08 10:24:41 +00:00
Eloy Lafuente (stronk7)
bb8f31dbf3 MDL-31390 document the set_source_table() api change. 2013-03-04 18:18:09 +01:00
Andrew Robert Nicols
5251450372 MDL-31390 Convert set_source_sql with order clauses to set_source_table 2013-03-01 11:29:01 +00:00
Andrew Robert Nicols
d9bae60289 MDL-31390 Allow data to be sorted at backup 2013-03-01 10:03:13 +00:00
Sam Hemelryk
1727057218 MDL-37224 backup-import: better handling of search button 2013-02-21 08:23:58 +13:00
Sam Hemelryk
db6539c62a MDL-37224 backup: fixed bug when searching for a course to import 2013-02-19 09:32:01 +13:00
Eloy Lafuente (stronk7)
a3cdb2ba7e MDL-37893 Take rid of old comment. 2013-02-12 10:03:29 +01:00
Eloy Lafuente (stronk7)
b57f62c497 Merge branch 'MDL-37893-grouped-empty' of git://github.com/mudrd8mz/moodle 2013-02-12 10:02:23 +01:00
Damyon Wiese
1e7db9fee8 Merge branch 'master_MDL-35332' of git://github.com/totara/moodle 
Conflicts:
	lib/tests/moodlelib_test.php
	version.php
 2013-02-11 14:51:11 +08:00
Damyon Wiese
40f1c065b4 Merge branch 'MDL-30637-master' of git://github.com/lucisgit/moodle 2013-02-11 10:37:03 +08:00
Simon Coggins
ec2d8ceb88 MDL-35332 lib: Improve security of hashed passwords 2013-02-09 06:47:57 +13:00
David Mudrák
d0530ed444 MDL-37774 Make moodle1_file_manager::migrate_directory() support trailing slash in rootpath 
As the $rootpath is concatenated with the $relpath, we would end with a
path like course_files//file.txt. Such a path is detected as not-valid
later and an error would be thrown.

So the patch makes sure that the trailing slash is cut off and a
debugging for the developer is displayed.
 2013-02-08 11:45:24 +01:00
David Mudrák
86083f9752 MDL-37774 Add unit test to illustrate the problem with the trailing slash 
The patch introduces two new tests for moodle1_file_manager::migrate_directory().
The second test with the trailing slash reveals the trouble here.
The expected behaviour is that the method would deal with the trailing
slash. Debugging message for the developer should be displayed though.
 2013-02-08 11:41:38 +01:00
Eloy Lafuente (stronk7)
43b83ea19e MDL-37893 Always notify pending starts before dispatching chunk 2013-02-07 20:59:43 +01:00
Ruslan Kabalin
a4f1834dca MDL-30637 backup: Disable shortforms for backup interface 
As all sections requre user attention or input, there is no sense making them
collapsed in backing up interface.
 2013-02-07 14:27:02 +00:00
David Mudrák
2c06c715c7 MDL-37893 Allow elements with no final tags to form a grouped path 2013-02-07 13:00:19 +01:00
David Mudrák
98bba46b70 MDL-37893 Add unit test to demonstrate the issue 2013-02-07 13:00:18 +01:00
Eloy Lafuente (stronk7)
6617125ca4 Merge branch 'MDL-37870-progressive_parser_exception' of git://github.com/mudrd8mz/moodle 2013-02-05 10:19:06 +01:00
David Mudrák
5aeff5ebc0 MDL-37870 Fix the number of parameters when calling the parent constructor 2013-02-05 04:47:41 +01:00
Dan Poltawski
ba076613d3 Merge branch 'MDL-36986' of git://github.com/moodlerooms/moodle 2013-02-05 10:47:15 +08:00
Petr Škoda
a629ad3dff MDL-37780 fix 1.9 restore on windows 2013-01-30 20:28:06 +01:00