moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
87662 commits 37 branches 540 tags 1.3 GiB
Commit graph

2737 commits

Author SHA1 Message Date
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
Stephen Bourget
db5ab8f0bb MDL-54622 Block_myprofile: Remove unused setting 2016-05-17 19:58:53 -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
Andrew Nicols
dc7e2dcf96 Merge branch 'MDL-54004_m31v2' of https://github.com/sbourget/moodle 2016-05-10 18:36:15 +08:00
Frederic Massart
525370afe1 MDL-54044 block_site_main_menu: Fixed labels not being indented 2016-05-10 12:23:29 +08:00
Stephen Bourget
bc823ac6bf MDL-54115 Behat: tests for the comments block 2016-05-09 18:55:33 -04:00
Stephen Bourget
c18aac4518 MDL-54004 Behat: tests for calendar block 2016-05-09 16:12:50 -04:00
Stephen Bourget
f464529a7a MDL-54004 Behat: tests for upcoming events block 2016-05-09 16:12:36 -04:00
Dan Poltawski
8ab776ef69 Merge branch 'MDL-54040_master' of git://github.com/dmonllao/moodle 2016-05-09 10:29:25 +01:00
Stephen Bourget
456b8a602c MDL-54003 Behat: tests for recent badges block 2016-05-06 09:27:29 +08:00
David Monllao
2e1dff9f98 MDL-54040 block_globalsearch: Centered 2016-05-04 15:59:07 +08:00
David Monllao
74995620ca Merge branch 'MDL-53996-master' of git://github.com/junpataleta/moodle 2016-05-02 10:51:59 +08:00
David Monllao
f74e3ace69 Merge branch 'MDL-53980-master-enfix' of git://github.com/mudrd8mz/moodle 2016-05-02 10:46:50 +08:00
Jun Pataleta
12e649e228 MDL-53996 block_lp: Check user login before fetching block contents 2016-05-02 09:40:06 +08:00
Eloy Lafuente (stronk7)
27d2f549d0 MDL-53994 block_feedback: Add missing include 
Also, a little scenario has been added to have the behavior
covered and prevent this to happen again.
 2016-04-30 07:28:18 +02:00
Helen Foster
a5061bf7b7 MDL-53980 lang: Merge English strings from the en_fix language pack 2016-04-28 18:32:03 +02:00
Marina Glancy
aeeeb78847 MDL-53738 feedback: enable mod and block by default 2016-04-27 13:27:12 +08:00
Frederic Massart
5592edb646 MDL-53451 competency: Improve performance by bypassing api::is_enabled() 2016-04-22 11:34:39 +08:00
Dan Poltawski
17883c016b Merge branch 'wip-MDL-52642-master' of git://github.com/abgreeve/moodle 2016-04-20 13:30:38 +01:00
Frederic Massart
b14311b2cd MDL-53760 competency: Set block_lp as default dashboard block 2016-04-18 11:06:01 +08:00
Frederic Massart
a8a10b1c46 MDL-53787 block_lp: Make sure that competencies are enabled 2016-04-18 11:06:01 +08:00
Frederic Massart
91e5464282 MDL-53700 competency: Making CiBoT happier 2016-04-18 11:06:00 +08:00
Frederic Massart
07fc0ec380 MDL-53700 competency: Implementing a URL resolver 2016-04-18 11:06:00 +08:00
Frederic Massart
a6a722d4ba MDL-53700 competency: Migrating other competency related plugins 2016-04-18 11:06:00 +08:00