mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 23:51:15 +01:00
Code Issues Projects Releases Wiki Activity
82,103 Commits 36 Branches 527 Tags
Commit Graph

82103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Monllao
4de871f4ca Merge branch 'MDL-57001-master' of git://github.com/damyon/moodle 2016-11-24 15:29:04 +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
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
Marina Glancy
b0842f61f4 MDL-57019 behat: new step to navigate to gradebook section 2016-11-24 12:46:27 +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
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
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
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
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
Damyon Wiese
242997744d MDL-56995 boost: Hide navigation for print media 
Hide the navigation elements, flat navigation settings menus etc when
printing.
 2016-11-23 22:32:20 +08:00
Dan Poltawski
203f51d627 MDL-57064 tests: update externallib test 2016-11-23 13:00:29 +00:00
Dan Poltawski
9f82774a8b Merge branch 'MDL-57064-master' of git://github.com/FMCorz/moodle 2016-11-23 12:46:18 +00:00
Dan Poltawski
c8012422eb Merge branch 'MDL-35949' of https://github.com/timhunt/moodle 2016-11-23 12:31:22 +00:00
Dan Poltawski
68153d5cbc Merge branch 'MDL-56564-master-2' of git://github.com/junpataleta/moodle 2016-11-23 11:27:20 +00:00
Dan Poltawski
be58f604b5 Merge branch 'MDL-57112-master' of git://github.com/cameron1729/moodle 2016-11-23 10:34:33 +00:00
Dan Poltawski
93b68886e9 Merge branch 'MDL-57093-master' of git://github.com/ryanwyllie/moodle 2016-11-23 10:32:01 +00:00
Dan Poltawski
fd111ccabf MDL-57061 boost: build js 2016-11-23 10:23:02 +00:00
Dan Poltawski
2664ef1861 Merge branch 'MDL-57061-master' of git://github.com/FMCorz/moodle 2016-11-23 10:18:48 +00:00
Adrian Greeve
58c2684db2 MDL-56431 messaging: Set focus to the write a message box. 2016-11-23 09:13:51 +00:00
Adrian Greeve
d14207fd25 MDL-56431 messaging: Adding access to messaging. 
This adds the most crucial elements needed for making
the messaging page accessible. There are still some other
areas that need addressing.
 2016-11-23 09:13:50 +00:00
Damyon Wiese
c0f89860ec MDL-56993 boost: Add behat tests for boost nav menus 2016-11-23 16:47:25 +08:00
Mark Nelson
cb8057531f MDL-56871 core_message: fix inconsistent online status between panels 2016-11-23 16:32:46 +08:00
Dan Poltawski
19d8b0f9e1 Merge branch 'MDL-56182-master' of git://github.com/FMCorz/moodle 2016-11-23 08:26:38 +00:00
Cameron Ball
1b367ac6e8
MDL-57112 blocks: Add back social_activities block for social courses. 
Courses in the social format are difficult to use. This patch
simply adds back the social activities block to the social
course format.
 2016-11-23 16:06:37 +08:00
Andrew Nicols
a954685767 Merge branch 'MDL-56988-master' of git://github.com/lameze/moodle 2016-11-23 15:53:49 +08:00
Andrew Nicols
020fb9d2dc Merge branch 'MDL-56733-master' of git://github.com/ankitagarwal/moodle 2016-11-23 15:50:38 +08:00
Ankit Agarwal
2c0dfa7d33 MDL-56733 boost: Add a preset repo link 2016-11-23 13:14:48 +05:30
Damyon Wiese
ea5084f7f1 MDL-56993 boost: Fix navigation for singleactivity format 
The single activity course format has no course front page, so we need
to make a special case for it so it's possible to get to the course
admin menu and put the course nodes in the flat navigation.
 2016-11-23 15:31:27 +08:00
Simey Lameze
270b2e443c MDL-56988 report: review and apply boosty styles to all reports 2016-11-23 15:30:32 +08:00
Mark Nelson
afa68a8174 MDL-57069 core_message: prevent past messages being loaded 2016-11-23 14:26:14 +08:00
Andrew Nicols
2a58fef860 Merge branch 'MDL-57059-master' of git://github.com/lameze/moodle 2016-11-23 14:15:42 +08:00