Commit graph

22280 commits

Author SHA1 Message Date
Juan Leyva
b2392037e7 MDL-55415 course: Move admin options permission check to API 2016-09-05 15:42:47 +01:00
Juan Leyva
c115ff6ab5 MDL-55415 course: New WS core_course_get_user_navigation_options 2016-09-05 15:42:47 +01:00
Juan Leyva
e200200938 MDL-55415 webservice: Allow validate_courses to return contexts 2016-09-05 15:42:45 +01:00
Juan Leyva
d6cd89b110 MDL-55415 course: Move options permission check to API 2016-09-05 15:42:45 +01:00
Dan Poltawski
9dd516c432 Merge branch 'MDL-55771_master' of git://github.com/markn86/moodle 2016-09-05 10:18:53 +01:00
Dan Poltawski
a46f187431 Merge branch 'wip-mdl-55766' of https://github.com/rajeshtaneja/moodle 2016-09-05 09:24:27 +01:00
Rajesh Taneja
9b9afffe5b
MDL-55288 forms: Set data attribute to form fields 2016-09-05 14:10:24 +08:00
Marina Glancy
c6745991b1 MDL-55844 profile: display formatted course name 2016-09-05 13:05:56 +08:00
David Monllao
f1ef913364 Merge branch 'wip-MDL-55707-master' of git://github.com/abgreeve/moodle 2016-09-05 10:46:57 +08:00
Rajesh Taneja
54ced30d03
MDL-55610 behat: Clear static file cache
php file cache might be out-of-sync
to ensure full directory is deleted
clear php file cache
2016-09-05 10:18:19 +08:00
Adrian Greeve
93d3f310b0 MDL-55707 grades: Stop infinite loop when regrading. 2016-09-01 10:25:13 +08:00
Marina Glancy
6f9f8b59fa MDL-55665 charts: correction to stacked bar charts 2016-09-01 09:17:36 +08:00
Rajesh Taneja
31c8fd3e83
MDL-55766 behat: set core behat selectors if not overridden by theme 2016-08-31 07:23:13 +08:00
Eloy Lafuente (stronk7)
4bdb1298c4 Merge branch 'MDL-55237_master' of git://github.com/dmonllao/moodle 2016-08-30 12:54:46 +02:00
sam marshall
3bf0482841 MDL-55724 Glossary: Prevent infinite loop in trusttext_strip 2016-08-30 10:25:38 +01:00
Mark Nelson
8354d12d39 MDL-55771 core: added title attribute when using JS to render {{pix}} 2016-08-30 14:49:44 +08:00
Rajesh Taneja
b9b1ca9ed1
MDL-55759 behat: No profile guided alloaction in phpunit 2016-08-30 14:49:08 +08:00
Marina Glancy
0df9dce716 MDL-55581 htmlpurifier: test for attributes in video tag 2016-08-30 13:44:13 +08:00
Frederic Massart
e5e2f39ed5
MDL-55663 filter: Filters could be incorrectly reported as inactive 2016-08-30 11:22:53 +08:00
David Monllao
8bee2d8df6 MDL-55237 core_component: Fix last namespace level matching
Thanks to Andreas Grabs for proposing a fix.
2016-08-30 11:15:27 +08:00
Rajesh Taneja
cc0ac30488
MDL-55764 behat: Reset static update db list
While running multiple suites we should
ensure static cli cache is also reset.
2016-08-30 08:00:01 +08:00
Eloy Lafuente (stronk7)
ba982fef66 Merge branch 'MDL-55660-master-tablesql' of git://github.com/mudrd8mz/moodle 2016-08-29 18:59:13 +02:00
Eloy Lafuente (stronk7)
ff536f4b37 Merge branch 'MDL-55667-master-participantslink' of git://github.com/mudrd8mz/moodle 2016-08-29 16:53:46 +02:00
Eloy Lafuente (stronk7)
b5776e1b9f Merge branch 'MDL-55741' of git://github.com/timhunt/moodle 2016-08-29 14:08:37 +02:00
Cameron Ball
0f826e9f36
MDL-55587 core_media: Properly escape ampersand 2016-08-29 19:16:01 +08:00
David Mudrák
57b81c93f5 MDL-55667 navigation: Do not display site participants link to students
The problem here was that user/index.php checks the system level
capability moodle/site:viewparticipants when the user is on the front
page, and the moodle/course:viewparticipants on non-front pages.

But the navigation displayed the link by mistake even in situations,
when the user has the capability moodle/course:viewparticipants on the
front page (typically when the default role for the front page is set to
student).

Added behat tests for reproducing the bug and also for checking the
basic functionality of the feature.
2016-08-29 12:11:46 +02:00
David Monllao
c2df528806 Merge branch 'wip-MDL-55581-master' of git://github.com/marinaglancy/moodle 2016-08-29 16:53:46 +08:00
David Monllao
6893691b34 Merge branch 'MDL-55710-master' of git://github.com/lameze/moodle 2016-08-29 14:48:54 +08:00
David Monllao
ea012c47b5 Merge branch 'MDL-55650-master' of https://github.com/sammarshallou/moodle 2016-08-29 14:42:55 +08:00
David Monllao
351081b06d Merge branch 'MDL-55312_load_timeout_for_amd_modules_master' of https://github.com/gthomas2/moodle 2016-08-29 14:31:11 +08:00
David Monllao
b197b33564 Merge branch 'MDL-55665-master' of git://github.com/lameze/moodle 2016-08-29 13:26:28 +08:00
Marina Glancy
28e27ac837 MDL-55581 htmlpurifier: allow track tag in videos and audios 2016-08-29 13:25:10 +08:00
Tim Hunt
972a367b98 MDL-55741 phpunit: does not reset get_log_manager cache 2016-08-26 17:14:17 +01:00
Simey Lameze
b02e738c4f MDL-55710 core: Add support for doughnut charts 2016-08-26 13:30:02 +08:00
Simey Lameze
c574995dde MDL-55665 core: Add support for stacked bar charts 2016-08-26 13:30:01 +08:00
Mark Nelson
c0abfdabb4 MDL-55717 core: add 'ignoredirty' class to inplace editable 2016-08-25 16:01:53 +08:00
Simey Lameze
787a4da9f1 MDL-55320 core: Add generaltable class to chart data table 2016-08-25 14:38:36 +08:00
David Monllao
195288fb97 Merge branch 'wip-mdl-55072-fix' of git://github.com/rajeshtaneja/moodle 2016-08-25 10:58:01 +08:00
Simey Lameze
a5ee89f817 MDL-55665 core: Add support for stacked bar charts 2016-08-25 10:37:20 +08:00
Rajesh Taneja
cb5949e3f0 MDL-46514 behat: Get config value from db, to avoid cache 2016-08-25 10:33:32 +08:00
Rajesh Taneja
6c1cc55d92
MDL-55072 behat: Cache themesuite and theme contexts 2016-08-25 09:17:38 +08:00
Rajesh Taneja
3037458049 MDL-55072 behat: Fixed behat_selectors to be removed from contexts 2016-08-24 13:24:34 +08:00
David Monllao
30daa61475 Merge branch 'wip-mdl-55072' of https://github.com/rajeshtaneja/moodle 2016-08-24 09:26:29 +08:00
Rajesh Taneja
b4bc4286bb
MDL-55072 behat: Allow behat_selectors to be overridden
if theme/tests/behat/behat_theme_{THEME_NAME}_behat_selectors.php
file exits, and has class with same file name then we will
call behat_theme_{THEME_NAME}_behat_selectors::register_moodle_selectors()
to register theme specific selectors. If they are different
then core then they will override
2016-08-24 09:13:13 +08:00
Rajesh Taneja
5aa9b5cee3
MDL-55072 behat: Added support for overriding theme tests 2016-08-24 08:57:15 +08:00
David Monllao
bae868b903 Merge branch 'MDL-55385_master' of https://github.com/marxjohnson/moodle 2016-08-24 08:24:21 +08:00
gthomas2
16ddfd5fc2 MDL-55312 requirejs: Fix timeouts with infinite waitSeconds 2016-08-23 17:48:35 +01:00
Dan Poltawski
28b606819b Merge branch 'MDL-55628-master' of https://github.com/sammarshallou/moodle 2016-08-23 15:48:11 +01:00
Dan Poltawski
13b3bf6cd5 MDL-55423 tests: remove non-cross-db testcase
This isn't used in moodle core and is problematic on oracle, don't test
it.
2016-08-23 12:36:28 +01:00
Mark Johnson
e1093c7fa8 MDL-55385 output: Support non-integer output_buffering values 2016-08-23 11:19:04 +01:00