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

19823 Commits

Author SHA1 Message Date
David Monllao
fa91462dfa Merge branch 'MDL-49316-master' of git://github.com/jleyva/moodle 
Conflicts:
	version.php
 2015-03-10 15:50:13 +08:00
David Monllao
2af068596a Merge branch 'MDL-49366' of git://github.com/timhunt/moodle 2015-03-10 14:41:09 +08:00
David Monllao
dbf51f9117 Merge branch 'MDL-49107-master' of git://github.com/FMCorz/moodle 2015-03-10 11:42:58 +08:00
David Monllao
ed1027765e Merge branch 'MDL-49332-master' of git://github.com/merrill-oakland/moodle 2015-03-10 10:42:42 +08:00
David Monllao
5091a63fc1 Merge branch 'MDL-46064_master' of git://github.com/markn86/moodle 2015-03-10 10:23:55 +08:00
David Monllao
039b74fd01 Merge branch 'MDL-5583-master' of git://github.com/xow/moodle 2015-03-10 10:02:23 +08:00
David Monllao
f966af0da3 Merge branch 'wip-MDL-48437_MASTER' of git://github.com/jason-platts/moodle 2015-03-10 09:56:21 +08:00
Marina Glancy
51fef1de35 MDL-49418 core: partial revert of MDL-48804 
this is a quick fix for the issue 'Course module with two or more availability restrictions is not accessible'
MDL-49434 is created to deal with the renderer access inside availability check
 2015-03-09 11:26:50 +08:00
Juan Leyva
31c202b0ab MDL-49316 webservices: Add core_course_get_courses to mobile service 2015-03-06 11:35:47 +01:00
Mark Nelson
71611510a0 MDL-46064 install: prevent install/upgrade with MyISAM 2015-03-05 22:29:34 -08:00
John Okely
9776f3dcdb MDL-5583 behat: Add multiline version of 'And I set the field to' 2015-03-06 09:55:49 +08:00
Eric Merrill
17e56698ec MDL-49332 gradebook: Raise time limit if we get into regrade 
Because all regrading should (and does) start from this point, it
is safe and best to call it just once, from this point.
 2015-03-05 10:09:40 -05:00
Tim Hunt
9c75f8dc44 MDL-49366 questions: avoid PHP notices from bad pluginfile URLs 2015-03-05 12:18:20 +00:00
Andrew Nicols
4b38a19aec Merge branch 'MDL-49164_old_rego' of https://github.com/andyjdavis/moodle 2015-03-04 08:57:00 +08:00
Andrew Davis
858e92fefe MDL-49164 admin: removed unused registration config setting 2015-03-04 08:50:39 +08:00
Dan Poltawski
e2d8685247 Merge branch 'MDL-49335' of git://github.com/timhunt/moodle 2015-03-03 14:46:34 +00:00
Dan Poltawski
2076324e7d Merge branch 'MDL-49334' of git://github.com/timhunt/moodle 2015-03-03 13:25:33 +00:00
Dan Poltawski
f7681b5181 Merge branch 'MDL-47000-master' of git://github.com/merrill-oakland/moodle 2015-03-03 13:21:30 +00:00
Tim Hunt
92caa214ef MDL-49335 Behat: new question selector 
So you can say things like
    And I click on "True" "radio" in the "First question" "question"
 2015-03-03 11:19:48 +00:00
Tim Hunt
f70fbc05e1 MDL-49334 behat: sort selector lists 2015-03-03 11:13:31 +00:00
Eloy Lafuente (stronk7)
6d46e3a4f7 Merge branch 'MDL-45621_m29v3' of git://github.com/sbourget/moodle 2015-03-03 10:54:30 +01:00
Andrew Nicols
962d7359a3 Merge branch 'MDL-49234_master' of git://github.com/crazyserver/moodle 2015-03-03 15:12:29 +08:00
Andrew Nicols
5b0f2ad976 Merge branch 'MDL-49284' of git://github.com/timhunt/moodle 2015-03-03 13:40:53 +08:00
Eloy Lafuente (stronk7)
8d9bdd28e0 MDL-49087 mdeploy: now relying on config.php documented 2015-03-03 02:45:44 +01:00
Stephen Bourget
fad20e3c82 MDL-45621 Portfolio: Allow portfolios to be uninstalled 2015-03-02 20:20:10 -05:00
Eloy Lafuente (stronk7)
e24066ff85 Merge branch 'MDL-37470' of https://github.com/mike-grant/moodle 2015-03-03 01:43:47 +01:00
Eloy Lafuente (stronk7)
fbc4839a0c Merge branch 'MDL-49240-master' of git://github.com/damyon/moodle 2015-03-03 01:11:16 +01:00
Dan Poltawski
63b0d7ab21 Merge branch 'master' of https://github.com/mitstek/moodle 2015-03-02 17:27:13 +00:00
Marina Glancy
1edd3d6fbf MDL-48804 core: do not set current course until login validated 2015-03-02 16:48:15 +01:00
Andrew Nicols
ead8b28f92 MDL-49144 blocks: Sanitise alt and title for block controls 2015-03-02 12:09:45 +00:00
Dan Poltawski
a8c56d1c26 Merge branch 'MDL-47911-master' of git://github.com/damyon/moodle 2015-03-02 11:06:18 +00:00
Eric Merrill
4ea7da7828 MDL-47911 gradebook: Improve the performance of set_usedinaggregation 
This function is called many many times during grade calculation, so it
should be as efficient as possible.
 2015-02-27 09:46:34 +08:00
Tim Hunt
b3d388c234 MDL-49284 formslib: fix strict validation of HTML. 2015-02-25 17:39:36 +00:00
Frederic Massart
39c6f62d03 MDL-49107 atto_link: Insert link even when selection is empty 2015-02-25 16:33:58 +01:00
Dan Poltawski
ecd9c732de NOBUG: Fixed file access permissions 2015-02-25 14:57:28 +00:00
Mitsuhiro Yoshida
6396b58e15 MDL-49259 lib: Fix for unzipped Japanese filename character corruption 2015-02-25 23:29:02 +09:00
Simey Lameze
2ec274f5ff MDL-48142 core_badge: final polishing on badge award event 2015-02-25 14:25:33 +00:00
Damyon Wiese
c95442b2ca MDL-49046 output: Make moodle_url->set_slashargument more robust 
It was throwing debugging when used on the install page (before config is generated).
 2015-02-25 11:28:24 +08:00
Andrew Nicols
db23cd087b Merge branch 'MDL-48716-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
	lib/db/upgrade.php
	version.php
 2015-02-25 09:20:26 +08:00
Andrew Nicols
1725c553ac MDL-49008 lang: Revert unnecessary rename warning 
This was failing unit tests because it does not check for the presence of
the source directory first. If there is no source directory, it cannot be
moved.
 2015-02-25 08:54:45 +08:00
Eric Merrill
774c00c740 MDL-47000 session: Update memcached version referecnes to 2.2.0 2015-02-24 15:18:15 -05:00
Dan Poltawski
6750b66c39 Merge branch 'MDL-48142-master' of git://github.com/lameze/moodle 2015-02-24 11:21:50 +00:00
Andrew Nicols
17dd7e7ccd Merge branch 'MDL-48730-master' of git://github.com/jleyva/moodle 
Conflicts:
	version.php
 2015-02-24 18:12:32 +08:00
Dan Poltawski
e6c453bb3d Merge branch 'MDL-48108-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	version.php
 2015-02-24 08:59:53 +00:00
Juan Leyva
5d62e813ab MDL-48730 webservices: New ws core_group_get_course_user_groups 2015-02-24 09:39:05 +01:00
Andrew Nicols
5a3fe24392 Merge branch 'MDL-49008_lang_vanish' of https://github.com/andyjdavis/moodle 2015-02-24 16:15:35 +08:00
Andrew Davis
21b859e935 MDL-29008 lang: reintroduced error silencing to prevent unit test failures 2015-02-24 09:00:25 +01:00
Damyon Wiese
bef63c520c MDL-49240 webservices: core_get_string and friends bad lang handling 
The core_get_string webservice and friends have never passed lang values
properly, (so never worked) and when I fixed that I found they were passing
lang parameter into the lazyload parameter.
 2015-02-24 15:32:17 +08:00
Andrew Nicols
2eaf309d16 Merge branch 'MDL-49008_lang_vanish' of https://github.com/andyjdavis/moodle 2015-02-24 11:07:05 +08:00
Andrew Nicols
8b52863f0a MDL-48108 core: Add new indexes to message tables 2015-02-24 09:39:05 +08:00