72368 Commits

Author SHA1 Message Date
Dan Poltawski
bb2b3dea79 Merge branch 'wip-mdl-49081' of https://github.com/rajeshtaneja/moodle 2015-02-10 09:08:31 +00:00
Juan Leyva
126470f3c8 MDL-49036 webservices: gradereport_user_get_grades_table ws tests 2015-02-10 09:41:28 +01:00
Jetha Chan
3451a51cdf MDL-37477 output: Add support for table captions
Conflicts:
	lib/upgrade.txt
	theme/bootstrapbase/style/moodle.css
2015-02-10 16:15:49 +08:00
David Monllao
6c33ed43cf MDL-48805 theme: Fixing trailing whitespace 2015-02-10 15:47:41 +08:00
David Monllao
fa42965c2a Merge branch 'm29_MDL-48805' of git://github.com/totara/moodle 2015-02-10 15:26:49 +08:00
Andrew Davis
b6d7cff65f MDL-48910 core_block: user_can_addto() respects applicable formats 2015-02-10 08:07:23 +01:00
David Monllao
0e8182e8f8 Merge branch 'MDL-48822-master' of git://github.com/andrewnicols/moodle 2015-02-10 14:10:28 +08:00
Zachary Durber
a6fe447a9a MDL-43415 auth_db: support textarea and uppercase fields 2015-02-10 13:47:22 +08:00
Marina Glancy
330e51fa14 MDL-10405 course: CSS classname correction 2015-02-10 13:05:51 +08:00
Simey Lameze
58ccdcd2ac MDL-48679 gradebook: helper methods for grade publishing 2015-02-10 12:46:40 +08:00
David Monllao
6e47fb1da3 Merge branch 'MDL-49024_master' of git://github.com/nadavkav/moodle 2015-02-10 12:32:23 +08:00
David Monllao
912ec5c7c2 Merge branch 'm29_MDL-49064' of git://github.com/totara/moodle 2015-02-10 11:56:52 +08:00
David Monllao
4c75cc3278 Merge branch 'MDL-48937-master' of git://github.com/FMCorz/moodle 2015-02-10 11:41:42 +08:00
David Monllao
4b408c3afe Merge branch 'MDL-48960-master' of git://github.com/danpoltawski/moodle 2015-02-10 11:12:18 +08:00
Vadim Dvorovenko
4ad0d0f2f5 MDL-43415 auth_db: Adding custom profile fields to "Lock user fields"
Adding custom profile fields to "Lock user fields". It's needed to sync
custom user profile fields with external DB.
2015-02-10 10:37:12 +08:00
David Monllao
12b20241ec Merge branch 'wip-mdl-49113' of git://github.com/rajeshtaneja/moodle 2015-02-10 10:35:00 +08:00
Matt Porritt
7e36bb7197 MDL-49034 enrol_self: Enforce maxlength in self enrolment form fields.
Alter self enrolment creation form to enforce max field lengths.
Limit "Custom instance name" (name) form field to 255 characters via maxlength.
Limit "Enrolment key" (password) form field to 50 characters via maxlength.

Fix for when the form is submitted causing a database write error to be thrown
as corresponding field "name" in the table mdl_enrol is set to varchar(255) and
database field "password" is varying(50).
2015-02-10 13:21:12 +11:00
David Monllao
04b732ede7 Merge branch 'master_MDL-48803' of git://github.com/greg-or/moodle-mod_assign 2015-02-10 10:00:23 +08:00
David Monllao
f01845c2a6 Merge branch 'MDL-48212-master' of git://github.com/ankitagarwal/moodle 2015-02-10 08:54:13 +08:00
Eloy Lafuente (stronk7)
21c7e25a94 Merge branch 'MDL-48889-master' of git://github.com/jethac/moodle 2015-02-10 01:36:27 +01:00
Eloy Lafuente (stronk7)
b7164a5c21 Merge branch 'MDL-48964' of git://github.com/jmvedrine/moodle 2015-02-10 01:09:38 +01:00
Eloy Lafuente (stronk7)
8bcc97f056 Merge branch 'MDL-49073-master' of git://github.com/jethac/moodle 2015-02-10 01:04:38 +01:00
Dan Poltawski
c874c3c455 Merge branch 'MDL-48544-master' of git://github.com/andrewnicols/moodle 2015-02-09 22:42:01 +00:00
Dan Poltawski
8edac41831 Merge branch 'MDL-43535_master' of git://github.com/dmonllao/moodle 2015-02-09 22:39:36 +00:00
Eloy Lafuente (stronk7)
f73632e089 Merge branch 'wip_MDL-49125_m29_install' of https://github.com/skodak/moodle 2015-02-09 20:01:24 +01:00
Eloy Lafuente (stronk7)
e7b63ac788 Merge branch 'MDL-49006' of git://github.com/timhunt/moodle 2015-02-09 19:32:40 +01:00
Eloy Lafuente (stronk7)
bd308dd09f Merge branch '36296-29' of git://github.com/samhemelryk/moodle 2015-02-09 18:09:15 +01:00
Dan Poltawski
4dae1afb58 Merge branch 'MDL-33648' of git://github.com/jmvedrine/moodle 2015-02-09 15:03:58 +00:00
Eloy Lafuente (stronk7)
4c55046399 Merge branch 'MDL-48357-master' of git://github.com/jleyva/moodle 2015-02-09 15:51:58 +01:00
Dan Poltawski
720931fd0e Merge branch 'wip-MDL-47558-master' of git://github.com/marinaglancy/moodle 2015-02-09 14:49:03 +00:00
Andrew Nicols
4b410a6875 MDL-48544 blocks: Only add docked tags if all blocks are docked
Previously, if all blocks were hidden, then the region was reported as
being docked eroniously and it was not possible to unhide the blocks.

Docking should have no relation to the presence of block content.
2015-02-09 20:55:10 +08:00
Dan Poltawski
b9d7f56337 Merge branch 'MDL-30239-master' of git://github.com/jleyva/moodle 2015-02-09 12:32:59 +00:00
Eloy Lafuente (stronk7)
ea4630411e Merge branch '39459-29' of git://github.com/samhemelryk/moodle 2015-02-09 13:17:32 +01:00
Eloy Lafuente (stronk7)
273612a293 Merge branch 'wip-MDL-48794-master' of git://github.com/marinaglancy/moodle 2015-02-09 13:04:58 +01:00
Dan Poltawski
8ddf449ae5 Merge branch 'MDL-44520-master' of git://github.com/xow/moodle 2015-02-09 11:33:13 +00:00
Dan Poltawski
1a12542d6a Merge branch 'MDL-48294-master' of git://github.com/jleyva/moodle 2015-02-09 11:28:21 +00:00
Dan Poltawski
0e84a95bda Merge branch 'MDL_47085_master' of https://github.com/totara/openbadges 2015-02-09 10:29:18 +00:00
Dan Poltawski
ee5a7ab5c1 Merge branch 'MDL-47953-master' of git://github.com/FMCorz/moodle 2015-02-09 10:21:40 +00:00
David Monllao
1a4764b2f0 Merge branch 'MDL-42138-master' of git://github.com/xow/moodle 2015-02-09 17:18:33 +08:00
David Monllao
a6cbafb764 Merge branch 'wip-MDL-10405-master' of git://github.com/marinaglancy/moodle 2015-02-09 17:07:58 +08:00
David Monllao
994bab56ae Merge branch 'MDL-36009-master' of git://github.com/jethac/moodle 2015-02-09 16:58:57 +08:00
Marina Glancy
bb01883867 MDL-10405 course: auto delete sections when numsections changed 2015-02-09 16:46:19 +08:00
Marina Glancy
ca9cae84ad MDL-10405 course: deleting sections 2015-02-09 16:46:07 +08:00
Ankit Agarwal
1ae85f2184 MDL-48559 Behat: Enable web cron by default in behat tests 2015-02-09 12:48:30 +05:30
Andrew Nicols
be773fd65b MDL-48221 mod_forum: Improve discussion subscription on post
If the user has posted in the forum before, follow their previous
discussion preference.

If the user has not posted before, but is subscribed to the forum, follow
their forum preference.

Otherwise, follow their user-preference.

This has the result that if a user has unsubscribed from a forum and writes
their first response; the user preference will be followed. This may
override the forum subscription.

This commit also changes from a dropdown to a checkbox in the post form.
2015-02-09 15:17:09 +08:00
Jetha Chan
6929b68bd0 MDL-36009 grader_gradereport: filler and extra user cells should not be headers 2015-02-09 13:45:33 +08:00
Yuliya Bozhko
62fef3cf7e MDL-47085 badges: Fix badges file download issues
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
2015-02-09 16:00:17 +13:00
Gregory Faller
fdc790fc94 MDL-48803 mod/lesson: add group support 2015-02-09 11:56:05 +10:30
Stephen Bourget
29732ee498 MDL-48883 Lesson: Unit Tests 2015-02-08 20:19:42 -05:00
Stephen Bourget
8101328a69 MDL-48883 Lesson: Add question viewed and answered events 2015-02-08 20:18:23 -05:00