mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
82,151 Commits 36 Branches 519 Tags
Commit Graph

82151 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Helen Foster
67823776a0 MDL-57133 lang: Merge English strings from the en_fix language pack 2016-11-29 01:49:28 +01:00
David Monllao
3eabedbb92 Moodle release 3.2rc3 v3.2.0-rc3 2016-11-25 15:58:02 +08:00
David Monllao
9441af9596 NOBUG: Fixed file access permissions 2016-11-25 15:58:02 +08:00
David Monllao
c08a263134 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-11-25 15:58:01 +08:00
Marina Glancy
392367c4f7 MDL-56586 behat: fix behat tests to work with new add block 2016-11-25 14:04:10 +08:00
David Monllao
0d9d55a3ad Merge branch 'MDL-56584-master-fix1' of http://github.com/damyon/moodle 2016-11-25 11:15:32 +08:00
David Monllao
b4f82837ba Merge branch 'MDL-55324-master-fix' of git://github.com/cameron1729/moodle 2016-11-25 11:11:20 +08:00
David Monllao
bae517c616 Merge branch 'MDL-57094-int-patch-1' of github.com:ryanwyllie/moodle 2016-11-25 10:52:00 +08:00
David Monllao
b68af8e6f8 Merge branch 'MDL-56801-master' of git://github.com/lameze/moodle 2016-11-25 10:40:39 +08:00
Ryan Wyllie
af46d1dd23 MDL-57094 admin_tool: fix subscription behat tests 2016-11-25 02:24:33 +00:00
David Monllao
b35c209d76 MDL-56551 calendar: Update behat test according to DOM changes 2016-11-25 10:06:36 +08:00
David Monllao
b71149c9ac Merge branch 'MDL-56761-master' of git://github.com/ryanwyllie/moodle 2016-11-25 09:36:17 +08:00
Damyon Wiese
262253f624 MDL-56584 boost: Use tabindex-1 on nav drawer 
Also use aria-hidden on unicode symbol for hamburger.
 2016-11-25 09:27:17 +08:00
David Monllao
c15f993cde Merge branch 'wip-mdl-56898-fix4' of https://github.com/rajeshtaneja/moodle 2016-11-25 09:24:24 +08:00
Rajesh Taneja
d2a44a71ac
MDL-56898 behat: Focus only works with JS 2016-11-25 09:20:52 +08:00
David Monllao
92fa8b8fde Merge branch 'MDL-57126-master' of https://github.com/snake/moodle 2016-11-25 09:18:26 +08:00
David Monllao
29c96d214b Merge branch 'MDL-55857-master' of git://github.com/danpoltawski/moodle 2016-11-25 08:46:04 +08:00
Marina Glancy
1adf21fc1d MDL-57019 behat: corrections to the selectors, adding waiting 2016-11-25 08:38:24 +08:00
Jake Dallimore
d714aeb4f5 MDL-57126 core: add 'scss' to list of core filetypes. 
This allows filetype restrictions to work when uploading additional
preset files on the Boost admin settings page.
 2016-11-25 07:53:59 +08:00
Dan Poltawski
ad76556b76 Merge branch 'MDL-56948-master' of https://github.com/lucisgit/moodle 2016-11-24 15:58:05 +00:00
Dan Poltawski
9cc9690575 Merge branch 'MDL-57102-master' of git://github.com/jleyva/moodle 2016-11-24 10:43:21 +00:00
Dan Poltawski
b001cd4b17 Merge branch 'MDL-56431-filter-fix' of git://github.com/abgreeve/moodle 2016-11-24 09:45:53 +00:00
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
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