78650 Commits

Author SHA1 Message Date
Simey Lameze
c4d692285f MDL-53923 mod_assign: test unoconv path 2016-05-16 14:08:09 +08:00
David Monllao
65cbefc403 on-demand release 3.1beta+ 2016-05-13 18:33:23 +08:00
David Monllao
60152a2828 NOBUG: Fixed SVG browser compatibility 2016-05-13 18:33:22 +08:00
David Monllao
6f8adf29fd NOBUG: ensure build number doesn't go backwards
(Due to reverts happening in MDL-45390 and MDL-52815)
2016-05-13 18:21:24 +08:00
Andrew Nicols
832ffeb204 Merge branch 'MDL-54073-master-2' of git://github.com/junpataleta/moodle 2016-05-13 18:12:33 +08:00
Andrew Nicols
d58854d3bf Merge branch 'wip-mdl-54561' of https://github.com/rajeshtaneja/moodle 2016-05-13 18:12:32 +08:00
Jun Pataleta
c89ba86342 MDL-54073 tool_lp: Unescape additional properties
* LP Blocks (Competency name)
* User evidence competency picker (User learning plan name)
* Template competencies (Course full name)
2016-05-13 18:12:32 +08:00
Andrew Nicols
e53d7e7c04 Merge branch 'MDL-50063' of git://github.com/stronk7/moodle 2016-05-13 18:12:32 +08:00
Andrew Nicols
a1057084e1 MDL-52253 scales: Correct doc 2016-05-13 18:12:31 +08:00
Damyon Wiese
d03602c86b MDL-52253 scales: Prevent deletion of the last global scale 2016-05-13 18:12:31 +08:00
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
Rajesh Taneja
790bf3ace0 MDL-54561 phpunit: only search with first 3 chars
Windows uses only the first three characters of prefix in
tempnam(), so only use first 3 chars to find if error
is logged
2016-05-13 13:33:52 +08:00
Eloy Lafuente (stronk7)
07a069f1c0 MDL-50063 unittests: Remove some unnecesary gc_collect_cycles()
Now backup and restore operations free logger resources calling
to the destroy() method. This commit ensures:

1) That gc_collect_cycles() is not used anymore in backup-related tests.
2) That all backup and restore controllers in test do always call
   to the detroy() method.
3) Some unset() calls, needed to make gc_collect_cycles() are not used
   anymore.
2016-05-13 02:50:45 +02:00
Eloy Lafuente (stronk7)
fcd3bbfee0 MDL-54205 tests: verify destroy() and close() behavior 2016-05-13 01:54:37 +02:00
Eloy Lafuente (stronk7)
da322ad078 MDL-54205 tool_recyclebin: Adding missing destroy() calls.
This was causing controller references not cleaned till gc
and loggers to remain open, leading to problems under windows.
2016-05-13 01:54:37 +02:00
Eloy Lafuente (stronk7)
53f95c99cb MDL-54205 backup: loggers close() and destroy()
Any backup & restore operation may be leaving opened files
if a file logger is being used. This implementes the close()
method, so every logger can close any resource.

Also, the recommended backup_controlled::destroy() method
now calls to new logger::destroy() method in charge of
deleting all the references and closing any resource.

Finally, some internally used controllers, were missing
their destroy call, leading to associated loggers to
remain open. Now all them are explicitly deltroyed.
2016-05-13 01:54:28 +02: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