mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
78,960 Commits 36 Branches 519 Tags
Commit Graph

2408 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
31220d5a26 Merge branch 'MDL-54739-master' of git://github.com/lameze/moodle 2016-06-07 00:04:59 +02:00
Frederic Massart
ac032e0e09
MDL-41922 mod_quiz: Don't report quiz due when an attempt was finished 2016-06-03 14:52:34 +08:00
Simey Lameze
f49a3e1791 MDL-54739 blocks: fix activity chooser link alignment 
Thanks Ryan Wyllie for the help.
 2016-06-03 10:55:52 +08:00
Andrew Nicols
05263307d7 MDL-54722 javascript: Add YUI depend wrapper to global event 2016-06-02 10:07:56 +08:00
Andrew Nicols
69dcebb04d Merge branch 'MDL-54722-master' of git://github.com/cameron1729/moodle 2016-06-01 12:24:14 +08:00
Cameron Ball
fd5466af99 MDL-54722 navigation: Properly overflow expanded nav trees 2016-06-01 10:15:22 +08:00
Andrew Nicols
e68dabc756 Merge branch 'MDL-53598-master' of git://github.com/marinaglancy/moodle 2016-06-01 08:02:32 +08:00
Marina Glancy
9c3710854b 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:30:41 +08:00
Andrew Nicols
b29d2b2aa8 Merge branch 'MDL-54655_m32v1' of https://github.com/sbourget/moodle 2016-05-31 13:29:48 +08:00
David Monllao
ba4cd26414 Merge branch 'MDL-53851-master' of https://github.com/blckct/moodle 2016-05-31 11:46:09 +08:00
Andrew Nicols
73b0dcb106 Merge branch 'MDL-54579_m31v1' of https://github.com/sbourget/moodle 2016-05-31 11:18:27 +08:00
David Monllao
abd5f819d0 Merge branch 'MDL-54002_m32v3' of https://github.com/sbourget/moodle 2016-05-30 16:08:53 +08:00
David Monllao
7e93c2e6f6 Merge branch 'MDL-54577-master' of git://github.com/cameron1729/moodle 2016-05-30 15:45:47 +08:00
Stephen Bourget
18875f811a MDL-54655 Behat: Tests for the online_users block 2016-05-27 18:21:25 -04:00
Stephen Bourget
71b1761337 MDL-54577 Behat: Add tests for messages block 2016-05-26 10:21:07 +08:00
Marina Glancy
c0e3e9da37 MDL-54116 block_comments: warnings when commenting outside of a course 2016-05-26 10:19:31 +08:00
Stephen Bourget
f2778cc5d6 MDL-54116 block_comments: behat test 2016-05-26 10:19:31 +08:00
Jakub Kania
10186fe83d MDL-53851 news block: Display news from all the accessible groups 2016-05-25 16:54:45 +02:00
Stephen Bourget
1633ec89ad MDL-54002 Behat: tests for recent blogs block 2016-05-24 12:42:31 -04:00
David Monllao
170402cb4e Merge branch 'MDL-54664-master' of git://github.com/junpataleta/moodle 2016-05-23 09:50:44 +08:00
Eloy Lafuente (stronk7)
4da854a68b MDL-54677 upgrade: add 3.1.0 separation line to all upgrade scripts 2016-05-23 01:31:34 +02:00
Jun Pataleta
16fb3f4505 MDL-54664 blocks_lp: Set the layout of to review pages to standard 2016-05-20 16:58:54 +08: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
Stephen Bourget
195b9ebb7c MDL-54579 Behat: tests for the private_files block 2016-05-19 20:01:55 -04: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
Stephen Bourget
18d157fe97 MDL-54131 Behat: Fix hide all courses test 2016-05-16 18:39:42 -04:00
Dan Poltawski
0be8dbd9b2 MDL-52599 rss block: clarifty sql and make style more moodley 2016-05-16 11:05:45 +01:00
Clement Smith
af8cab9b69 MDL-52599 blocks/rss_client: Fix RSS block config page 
This fixes an error where the RSS block config page would display
'Array' where the multiselect list of feeds should be when
accessed by a user who has not saved any RSS feed urls and yet the
block has been previously configured by another user.
 2016-05-16 11:04:36 +01:00
David Monllao
bb51d20bac Merge branch 'MDL-54133_m31v1' of https://github.com/sbourget/moodle 2016-05-16 12:03:07 +08:00
David Monllao
e68d274f45 Merge branch 'MDL-54131_m31v3' of https://github.com/sbourget/moodle 2016-05-16 12:01:37 +08:00
David Monllao
261560921d Merge branch 'MDL-54130_m31v2' of https://github.com/sbourget/moodle 2016-05-16 11:31:41 +08:00
Stephen Bourget
a7ea4fd62f MDL-54131 Behat: tests for the course list block 2016-05-13 22:05:33 -04:00
Stephen Bourget
412bde6fad MDL-54133 Behat: tests for the course overview block 2016-05-13 21:40:34 -04: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
Cameron Ball
a71b983db8 MDL-53311 block_settings: Update renderer 
The renderer and styles require changes to match the new behaviour
introduced by the modifications to tree.js and the JavaScript renderer.

The PHP renderer now closely matches the JavaScript one, and we now use
the aria-hidden attribute to determine the node state.
 2016-05-13 16:01:47 +08:00
Cameron Ball
0043daf4ca MDL-53311 block_navigation: Update renderer 
The renderer and styles require changes to match the new behaviour
introduced by the modifications to tree.js and the JavaScript renderer.

The PHP renderer now closely matches the JavaScript one, and we now use
the aria-hidden attribute to determine the node state.
 2016-05-13 16:01:47 +08:00
Cameron Ball
4838a19641 MDL-53311 navigation: Move treeitem role on to p 
Previously the li elements had the treeitem role, which was not invalid,
but it meant that when a menu item expanded, the entire li was clickable
and clicking anywhere that was not another menu item would cause the
(sub)tree to collapse. This patch moves the treeitem role on to the p
element (which contains the node name) and uses aria-owns to expand

Mad shoutouts to Ryan Wyllie for his assistance 🙌

🌄 ᚳᚱᛒ
 2016-05-13 16:01:44 +08:00
Stephen Bourget
d83d1e34e5 MDL-54130 Behat: Add tests for Completion Status block 2016-05-12 21:15:55 -04: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
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