mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
61,447 Commits 36 Branches 519 Tags
Commit Graph

13884 Commits

Author SHA1 Message Date
David Monllao
69a397cd2c MDL-39795 behat: Adapting features to consider spaces 2013-05-27 14:24:20 +08:00
Dan Poltawski
a22b8a83e7 Merge branch 'MDL-39753' of git://github.com/stronk7/moodle 2013-05-21 10:58:37 +08:00
Eloy Lafuente (stronk7)
34e8106f5f Merge branch 'MDL-26120' of https://github.com/jacks92/moodle 2013-05-21 00:54:08 +02:00
Eloy Lafuente (stronk7)
c9e54743ec MDL-39753 Add 2.5.0 upgrade line 2013-05-20 15:33:19 +02:00
Dan Poltawski
ef78682e44 Merge branch 'w18_MDL-39374_m26_folderlog' of git://github.com/skodak/moodle 2013-05-20 17:58:09 +08:00
Dan Poltawski
b04bfcfc54 Merge branch 'wip-MDL-36020-master' of git://github.com/troylee/moodle 2013-05-20 12:42:17 +08:00
Damyon Wiese
e872912d1c Merge branch 'MDL-39363-master' of git://github.com/ankitagarwal/moodle 2013-05-20 12:12:23 +08:00
Petr Škoda
d6c60a7d16 MDL-39374 log only real folder edits 
Credit goes to Florian Zillner, thanks.
 2013-05-15 21:34:03 +02:00
Troy Lee
62af3fe42b MDL-36020 overview/report: fix quiz regrade session lock 2013-05-14 10:46:13 +08:00
Eloy Lafuente (stronk7)
522b5faf60 Merge branch 'MDL-39642-en_fix' of git://github.com/mudrd8mz/moodle 
Conflicts:
	lang/en/badges.php
 2013-05-13 12:07:55 +02:00
Helen Foster
9f3e096899 MDL-39642 Merge English strings from the en_fix language pack 2013-05-13 09:58:43 +02:00
Damyon Wiese
d9ffe3f945 Merge branch 'MDL-39611-master-int' of git://github.com/FMCorz/moodle 2013-05-13 13:22:32 +08:00
Frederic Massart
914077b4a8 MDL-39611 url: Fix setType warnings in module settings 2013-05-10 15:49:39 +08:00
Sam Hemelryk
635d8bc84b Merge branch 'MDL-39488' of git://github.com/rwijaya/moodle 2013-05-10 16:23:26 +12:00
Rossiani Wijaya
89aa433fbd MDL-39488: Lesson Module: Fixed the potential variable overwritting for answers 2013-05-10 11:14:52 +08:00
Damyon Wiese
dec909fcdd Merge branch 'MDL-38757-master-int' of git://github.com/FMCorz/moodle 2013-05-10 09:35:44 +08:00
Eloy Lafuente (stronk7)
1065589db1 Merge branch 'MDL-39586_master' of git://github.com/dmonllao/moodle 2013-05-10 02:31:50 +02:00
Eloy Lafuente (stronk7)
d560159df6 Merge branch 'MDL-39488' of git://github.com/rwijaya/moodle 2013-05-09 15:47:38 +02:00
David Monllao
5d7b6307b1 MDL-39586 behat: Closed list of stackeholders 2013-05-09 18:38:13 +08:00
Frederic Massart
9fba869836 MDL-38757 scorm: Remove advanced settings (except for Appearance) 2013-05-09 17:20:11 +08:00
Frederic Massart
20b51a1134 MDL-38757 scorm: Reformat SCORM package module settings 2013-05-09 17:20:07 +08:00
Eloy Lafuente (stronk7)
919a8db0a2 Merge branch 'MDL-39463_master' of https://github.com/markn86/moodle 2013-05-09 00:35:28 +02:00
Dan Poltawski
2022330dd7 Merge branch 'MDL-39545_master' of https://github.com/markn86/moodle 2013-05-08 12:37:18 +01:00
Mark Nelson
e019dcccdf MDL-39463 forms: use the date selectors 'optional' parameter rather than creating additional logic 2013-05-08 16:36:54 +08:00
Rossiani Wijaya
3b3e7fd11c MDL-39488 Lesson Module: Improve code performance 2013-05-08 13:53:38 +08:00
Rossiani Wijaya
51fce0f6e0 MDL-39488 Lesson Module: Fixed PHP error matching question, 
if one or more options have not been selected.
 2013-05-08 13:53:38 +08:00
Joseph Rézeau
b0e9cdd45b MDL-39488 Lesson Module: Fix for "Match question throws PHP error if one or more options have not been selected " 
Signed-off-by: Joseph Rézeau <moodle@rezeau.org>
 2013-05-08 13:53:31 +08:00
Eloy Lafuente (stronk7)
fbd84c8eb5 Merge branch 'MDL-32301_lti_instructor_params' of https://github.com/moodlerooms/moodle 2013-05-07 21:57:40 +02:00
Mark Nielsen
e91be4ffa8 MDL-32301: Allow instructor custom parameters for LTI tools 2013-05-07 10:24:32 -07:00
Dan Poltawski
49bd43c140 Merge branch 'MDL-39497-workshop-allocator-stable' of git://github.com/mudrd8mz/moodle 2013-05-07 16:42:19 +01:00
Dan Poltawski
b6009c5ca5 Merge branch 'MDL-36223-master' of git://github.com/damyon/moodle 2013-05-07 15:28:05 +01:00
Eloy Lafuente (stronk7)
fc076898c7 Merge branch 'MDL-39437' of git://github.com/rwijaya/moodle 2013-05-07 15:50:29 +02:00
Mark Nelson
34e338a458 MDL-39545 mod_assign: prevent notice from displaying when course module id does not exist 2013-05-07 17:31:14 +08:00
David Monllao
fd70acae15 MDL-39437 mod_lesson: Expanding form fieldsets before clicking elements 2013-05-07 11:11:17 +08:00
Rossiani Wijaya
7f8ce0257b MDL-39437 lesson mod: rename add a question page section name to avoid conflict in behat 2013-05-07 11:05:58 +08:00
Dan Poltawski
8a414a7950 Merge branch 'MDL-39435-master-int' of git://github.com/FMCorz/moodle 2013-05-06 16:12:28 +01:00
Damyon Wiese
14cd6479de Merge branch 'MDL-38315-master' of git://github.com/sammarshallou/moodle 2013-05-06 22:27:41 +08:00
Damyon Wiese
da97cfe35e Merge branch 'MDL-38480_m' of git://github.com/andreabix/moodle 2013-05-06 21:57:19 +08:00
Dan Poltawski
b92830664d Merge branch 'MDL-39491-workshop-media' of git://github.com/mudrd8mz/moodle 2013-05-06 13:11:46 +01:00
Damyon Wiese
76640b273d MDL-38443 Assignment: Missing permissions check on downloadall submissions 2013-05-06 10:19:23 +01:00
Eloy Lafuente (stronk7)
081bfdc5ff Merge branch 'MDL-39348_master' of git://github.com/dmonllao/moodle 2013-05-06 01:49:51 +02:00
Dan Poltawski
1fc7079857 Merge branch 'MDL-39476-master' of git://github.com/damyon/moodle 2013-05-03 16:05:41 +01:00
David Mudrák
6133e6ee76 MDL-39497 Consider workshop scheduled allocator stable 2013-05-03 15:47:03 +02:00
David Mudrák
55c6c6f153 MDL-39491 Fix order of Workshop submission text processing 
The order of format_text() and file_rewrite_pluginfile_urls() is
important to make filters work correctly.
 2013-05-03 11:56:44 +02:00
Damyon Wiese
e1cd72ec72 Merge branch 'MDL-38714_tmp' of git://github.com/rwijaya/moodle 2013-05-03 15:37:57 +08:00
Damyon Wiese
4a4f590eab MDL-39476 Assign: Cleanup old bad data before adding new index 2013-05-03 14:03:29 +08:00
David Monllao
4d40089d88 MDL-39348 behat: Changing to correct activity names 2013-05-03 10:16:44 +08:00
Damyon Wiese
f6aa750eee MDL-36223 Assign: User outline report grade display 
Use str_long_grade for user outline report because it handles scales and
no grade.

Thanks to Jean-Daniel Descoteaux for suggesting this fix.
 2013-05-02 15:42:58 +08:00
Rossiani Wijaya
343a48256a MDL-38717: Lesson mod: fixed behat script to accomodate the fix of settype() 2013-05-02 15:26:35 +08:00
Damyon Wiese
c9c01f75b1 MDL-39077 maxbytes - fix warnings for cli install 2013-05-02 12:11:08 +08:00