19806 Commits

Author SHA1 Message Date
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
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
Dan Poltawski
c40678fb44 Merge branch 'MDL-49046-master' of git://github.com/damyon/moodle 2015-02-23 13:33:40 +00:00
Damyon Wiese
adeb96d28f MDL-49046 javascript: Add support for AMD modules and jquery.
Grunt is the build tool.
2015-02-23 16:23:10 +08:00
Andrew Nicols
558354df81 MDL-48807 accesslib: Change create_level_instance to recordset 2015-02-23 16:01:58 +08:00
Simey Lameze
77df1778f2 MDL-48807 core_task: change create_contexts_task to daily frequency 2015-02-23 14:33:39 +08:00
Simey Lameze
5a39b24b9a MDL-48807 accesslib: table locking fix on all create_level_instance 2015-02-23 14:25:21 +08:00
Andrew Davis
4a85b4c0d0 MDL-49008 lang: removed preemptive deleting of old language files 2015-02-22 19:58:57 +01:00
Juan Leyva
3221718eda MDL-48716 webservices: New ws core_user_remove_user_device 2015-02-19 15:15:18 +01:00
Simey Lameze
4ae5ecbeef MDL-48142 core_badge: bug fixes on badge awarded event class 2015-02-19 12:32:36 +08:00
Andrew Nicols
4ec9e2a613 Revert "Merge branch 'MDL-49154' of git://github.com/timhunt/moodle"
This reverts commit 7a5d394e3c3e0fab8200d0867f6974d9c583d6e4, reversing
changes made to 58d5cc53604aa4181adc1cddc39114f40673a2a3.
2015-02-19 08:55:22 +08:00
pau.ferrer-ocana
dd379d9af4 MDL-49234 oracle: Remove variables passed by reference error 2015-02-18 16:54:17 +01:00
Eloy Lafuente (stronk7)
e912b82704 Merge branch 'MDL-48973' of https://github.com/pauln/moodle 2015-02-17 23:51:01 +01:00
Eloy Lafuente (stronk7)
7a5d394e3c Merge branch 'MDL-49154' of git://github.com/timhunt/moodle 2015-02-17 23:44:43 +01:00
Eloy Lafuente (stronk7)
b062cd5cb1 Merge branch 'MDL-49205' of git://github.com/timhunt/moodle 2015-02-17 22:11:57 +01:00
Eloy Lafuente (stronk7)
d1b94e5437 Merge branch 'MDL-49059-split' of https://github.com/pauln/moodle 2015-02-17 20:56:45 +01:00
David Monllao
fc8f8e6e5a Merge branch 'MDL-49167-master' of git://github.com/damyon/moodle 2015-02-17 17:01:15 +08:00
Ankit Agarwal
bbcd308340 MDL-48559 behat: Moving cronclionly to the installer 2015-02-17 14:33:56 +08:00