78635 Commits

Author SHA1 Message Date
Damyon Wiese
8de0b1ab7d MDL-52253 scales: Add new competence scale 2016-05-13 18:12:28 +08:00
Damyon Wiese
81967b54b6 MDL-52253 scales: Install the separate and connected scale 2016-05-13 18:11:30 +08:00
Dan Poltawski
35f11c55fb Merge branch 'MDL-54101_master' of git://github.com/markn86/moodle 2016-05-13 18:11:29 +08:00
Dan Poltawski
6967b71a34 Merge branch 'MDL-54546-master' of git://github.com/junpataleta/moodle 2016-05-13 18:11:29 +08:00
Dan Poltawski
7fdd86247b Merge branch 'wip-mdl-54543' of https://github.com/rajeshtaneja/moodle 2016-05-13 18:11:28 +08:00
Andrew Nicols
07d4b49760 Merge branch 'MDL-54073-master' of git://github.com/junpataleta/moodle 2016-05-13 18:11:28 +08:00
Barbara Ramiro
378733a4c3 MDL-53822 editpdf: Much nicer icons for new drag-to-scroll feature 2016-05-13 18:11:28 +08:00
David Monllao
8ae171ed1c Merge branch 'MDL-53822-master' of git://github.com/damyon/moodle 2016-05-13 18:11:27 +08:00
David Monllao
ec7b75087c Merge branch 'MDL-54098-master' of git://github.com/FMCorz/moodle 2016-05-13 18:11:27 +08:00
Jun Pataleta
e5336562db MDL-54546 tool_lp: Use correct property types for user/course exporters 2016-05-12 19:04:58 +08:00
Mark Nelson
bae0f2375e MDL-54101 core: fixed core/str get_string caching issue 2016-05-12 18:58:56 +08:00
Rajesh Taneja
80b852d0c9 MDL-54543 behat: Increase file download range
with different db's, the id and defaultgrade
might be different, so increasing the range
to avoid such failures
2016-05-12 15:48:13 +08:00
Jun Pataleta
32cf4bcb93 MDL-54073 tool_lp: Unescape PARAM_TEXT properties in templates
Use triple-curly brackets to unescape the PARAM_TEXT properties in
templates.
Changed idnumber's type to PARAM_RAW for frameworks and competencies.
2016-05-12 11:24:51 +08:00
Eloy Lafuente (stronk7)
7307b2746d Merge branch 'MDL-53170_levels-fix' of git://github.com/dmonllao/moodle 2016-05-11 11:54:01 +02:00
David Monllao
724703d3e1 MDL-53170 search: Specify core_course mycourses search level 2016-05-11 17:22:24 +08:00
Dan Poltawski
57678be26e Merge branch 'MDL-54103_master' of git://github.com/markn86/moodle 2016-05-11 10:04:07 +01:00
Dan Poltawski
15ab98e4e2 Merge branch 'MDL-53293-master' of git://github.com/andrewnicols/moodle 2016-05-11 10:00:50 +01:00
Andrew Nicols
372def96c4 Merge branch 'MDL-54056-master' of git://github.com/junpataleta/moodle 2016-05-11 15:39:26 +08:00
Andrew Nicols
8e0549933e Merge branch 'MDL-54055-master' of git://github.com/junpataleta/moodle 2016-05-11 15:00:39 +08:00
Damyon Wiese
ab4d78ea82 MDL-53822 editpdf: Show different cursors for select and move 2016-05-11 14:54:38 +08:00
Andrew Nicols
e51176e598 Merge branch 'MDL-54125_master' of git://github.com/markn86/moodle 2016-05-11 14:11:07 +08:00
Jun Pataleta
5d15185247 MDL-54055 gradingform_guide: Skip insertion of empty comments
We should not be adding empty entries for the frequently-used comments.
2016-05-11 13:55:39 +08:00
Mark Nelson
2c216a6c39 MDL-54125 mod_data: fixed PHP notice
Also removed unused variables.
2016-05-11 13:01:24 +08:00
Andrew Nicols
128beb3d39 Merge branch 'MDL-53976-master' of git://github.com/jleyva/moodle 2016-05-11 12:05:43 +08:00
Andrew Nicols
7adbac5a8e Merge branch 'MDL-53580-master' of git://github.com/cameron1729/moodle 2016-05-11 11:29:57 +08:00
Andrew Nicols
ccf89705fe Merge branch 'MDL-54074-master' of git://github.com/FMCorz/moodle 2016-05-11 11:22:37 +08:00
Andrew Nicols
f092c0881d Merge branch 'MDL-52800-master' of git://github.com/ryanwyllie/moodle 2016-05-11 11:08:55 +08:00
Frederic Massart
b5a3118ddb MDL-54074 core_tag: False negative on Oracle due to random ordering 2016-05-11 10:48:31 +08:00
Andrew Nicols
7e4d43e1a2 MDL-54110 repositories: Whitespace, Typo + unit test fixes 2016-05-11 10:39:40 +08:00
Andrew Nicols
016e0abfbc Merge branch 'MDL-54110_master' of https://github.com/marxjohnson/moodle 2016-05-11 10:10:57 +08:00
David Monllao
58a2f0ac40 Merge branch 'MDL-54044-master' of git://github.com/FMCorz/moodle 2016-05-11 09:09:11 +08:00
Andrew Nicols
2239883b56 MDL-53293 tool_lp: Destroy dragdrop instance before re-creating 2016-05-11 08:19:39 +08:00
Andrew Nicols
a321eb06b7 MDL-53293 core: Add destructor phases to core-dragdrop 2016-05-11 08:19:39 +08:00
Eloy Lafuente (stronk7)
fa1e76d563 Merge branch 'MDL-53170_master' of git://github.com/dmonllao/moodle 2016-05-10 18:54:57 +02:00
Frederic Massart
9f659e1af5 MDL-54075 competency: False negatives due to random ordering and latency 2016-05-10 18:41:48 +02:00
Mark Johnson
121b67411f MDL-54110 repositories: Allow repositories to ignore post_max_size
Repositories can now override usespost() if they don't upload using POST
requests. This restores the ability of users with
moodle/course:ignorefilesizelimits to upload files of unlimited size
lost in MDL-44626.
2016-05-10 16:10:24 +01:00
Cameron Ball
8ffe9aef1f MDL-53580 auth_ldap: Set default value for suspended_attribute
It was also necessary to cast some boolean values to ints as a
workaround for moodle's broken boolean validation.
2016-05-10 23:04:46 +08:00
Dan Poltawski
8c2d47d9d8 Merge branch 'MDL-50704-master' of git://github.com/FMCorz/moodle 2016-05-10 15:59:41 +01:00
Cameron Ball
5e84acc2f3 MDL-53916 mod_assign: Point update grade link to new interface 2016-05-10 15:42:05 +01:00
David Monllao
283b1d32bd Merge branch 'MDL-54009-master' of git://github.com/ryanwyllie/moodle 2016-05-10 21:58:41 +08:00
David Monllao
677e6345c2 Merge branch 'MDL-52133-master' of git://github.com/ryanwyllie/moodle 2016-05-10 21:41:15 +08:00
David Monllao
b770c41277 Merge branch 'MDL-54120' of git://github.com/aolley/moodle 2016-05-10 21:38:30 +08:00
David Monllao
e4b5a062d8 on-demand release 3.1beta+ 2016-05-10 18:55:50 +08:00
David Monllao
23007b4134 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-05-10 18:55:48 +08:00
Andrew Nicols
0b3c3bb8eb Merge branch 'MDL-54102_master' of git://github.com/markn86/moodle 2016-05-10 18:36:16 +08:00
Andrew Nicols
30dcc059be Merge branch 'MDL-54115_m31v1' of https://github.com/sbourget/moodle 2016-05-10 18:36:16 +08:00
Andrew Nicols
837cc5ba49 MDL-54004 behat: Whitespace fixes 2016-05-10 18:36:15 +08:00
Andrew Nicols
dc7e2dcf96 Merge branch 'MDL-54004_m31v2' of https://github.com/sbourget/moodle 2016-05-10 18:36:15 +08:00
Andrew Nicols
0301e11bae Merge branch 'MDL-53821-master' of git://github.com/ryanwyllie/moodle 2016-05-10 18:36:15 +08:00
Andrew Nicols
715c3f5fef Merge branch 'MDL-52506-master' of git://github.com/ryanwyllie/moodle 2016-05-10 18:36:14 +08:00