Dan Poltawski
7d1b63df6e
Merge branch 'MDL-56052-31' of git://github.com/damyon/moodle into MOODLE_31_STABLE
2016-10-10 14:19:06 +01:00
Dan Poltawski
1695f89400
MDL-55886 block_rss_client: fix oracle compatibility
2016-09-29 16:59:35 +01:00
Jean-Philippe Gaudreau
1706cd5f1b
MDL-56040 behat: Fixing missing "|" in tables
2016-09-23 09:19:33 -04:00
Damyon Wiese
30c5f7d5e2
MDL-56052 block_settings: race condition
...
YUI events module must be loaded before global events can be used.
2016-09-21 12:22:16 +08:00
Andrew Nicols
be686d6c54
Merge branch 'MDL-55586-31' of https://github.com/StudiUM/moodle into MOODLE_31_STABLE
2016-09-20 08:19:30 +08:00
Issam Taboubi
31ddf0fc3e
MDL-55586 blocks_lp: Translation strings in competencies
2016-09-19 12:04:45 -04:00
Jan Eberhardt
dac212419d
MDL-55932 block_rss_client: Namespace fixes
2016-09-15 13:23:32 +00:00
Marina Glancy
9135f6347e
MDL-55864 general: fix PHP7.1 strict warnings
2016-09-13 15:24:34 +01:00
Rajesh Taneja
a22a2b148d
MDL-55353 behat: Ensure teacher edit activity at different time
...
Recent activity is showing activities which were
updated since user last logged in and first modification
done on the activity. So ensure update happens at different
time than activity created.
2016-09-09 10:16:34 +08:00
David Mudrák
afb949e087
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:59 +02:00
Dan Poltawski
19660f1f0f
MDL-55391 block_rss: fix typo preventing feed title display
2016-08-19 09:44:40 +01:00
Marina Glancy
2f38964de1
MDL-55397 block_site_main_menu: eliminate CSS conflict
...
CSS for '.path-admin .buttons' defines padding, border and background that affected how main menu looks on admin pages
2016-08-11 15:42:11 +08:00
Eloy Lafuente (stronk7)
6e4672f5ce
Merge branch 'MDL-54656_m31v3' of https://github.com/sbourget/moodle into MOODLE_31_STABLE
2016-08-03 00:51:37 +02:00
Eloy Lafuente (stronk7)
5839f95f3a
Merge branch 'MDL-54657_m31v1' of https://github.com/sbourget/moodle into MOODLE_31_STABLE
2016-07-26 19:57:06 +02:00
Stephen Bourget
237f52a9fb
MDL-54657 Behat: Add tests for section_links block
2016-07-13 21:39:37 -04:00
JD
9b81a977e1
MDL-54977 blocks_navigation: Use html_writer::random_id for id
...
uniqid() may returns the same id for faster machines (seen on iis)
so use html_writer::random_id(), to ensure id is different and
navigation don't break
2016-07-13 14:01:20 +08:00
Rajesh Taneja
9d2e2a80be
MDL-54589 behat: Fixed failures for phantomjs standalone
2016-06-20 16:03:12 +08:00
Stephen Bourget
b43d3fbdcb
MDL-54656 Behat: Add tests for search_forums block
2016-06-12 21:06:59 -04:00
Eloy Lafuente (stronk7)
e7bb6f945c
Merge branch 'MDL-54739-31' of git://github.com/lameze/moodle into MOODLE_31_STABLE
2016-06-07 00:16:39 +02:00
Frederic Massart
fa46696e27
MDL-41922 mod_quiz: Don't report quiz due when an attempt was finished
2016-06-03 14:53:08 +08:00
Simey Lameze
cbf3b1db5e
MDL-54739 blocks: fix activity chooser link alignment
2016-06-03 10:44:18 +08:00
Andrew Nicols
b0f7923ff0
MDL-54722 javascript: Add YUI depend wrapper to global event
2016-06-02 10:09:31 +08:00
Andrew Nicols
eb17d699ab
Merge branch 'MDL-54722-31' of git://github.com/cameron1729/moodle into MOODLE_31_STABLE
2016-06-01 12:24:32 +08:00
Cameron Ball
4f66e19b09
MDL-54722 navigation: Properly overflow expanded nav trees
2016-06-01 10:16:46 +08:00
Andrew Nicols
328bc43039
Merge branch 'MDL-53598-31' of git://github.com/marinaglancy/moodle into MOODLE_31_STABLE
2016-06-01 08:25:26 +08:00
Marina Glancy
9fb7f10fc5
MDL-53598 block_glossary_random: do not fail if glossary was deleted
...
This commit refactors how associated glossary is searched for and removes
unnecessary DB queries. Also prevents from situations when the global glossary or course have
been deleted
2016-05-31 15:31:40 +08:00
Andrew Nicols
347cab92be
Merge branch 'MDL-54655_m31v1' of https://github.com/sbourget/moodle into MOODLE_31_STABLE
2016-05-31 13:50:17 +08:00
David Monllao
9ec8754e68
Merge branch 'MDL-53851-31' of https://github.com/blckct/moodle into MOODLE_31_STABLE
2016-05-31 11:46:25 +08:00
Stephen Bourget
b42e0d4465
MDL-54579 Behat: tests for the private_files block
2016-05-31 11:18:59 +08:00
David Monllao
eb61d44fec
Merge branch 'MDL_54002_m31v3' of https://github.com/sbourget/moodle into MOODLE_31_STABLE
2016-05-30 16:09:14 +08:00
David Monllao
5f14cedd3a
Merge branch 'MDL-54577-31' of git://github.com/cameron1729/moodle into MOODLE_31_STABLE
2016-05-30 15:45:58 +08:00
Stephen Bourget
0995a547d9
MDL-54655 Behat: Tests for the online_users block
2016-05-27 18:24:18 -04:00
Stephen Bourget
80d33cde74
MDL-54577 Behat: Add tests for messages block
2016-05-26 10:22:05 +08:00
Marina Glancy
89fba73a45
MDL-54116 block_comments: warnings when commenting outside of a course
2016-05-26 10:20:13 +08:00
Stephen Bourget
95b82c9dcf
MDL-54116 block_comments: behat test
2016-05-26 10:20:12 +08:00
Stephen Bourget
5cd7c8e84f
MDL-54002 Behat: tests for recent blogs block
2016-05-24 12:49:06 -04:00
Jakub Kania
4f92858527
MDL-53851 news block: Display news from all the accessible groups
2016-05-23 17:23:43 +02:00
Jun Pataleta
dabfdc2c6c
MDL-54664 blocks_lp: Set the layout of to review pages to standard
2016-05-23 09:51:29 +08:00
Eloy Lafuente (stronk7)
1f010acdd0
MDL-54677 upgrade: add 3.1.0 separation line to all upgrade scripts
2016-05-23 01:32:56 +02:00
David Monllao
3d562d19b9
Merge branch 'MDL-54609-master' of git://github.com/junpataleta/moodle
2016-05-20 09:22:07 +08:00
David Monllao
c879ff69f4
Merge branch 'MDL-54640_master' of git://github.com/dmonllao/moodle
2016-05-20 09:04:05 +08:00
Rajesh Taneja
442a3651ec
MDL-54640 behat: add 1 sec delay before running tasks
...
Also just execute task, as running whole cron is not
required
2016-05-20 09:02:11 +08:00
Jun Pataleta
d4b91dab8a
MDL-54609 blocks_navigation: Fix display of navigation nodes
...
* Used jQuery.append() instead of jQuery.text() to append the node's
name so that it won't be escaped twice since the name is already being
escaped in the server side via htmlentities.
2016-05-19 20:43:54 +08:00
David Monllao
ca7b16fa70
Merge branch 'MDL-54638' of git://github.com/stronk7/moodle
...
Conflicts:
mod/lti/version.php
2016-05-19 13:47:22 +08:00
Eloy Lafuente (stronk7)
1abca11e0a
MDL-54638 versions: bump all versions and requires near release
...
version = 2016052300 release version
requires= 2016051900 current rc1 version
2016-05-19 02:16:15 +02:00
Stephen Bourget
0fd2260069
MDL-54578 Behat: Add tests for the myprofile block
2016-05-18 09:08:24 -04:00
Mark Nelson
15d27733dc
MDL-52599 block_rss_client: fixed various PHP errors
2016-05-17 17:16:13 +08:00
Andrew Nicols
96fd37749e
Merge branch 'MDL-52599-master' of git://github.com/danpoltawski/moodle
2016-05-17 17:16:11 +08:00
Andrew Nicols
c3d079c8a4
Merge branch 'MDL-54131_m31v4' of git://github.com/sbourget/moodle
2016-05-17 17:16:10 +08:00
David Monllao
a7bb1dda6e
Merge branch 'MDL-53311-master-moregooderer' of git://github.com/cameron1729/moodle
2016-05-17 17:16:07 +08:00