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

82438 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
74b8557661 Merge branch 'MDL-57013_master' of https://github.com/nadavkav/moodle 2016-11-24 09:44:32 +00:00
Adrian Greeve
72a5842bd7 MDL-56431 messaging: Added aria label to filter. 
Added an aria label to the course filter in the
messaging page.
 2016-11-24 17:33:22 +08:00
Dan Poltawski
304e8a8d0c Merge branch 'wip-MDL-56586-master-2' of git://github.com/marinaglancy/moodle 2016-11-24 09:30:29 +00:00
Dan Poltawski
c5c8f3a6f5 Merge branch 'MDL-57118-master' of git://github.com/damyon/moodle 2016-11-24 09:26:52 +00:00
Marina Glancy
86ac6a3763 MDL-57019 behat: make tab navigation compatible with boost 2016-11-24 16:47:00 +08:00
Simey Lameze
539de849cd MDL-57134 core_badges: add missing badgeslib.php include 2016-11-24 16:45:17 +08:00
David Monllao
68dde67d9f Merge branch 'MDL-57094-master' of git://github.com/ryanwyllie/moodle 2016-11-24 15:53:26 +08:00
David Monllao
8b81daf4dd Merge branch 'MDL-56429-master' of git://github.com/ryanwyllie/moodle 2016-11-24 15:47:31 +08:00
David Monllao
4de871f4ca Merge branch 'MDL-57001-master' of git://github.com/damyon/moodle 2016-11-24 15:29:04 +08:00
Damyon Wiese
a955cf531c MDL-57118 boost: Participants cog shows too much 
Because 0 == 'participants' in php.
 2016-11-24 15:27:17 +08:00
Andrew Nicols
9a102866be Merge branch 'MDL-56564-master-2' of git://github.com/junpataleta/moodle 2016-11-24 15:22:12 +08:00
David Monllao
8411e0a508 Merge branch 'wip-mdl-56797' of https://github.com/rajeshtaneja/moodle 2016-11-24 15:19:18 +08:00
Ryan Wyllie
1fb687ea8f MDL-56761 theme: fix RTL styling for hover tooltip 2016-11-24 07:12:46 +00:00
Damyon Wiese
2fedc0da7c MDL-57001 roles: Do access check for switchroles 
Put it in the API so it can't be skipped.
 2016-11-24 15:11:19 +08:00
Damyon Wiese
7dba450fd4 MDL-57001 user_menu: Hide switch roles students 
Check that there are switchable roles before showing the link in the user menu.
 2016-11-24 15:11:19 +08:00
Damyon Wiese
22b8c5b842 MDL-57001 user_menu: Fixes for unit tests 
We added a link to the user menu so we have to adjust the tests.
 2016-11-24 15:11:19 +08:00
Damyon Wiese
8c224317ee MDL-57001 switchroles: Add a cancel link to the page. 2016-11-24 15:11:19 +08:00
Damyon Wiese
70b03eff02 MDL-57001 switchroles: Move to user menu 
Take this out of the navigation and force it in the user menu.
 2016-11-24 15:11:19 +08:00
Damyon Wiese
7095f5be97 MDL-57001 usermenu: Add switch role to the bottom of the user menu 2016-11-24 15:11:19 +08:00
Andrew Nicols
4213f7e236 Merge branch 'wip-MDL-57019-fix' of https://github.com/marinaglancy/moodle 2016-11-24 15:09:43 +08:00
Simey Lameze
45d5594ecb MDL-56801 theme_boost: remove registration_textfield rule 
The registration_textfield conflicts with the form default styling and breaks form layout.
 2016-11-24 14:40:38 +08:00
Marina Glancy
bf07b81543 MDL-56586 blocks: use template for non-JS add block selector 2016-11-24 14:24:59 +08:00
Damyon Wiese
be2247fb24 MDL-56586 blocks: Do the addblock in a modal 2016-11-24 14:24:59 +08:00
Marina Glancy
b1e5624ad9 MDL-56586 blocks: Fix mess with links to permissions 
problem 1: links to blocks permissions changes were missing in boost
problem 2: when modifying link from dashboard user is returned to profile ('returnurl' passed but not respected)
problem 3: link to check permissions missing from category management page
fix: instead of respecting both 'return' and 'returnurl' parameter use only 'returnurl'
fix: use 'popup' layout when modifying permissions for a block
 2016-11-24 14:24:59 +08:00
Marina Glancy
b11916d3e7 MDL-56586 blocks: allow theme to manage "Add a block" select 2016-11-24 14:24:56 +08:00
Ryan Wyllie
de4ca62e7a MDL-56429 theme: add margin to processor settings form controls 
Add a top margin to the form controls in the processor settings modal on
the notification preferences page to separate the content from the
controls.
 2016-11-24 06:12:27 +00:00
Marina Glancy
b0842f61f4 MDL-57019 behat: new step to navigate to gradebook section 2016-11-24 12:46:27 +08:00
Cameron Ball
4d85886b5f
MDL-55324 atto_media: Reduce maximum height of atto modal 
Previously after adding a few sources or expanding a few fieldsets
the modal would be pushed off the bottom of the screen. Here we
reduce the maximum height to allow it to remain visible.
 2016-11-24 12:31:30 +08:00
David Monllao
692c1bf345 Merge branch 'MDL-56391_master-fix' of https://github.com/markn86/moodle 2016-11-24 11:28:00 +08:00
Mark Nelson
bb3a1d6f39 MDL-56391 core_user: fixed failing behat 2016-11-24 11:24:32 +08:00
Simey Lameze
b6f549d139 MDL-57097 mod_assign: add event listener to avoid form submit 2016-11-24 11:24:25 +08:00
Jun Pataleta
144c149704 MDL-56564 mod_lti: Reset fields before updating tool matches 2016-11-24 11:09:03 +08:00
Andrew Nicols
2ecb3ffa97 Merge branch 'wip-mdl-56898-fix3' of https://github.com/rajeshtaneja/moodle 2016-11-24 11:08:55 +08:00
David Monllao
fa42b7bc69 Merge branch 'MDL-57069_master' of git://github.com/markn86/moodle 2016-11-24 11:04:28 +08:00
Cameron Ball
e24699cc7a
MDL-55324 atto_media: Preserve help text when adding sources 2016-11-24 10:55:05 +08:00
David Monllao
ff8b71ef7b Merge branch 'MDL-56871_master' of git://github.com/markn86/moodle 2016-11-24 09:53:45 +08:00
David Monllao
55f8edfdf2 Merge branch 'MDL-56993-master' of git://github.com/damyon/moodle 2016-11-24 09:50:31 +08:00
David Monllao
654efef456 Merge branch 'MDL-56551-master' of git://github.com/damyon/moodle 2016-11-24 09:47:18 +08:00
Andrew Nicols
65f0ef9e34 Merge branch 'wip-mdl-57112' of https://github.com/rajeshtaneja/moodle 2016-11-24 08:43:45 +08:00
Rajesh Taneja
febbb9f8cd
MDL-57112 behat: Social activity block is by default present 2016-11-24 07:45:55 +08:00
Rajesh Taneja
8c35e49b37
MDL-56898 behat: No need to trigger error, as it sometimes hangs behat 2016-11-24 07:31:38 +08:00
Rajesh Taneja
b3502be320
MDL-56898 behat: Ensure we have button in viewport and page is stable 2016-11-24 07:27:19 +08:00
Juan Leyva
851b291998 MDL-57102 tool_mobile: Return launchurl when sign-up enabled 2016-11-23 19:35:08 +00:00
Juan Leyva
813320fbb6 MDL-57102 auth: Add new signup_is_enabled function 
And apply the function in:
- login/signup.php
- blocks/login/block_login.php
 2016-11-23 19:35:08 +00:00
Damyon Wiese
9d44510d60 MDL-57100 JS: Exceptions give exceptions 
Exceptions returned from ajax are not in the format expected by the JS, so
an error occurs and the exception popups are not appearing.
 2016-11-23 18:07:26 +00:00
Dan Poltawski
4b287476f3 Merge branch 'MDL-53964' of https://github.com/timhunt/moodle 2016-11-23 16:07:28 +00:00
AMOS bot
c61d7c0802 Merge branch 'master' into install_master 2016-11-24 00:06:13 +08:00
Dan Poltawski
183b1d6785 MDL-56995 boost: fix css lint warning 2016-11-23 15:47:12 +00:00
Dan Poltawski
2a55269ce8 Merge branch 'MDL-56584-master' of git://github.com/damyon/moodle 2016-11-23 15:44:29 +00:00
Dan Poltawski
2ec4ed4dba Merge branch 'MDL-56995-master' of git://github.com/damyon/moodle 2016-11-23 15:07:26 +00:00