78480 Commits

Author SHA1 Message Date
David Monllao
c6d1eb5f51 Merge branch 'MDL-53925-master' of https://github.com/StudiUM/moodle 2016-05-03 09:54:59 +08:00
Andrew Nicols
614f7d955f Merge branch 'wip-mdl-54000-fix' of https://github.com/rajeshtaneja/moodle 2016-05-03 09:41:30 +08:00
Rajesh Taneja
5bd7abb498 MDL-54000 webservices: removed core_user_get_users_by_id
core_user_get_users_by_id is deprecated, hence
removed it from the list of mobile web services
2016-05-03 09:18:29 +08:00
Andrew Nicols
186417cd03 Merge branch 'wip-mdl-54000' of https://github.com/rajeshtaneja/moodle 2016-05-03 08:57:53 +08:00
Dan Poltawski
bda981792a Merge branch 'wip-MDL-53402-master' of git://github.com/abgreeve/moodle 2016-05-02 17:06:26 +01:00
Dan Poltawski
8adf0454c0 Merge branch 'MDL-54019_master' of git://github.com/markn86/moodle 2016-05-02 16:56:56 +01:00
Serge Gauthier
cb22606ce7 MDL-53925 competency: Plan and template descriptions are not displayed 2016-05-02 10:22:13 -04:00
Mark Nelson
e45aac5f8e MDL-54019 core_behat: fixed typo 2016-05-02 18:09:39 +08:00
Dan Poltawski
c2e07809e5 Merge branch 'wip_MDL-53033_master' of git://github.com/gjb2048/moodle 2016-05-02 10:17:12 +01:00
Dan Poltawski
1019a8f1ca Merge branch 'MDL-53904-master' of git://github.com/marinaglancy/moodle 2016-05-02 10:16:27 +01:00
Dan Poltawski
3b846632d1 Merge branch 'MDL-54008_master' of git://github.com/dmonllao/moodle 2016-05-02 09:52:16 +01:00
David Monllao
71c0a5745c Merge branch 'wip-MDL-53601-master' of git://github.com/abgreeve/moodle 2016-05-02 16:17:48 +08:00
Adrian Greeve
1beb95af48 MDL-53601 mod_assign: Behat test for group feedback. 2016-05-02 15:54:53 +08:00
Adrian Greeve
181c20bc52 MDL-53601 mod_assign: Feedback files are sent to all group members. 2016-05-02 15:54:53 +08:00
David Monllao
3ec1965570 Merge branch 'MDL-53901-master' of git://github.com/damyon/moodle 2016-05-02 15:53:57 +08:00
David Monllao
d28f187c6f Merge branch 'MDL-53635-master' of git://github.com/jleyva/moodle 2016-05-02 15:38:11 +08:00
Juan Leyva
6d782e3383 MDL-53635 message_airnotifier: Remove tags from notifications 2016-05-02 09:32:26 +02:00
David Monllao
dd215cb1a3 MDL-54008 timezone: Updating references to Caracas tz.
I've removed Caracas direct references because it would fail on
some systems, it would depend on how updated is the olson version
PHP is using.
2016-05-02 15:08:54 +08:00
David Monllao
2df5ede635 Merge branch 'MDL-54006-master' of git://github.com/lameze/moodle 2016-05-02 14:20:11 +08:00
Rajesh Taneja
5041600d53 MDL-54000 mod_assign: core_user_get_users_by_field be accessible by ajax
To display user information on new assignment UI
core_user_get_users_by_field should be accessible
by ajax
2016-05-02 14:16:29 +08:00
Andrew Nicols
5ba312bf5b Merge branch 'MDL-53920_master' of git://github.com/markn86/moodle 2016-05-02 13:43:59 +08:00
Adrian Greeve
3829d1e2c8 MDL-53402 mod_data: Behat test for entering zero in required fields. 2016-05-02 13:24:01 +08:00
Adrian Greeve
8611d1dfc7 MDL-53402 mod_data: Required fields can contain 0.
The number and text field would not accept 0 as a
valid response.
2016-05-02 13:24:01 +08:00
Andrew Nicols
b9b51b210b Merge branch 'MDL-53836-master' of git://github.com/ryanwyllie/moodle 2016-05-02 13:18:55 +08:00
Andrew Nicols
7b9cf51ad2 Merge branch 'MDL-53982-master' of git://github.com/FMCorz/moodle 2016-05-02 13:04:20 +08:00
Frederic Massart
ba7f6eeaee MDL-53982 competency: Javascript error due to string injection 2016-05-02 12:57:03 +08:00
Mark Nelson
02113beb10 MDL-53920 cohort: notify competencies on cohort deletion 2016-05-02 12:49:11 +08:00
Simey Lameze
0de3caf616 MDL-54006 tool_uploaduser: check validation result before display warning 2016-05-02 11:45:59 +08:00
Skylar Kelty
f66f7b89ec MDL-53836 mod_assign: Don't escape theme's larrow/rarrow 2016-05-02 02:55:27 +00:00
Damyon Wiese
9daa27426f MDL-53901 login: Redirect to https if loginhttps is enabled
This just prevents a double redirect.
2016-05-02 10:53:07 +08:00
David Monllao
74995620ca Merge branch 'MDL-53996-master' of git://github.com/junpataleta/moodle 2016-05-02 10:51:59 +08:00
David Monllao
f74e3ace69 Merge branch 'MDL-53980-master-enfix' of git://github.com/mudrd8mz/moodle 2016-05-02 10:46:50 +08:00
David Monllao
b4dfe61bdb Merge branch 'MDL-53877-master' of git://github.com/junpataleta/moodle 2016-05-02 10:22:25 +08:00
David Monllao
9fdcce1680 Merge branch 'MDL-53967-master' of https://github.com/sk-unikent/moodle 2016-05-02 10:15:26 +08:00
David Monllao
700f503171 Merge branch 'MDL-53994' of git://github.com/stronk7/moodle 2016-05-02 10:04:36 +08:00
Serge Gauthier
3cd9461e77 MDL-53877 competency: Help and better validation text for evidence URL 2016-05-02 10:01:24 +08:00
David Monllao
3166be0831 Merge branch 'MDL-53917-master' of git://github.com/junpataleta/moodle 2016-05-02 10:00:29 +08:00
David Monllao
a43c1ca7d4 Merge branch 'MDL-53918-master' of git://github.com/junpataleta/moodle 2016-05-02 09:54:52 +08:00
Jun Pataleta
12e649e228 MDL-53996 block_lp: Check user login before fetching block contents 2016-05-02 09:40:06 +08:00
Eloy Lafuente (stronk7)
b22692d740 Merge branch 'MDL-53955-master' of git://github.com/junpataleta/moodle 2016-04-30 09:39:16 +02:00
Eloy Lafuente (stronk7)
27d2f549d0 MDL-53994 block_feedback: Add missing include
Also, a little scenario has been added to have the behavior
covered and prevent this to happen again.
2016-04-30 07:28:18 +02:00
Dan Poltawski
3219a4535f on-demand release 3.1dev+ 2016-04-29 12:27:28 +01:00
Dan Poltawski
387caf046b NOBUG: Fixed file access permissions 2016-04-29 12:27:27 +01:00
David Monllao
3496258903 Merge branch 'MDL-53937-master' of git://github.com/FMCorz/moodle 2016-04-29 12:19:43 +01:00
Frederic Massart
42c28b0874 MDL-53937 core_competency: False negative with duedate on plan reopen 2016-04-29 12:19:43 +01:00
Dan Poltawski
02f504729a MDL-52154 lti: fix string errors
Thanks to Helen
2016-04-29 12:19:42 +01:00
David Monllao
d4a41aa252 Merge branch 'MDL-53943-master' of git://github.com/junpataleta/moodle
Conflicts:
	admin/tool/cohortroles/settings.php
2016-04-29 12:19:39 +01:00
Dan Poltawski
f6ab2b87e6 Merge branch 'MDL-53879-master' of git://github.com/FMCorz/moodle 2016-04-29 12:18:05 +01:00
Dan Poltawski
89ef883129 Merge branch 'MDL-53716-master' of git://github.com/FMCorz/moodle 2016-04-29 12:18:04 +01:00
Jun Pataleta
0bb7552429 MDL-53494 tool_lp: Set correct competency and user ID attributes
Sets the correct competency and user ID data attributes for the list of
user competencies in the plan.
2016-04-29 12:18:04 +01:00