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

59988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
eb8a3eeaac Merge branch 'MDL-38410_master' of git://github.com/dmonllao/moodle 2013-03-19 23:20:31 +01:00
Eloy Lafuente (stronk7)
ec05fb8367 Merge branch 'MDL-38424_master' of git://github.com/kordan/moodle 2013-03-19 23:17:39 +01:00
Eloy Lafuente (stronk7)
85620106df Merge branch 'MDL-38418-master' of git://github.com/FMCorz/moodle 2013-03-19 23:15:04 +01:00
Eloy Lafuente (stronk7)
65b5f400b8 Merge branch 'MDL-38395' of git://github.com/timhunt/moodle 2013-03-19 23:06:06 +01:00
Mary Evans
281dac44cd MDL-38380 theme_magazine: Fixed typo in style/core.css at line 980. 2013-03-19 20:30:30 +00:00
Eloy Lafuente (stronk7)
989b9ab6fb Merge branch 'MDL-38363' of git://github.com/timhunt/moodle 2013-03-19 21:02:48 +01:00
Eloy Lafuente (stronk7)
28a5cd942d Merge branch 'MDL-38355' of git://github.com/timhunt/moodle 2013-03-19 21:00:21 +01:00
Eloy Lafuente (stronk7)
e0e59a0c38 Merge branch 'w12_MDL-38558_m25_preupgrade' of git://github.com/skodak/moodle 2013-03-19 19:15:09 +01:00
Petr Škoda
6b4b74904b MDL-38558 add preupgrade script support 
This is intended things like undoing of local hacks, it is similar to older pre 2.0 upgrade hack.
 2013-03-19 19:14:01 +01:00
Eloy Lafuente (stronk7)
49ac0c5d6a Merge branch 'MDL-38388' of git://github.com/jonof/moodle 2013-03-19 18:47:39 +01:00
Eloy Lafuente (stronk7)
bab8a6724f Merge branch 'MDL-33680-m' of git://github.com/andrewnicols/moodle 2013-03-19 18:27:57 +01:00
Eloy Lafuente (stronk7)
bf2d2aa983 Merge branch 'MDL-38412' of git://github.com/timhunt/moodle 2013-03-19 18:20:47 +01:00
Eloy Lafuente (stronk7)
4e37889c41 Merge branch 'w12_MDL-38329_m25_webkit' of git://github.com/skodak/moodle 2013-03-19 18:17:11 +01:00
Eloy Lafuente (stronk7)
66f1870701 Merge branch 'w12_MDL-38180_m25_enrolpics' of git://github.com/skodak/moodle 2013-03-19 17:58:55 +01:00
Eloy Lafuente (stronk7)
58b9cd031f Merge branch 'MDL-38497-admintree-beforesibling' of git://github.com/mudrd8mz/moodle 
Conflicts:
	lib/upgrade.txt
 2013-03-19 17:16:32 +01:00
Eloy Lafuente (stronk7)
83ba845de9 Merge branch 'w12_MDL-38202_m25_loginas' of git://github.com/skodak/moodle 2013-03-19 16:51:45 +01:00
Eloy Lafuente (stronk7)
b81d5eab90 Merge branch 'MDL-38542' of git://github.com/timhunt/moodle 2013-03-19 16:48:37 +01:00
Eloy Lafuente (stronk7)
1e1815bead Merge branch 'MDL-38444' of https://github.com/ppichet/moodle 2013-03-19 16:33:28 +01:00
Tim Hunt
1736fe3f74 MDL-38542 shortanswer qtype: was broken for responses of '0'. 
This was a regression caused by MDL-37157 & MDL-37746.
 2013-03-19 13:40:51 +00:00
Eloy Lafuente (stronk7)
7c27e34742 Merge branch 'MDL-38507-m' of git://github.com/andrewnicols/moodle 2013-03-19 13:31:46 +01:00
Eloy Lafuente (stronk7)
7761a38737 Merge branch 'w12_MDL-38319_m25_roleperf' of git://github.com/skodak/moodle 2013-03-19 13:22:50 +01:00
Eloy Lafuente (stronk7)
f2bf31e886 Bump (to better detect other issues incrementing it) 2013-03-19 13:21:17 +01:00
Eloy Lafuente (stronk7)
1816c69c3f Merge branch 'MDL-38391-m' of git://github.com/andrewnicols/moodle 2013-03-19 13:17:51 +01:00
Andrew Robert Nicols
ad00331ebd MDL-38391 lib: Add missing string for YUI cachedef 2013-03-19 12:09:43 +00:00
Eloy Lafuente (stronk7)
e630729443 Merge branch 'MDL-38515-m' of git://github.com/andrewnicols/moodle 2013-03-19 12:51:47 +01:00
Andrew Robert Nicols
babf34d5cf MDL-38515 JavaScript: Correct module dependencies for core_filepicker 2013-03-19 11:42:12 +00:00
Andrew Robert Nicols
4f65d03b08 MDL-38515 JavaScript: Detect use of invalid module names in YUI dependencies 
A warning is shown in the browser console if debugging is set, but it is
not possible to return from the configFn and stop the module load attempt
from continuing.

The error is caught and an additional error is shown by yui_combo.php
 2013-03-19 11:42:12 +00:00
Eloy Lafuente (stronk7)
09fe13d123 Merge branch 'MDL-38391-m' of git://github.com/andrewnicols/moodle 2013-03-19 12:34:45 +01:00
Eloy Lafuente (stronk7)
70ca006538 Merge branch 'MDL-38397' of git://github.com/timhunt/moodle 2013-03-19 12:28:01 +01:00
Eloy Lafuente (stronk7)
5272b7a70f Merge branch 'wip-mdl-38431' of git://github.com/rajeshtaneja/moodle 2013-03-19 10:24:23 +01:00
David Monllao
1e63755fb5 MDL-38531 behat: Replacing composer install for composer update 2013-03-19 16:45:58 +08:00
David Monllao
6b6303d9a1 MDL-38411 behat: New test 2013-03-19 16:44:55 +08:00
David Monllao
b7d6c48589 MDL-38433 behat: New tests 
According to MDLQA-48
 2013-03-19 16:44:20 +08:00
David Monllao
4b61cc91ac MDL-38410 behat: Adding basic step and test for mod_choice 2013-03-19 16:42:59 +08:00
David Monllao
5cde7298e3 MDL-38410 behat: Adding new form fields 2013-03-19 16:42:59 +08:00
David Monllao
fb624374bc MDL-38410 behat: Step to select from radio inputs 2013-03-19 16:42:59 +08:00
Eloy Lafuente (stronk7)
bacd6a6f32 Merge branch 'MDL-36872-master' of git://github.com/ankitagarwal/moodle 2013-03-19 09:36:43 +01:00
Damyon Wiese
43087d02dd Merge branch 'MDL-38368-master' of git://github.com/FMCorz/moodle 2013-03-19 16:17:41 +08:00
Damyon Wiese
20139cbcef MDL-30790 folder : Whitespace fixes 2013-03-19 15:59:41 +08:00
Damyon Wiese
0cabeada65 Merge branch 'MDL-30790_25' of git://github.com/rlorenzo/moodle 2013-03-19 15:47:35 +08:00
Damyon Wiese
db98fa786e Merge branch 'wip-mdl-36395-m' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	version.php
 2013-03-19 15:18:13 +08:00
Damyon Wiese
851c304f45 Merge branch 'w12_MDL-38320_m25_logininfo' of git://github.com/skodak/moodle 2013-03-19 15:01:02 +08:00
Damyon Wiese
976b0ff2d4 Merge branch 'MDL-37959-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/formslib.php
 2013-03-19 14:54:40 +08:00
Damyon Wiese
08f5b90bb7 Merge branch 'MDL-38426_dnd_plain_text' of git://github.com/davosmith/moodle 2013-03-19 14:36:43 +08:00
Damyon Wiese
a34ffe2e2e Merge branch 'MDL-38456-mdeploy-paths' of git://github.com/mudrd8mz/moodle 2013-03-19 14:02:23 +08:00
Michael de Raadt
4b6bf04659 MDL-38543 Adjusted fieldset in select all-none fieldset check 2013-03-19 13:49:47 +08:00
Damyon Wiese
3b2a6bf555 MDL-37079 Course create/update module. Remove use of "continue 2". 2013-03-19 13:03:11 +08:00
Damyon Wiese
716db45f50 Merge branch 'MDL-38453-master' of git://github.com/FMCorz/moodle 2013-03-19 12:15:48 +08:00
Damyon Wiese
dcc5f0fe1e Merge branch 'MDL-38049-master' of git://github.com/FMCorz/moodle 2013-03-19 11:52:51 +08:00
Damyon Wiese
8f2913b936 MDL-37079 Course create/update module. Fix indenting, some comment formatting and whitespace. 2013-03-19 11:20:39 +08:00