mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 07:00:03 +01:00
Code Issues Projects Releases Wiki Activity
71,943 Commits 36 Branches 527 Tags
Commit Graph

71943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
50b7b15894 Merge branch 'MDL-40286' of git://github.com/jmvedrine/moodle 2015-01-26 18:32:43 +01:00
Eloy Lafuente (stronk7)
59a99b02ee Merge branch 'MDL-35765-master' of git://github.com/merrill-oakland/moodle 2015-01-26 17:27:54 +01:00
Eloy Lafuente (stronk7)
6c1a89f1f3 Merge branch 'MDL-36877' of git://github.com/jmvedrine/moodle 2015-01-26 16:04:29 +01:00
Eloy Lafuente (stronk7)
ec96b4b3d9 Merge branch 'MDL-48711-master' of git://github.com/merrill-oakland/moodle 2015-01-26 11:14:33 +01:00
Eloy Lafuente (stronk7)
b646a710ba Merge branch 'MDL-43421' of git://github.com/mr-russ/moodle 2015-01-26 10:24:51 +01:00
Jean-Michel Vedrine
ccf2a054ae MDL-36877 Lesson: final page not displayed if show gradebook set to no 2015-01-25 18:46:00 +01:00
Jean-Michel Vedrine
b69d512a90 MDL-40286 mod_lesson: non-editing teacher should see Grade analysis 2015-01-23 20:21:08 +01:00
Andrew Nicols
e0ae3519a1 weekly release 2.9dev 2015-01-23 08:27:32 +08:00
Andrew Nicols
3b76ea5c48 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-01-23 08:27:25 +08:00
Dan Poltawski
79d6c46df3 Merge branch 'MDL-48949' of git://github.com/timhunt/moodle 2015-01-22 17:52:20 +00:00
Tim Hunt
0065f02469 MDL-48949 mod_lti: tidy mod/lti/upgrade.txt 2015-01-22 17:28:08 +00:00
Eloy Lafuente (stronk7)
6e91426e73 Merge branch 'MDL-48493-master-autodetect' of git://github.com/mudrd8mz/moodle 2015-01-22 10:17:56 +01:00
David Mudrák
ef86599e99 MDL-48493 admin: Fix PHP warning thrown if unable to detect component 
The method detect_plugin_component() returns false or string. The
normalize_component() expects strings only. Passing false to it
(typically when the plugin does not declare its component) caused the
PHP warning.

Credit goes to Ankit Agarwal for spotting this during testing.
 2015-01-22 10:02:01 +01:00
Andrew Nicols
1cb5f61213 Revert "Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle" 
This reverts commit e08f58288af17bea8d55b66dae697d9d917053f4, reversing
changes made to 782ea98c59945864cfcc3ab44a6f17d49a9ed39f.
 2015-01-22 12:13:35 +08:00
Eloy Lafuente (stronk7)
a82d1fc4be Merge branch 'MDL-48823_master' of git://github.com/dmonllao/moodle 2015-01-21 12:32:19 +01:00
Andrew Nicols
e2a036b4a9 Merge branch 'MDL-348' of https://github.com/bostelm/moodle 2015-01-21 11:46:22 +08:00
David Monllao
8babb9606b MDL-48823 admin: Just one admin tree reload after settings changes 2015-01-21 10:41:23 +08:00
Andrew Nicols
81a9b9cee3 Merge branch 'wip-mdl-48761' of https://github.com/rajeshtaneja/moodle 2015-01-21 10:21:24 +08:00
Rajesh Taneja
d58b0ad6f1 MDL-48761 behat: Added new step for debugging scenarios 2015-01-21 10:16:22 +08:00
David Monllao
59da38ef8a Merge branch 'MDL-28513-master' of git://github.com/andrewnicols/moodle 2015-01-21 09:52:55 +08:00
Andrew Nicols
da992717f4 MDL-28513 install: Add adminemail to the CLI installers 2015-01-21 09:42:51 +08:00
Eloy Lafuente (stronk7)
6d33cf76cd Merge branch 'wip-MDL-48847-master' of git://github.com/marinaglancy/moodle 2015-01-21 00:28:30 +01:00
Eloy Lafuente (stronk7)
2d78593650 Merge branch 'MDL-48830-m' of https://github.com/micaherne/moodle 2015-01-21 00:03:56 +01:00
Eric Merrill
3f874a9d24 MDL-48711 gradebook: Properly compute extra-redit status for cat grades 
When seeing if a grade item for a category is computed for extra-credit
status, we need to use the *grandparent* of the item.
 2015-01-20 16:06:38 -05:00
Eric Merrill
4b4e41342a MDL-35765 availability: Use category total full names 2015-01-20 15:37:13 -05:00
Eloy Lafuente (stronk7)
298c45f2e3 Merge branch 'MDL-48873_master' of https://github.com/StudiUM/moodle 2015-01-20 19:23:05 +01:00
Eloy Lafuente (stronk7)
fac7cff3e2 Merge branch 'MDL-48813_m29' of git://github.com/sbourget/moodle 2015-01-20 19:20:26 +01:00
Eloy Lafuente (stronk7)
cb502499da Merge branch 'wip-mdl-48837' of https://github.com/rajeshtaneja/moodle 2015-01-20 18:52:00 +01:00
Dan Poltawski
75a67b0650 Merge branch 'MDL-48798-29' of https://github.com/vadimonus/moodle 2015-01-20 17:50:19 +00:00
Eloy Lafuente (stronk7)
ee263a454b Merge branch 'MDL-48477' of git://github.com/timhunt/moodle 2015-01-20 18:44:08 +01:00
Eloy Lafuente (stronk7)
b10b88a70b Merge branch 'MDL-48779-29' of https://github.com/vadimonus/moodle 2015-01-20 18:40:59 +01:00
Eloy Lafuente (stronk7)
d9b565e7b8 Merge branch 'MDL-47792_master' of git://github.com/dmonllao/moodle 2015-01-20 18:35:15 +01:00
Dan Poltawski
9f0c24120f Merge branch 'wip-mdl-48831' of https://github.com/rajeshtaneja/moodle 2015-01-20 17:20:58 +00:00
Dan Poltawski
cde9fece2f Merge branch 'MDL-48829' of git://github.com/timhunt/moodle 2015-01-20 17:07:52 +00:00
Eloy Lafuente (stronk7)
e08f58288a Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle 2015-01-20 17:07:34 +01:00
Eloy Lafuente (stronk7)
782ea98c59 Merge branch 'MDL-47166-master' of git://github.com/andrewnicols/moodle 2015-01-20 16:14:26 +01:00
David Monllao
53aa8423bd Merge branch 'MDL-48765-master' of git://github.com/mackensen/moodle 2015-01-20 17:08:21 +08:00
David Monllao
97b2e747ac Merge branch 'wip-MDL-20053-master' of git://github.com/abgreeve/moodle 2015-01-20 16:43:24 +08:00
David Monllao
a2574f3d46 Merge branch 'MDL-48776-master' of git://github.com/gurgus/moodle 2015-01-20 16:07:34 +08:00
Andrew Nicols
de049d9d26 Merge branch 'MDL-42172-29' of https://github.com/vadimonus/moodle 2015-01-20 15:42:11 +08:00
Andrew Nicols
e50bac7ac1 Merge branch 'MDL-35486-master' of git://github.com/danpoltawski/moodle 2015-01-20 14:00:41 +08:00
Andrew Nicols
a2209774ce Merge branch 'MDL-44560-master' of git://github.com/xow/moodle 2015-01-20 12:57:41 +08:00
Andrew Nicols
81a5c2b672 Merge branch 'MDL-38277_m29v2' of https://github.com/sbourget/moodle 2015-01-20 12:34:07 +08:00
Aaron Barnes
301bc0f249 MDL-47792 javascript: Fix for cropped headers and horizontal align 2015-01-20 11:34:47 +08:00
Andrew Nicols
b4d70adb9e Merge branch 'MDL-43163' of git://github.com/jmvedrine/moodle 2015-01-20 11:23:41 +08:00
Andrew Nicols
a8ed2e50ea Merge branch 'MDL-48596' of git://github.com/jmvedrine/moodle 2015-01-20 10:54:19 +08:00
Andrew Nicols
715b525e28 Merge branch 'MDL-48741' of git://github.com/stronk7/moodle 2015-01-20 09:40:37 +08:00
Adrian Greeve
14fb7662cc MDL-20053 mod_data: Update to fix unit tests. 2015-01-19 15:24:47 +08:00
Adrian Greeve
c1d222fcf8 MDL-20053 mod_data: Update to behat tests 
A bulk delete of entries has been added to
the behat tests.
 2015-01-19 15:24:47 +08:00
Adrian Greeve
c910cf308c MDL-20053 mod_data: Removal of individual DB call. 
The main functions for retrieving records have been
updated to include user picture information.
 2015-01-19 15:24:47 +08:00