Commit graph

86087 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
dffca49945 Merge branch 'MDL-37810-master' of https://github.com/snake/moodle 2017-09-19 01:45:29 +02:00
Eloy Lafuente (stronk7)
00045100d0 Merge branch 'MDL-53244_master' of git://github.com/Chocolate-lightning/moodle 2017-09-19 01:42:17 +02:00
Eloy Lafuente (stronk7)
0238520084 Merge branch 'MDL-59244-master' of git://github.com/jleyva/moodle 2017-09-19 01:36:56 +02:00
Eloy Lafuente (stronk7)
5c45e6038c Merge branch 'MDL-59245-master' of git://github.com/jleyva/moodle 2017-09-19 01:33:08 +02:00
Jun Pataleta
77b5d07e31 Merge branch 'MDL-59900_master' of git://github.com/markn86/moodle 2017-09-18 16:03:46 +08:00
Jun Pataleta
58cd2bfd82 Merge branch 'MDL-59995_master' of git://github.com/markn86/moodle 2017-09-18 14:39:46 +08:00
Jun Pataleta
bf2742f2f2 Merge branch 'MDL-60065-master' of git://github.com/andrewnicols/moodle 2017-09-18 13:07:45 +08:00
Andrew Nicols
6038d62625 MDL-60065 calendar: Add threemonth view 2017-09-18 12:04:48 +08:00
Andrew Nicols
b014688581 MDL-60065 calendar: Specify optional replacement node 2017-09-18 12:04:48 +08:00
Andrew Nicols
fee025ecbb MDL-60065 calendar: Control navigation on mini 2017-09-18 12:04:48 +08:00
Andrew Nicols
b9ff690eb6 MDL-60065 calendar: Update side calendar when on CRUD events 2017-09-18 12:04:48 +08:00
Jun Pataleta
23277c9f8f Merge branch 'MDL-60125-master' of git://github.com/andrewnicols/moodle 2017-09-18 11:49:30 +08:00
Andrew Nicols
f58424c70c MDL-60125 calendar: Switch to navigation by YMD 2017-09-18 11:44:25 +08:00
Jake Dallimore
434d138c2a MDL-37810 roles: added manager case to test_get_user_roles_in_course()
Managers can assign managers, and should be able to see that role on
the course profile page, as a link to the participants page.
2017-09-18 10:16:08 +08:00
Jun Pataleta
afec1107d2 Merge branch 'MDL-59994-master-v2' of git://github.com/lameze/moodle 2017-09-18 09:10:35 +08:00
Jake Dallimore
da655d9ee4 MDL-37810 roles: get_user_roles_in_course returns all relevant roles
Fixed to return both those roles in the profileroles site policy and
any roles which the current user can assign in the respective context,
meaning a user can see a link to any role they can assign.
2017-09-18 08:59:29 +08:00
Jake Dallimore
d07006f1fd MDL-37810 core_user: fix the user renderer's usage of get_profile_roles 2017-09-18 08:59:29 +08:00
Jake Dallimore
42a2c4794d MDL-37810 roles: unit tests for get_profile_roles() 2017-09-18 08:59:29 +08:00
Jake Dallimore
7b30582669 MDL-37810 roles: fix get_profile_roles() so it returns assignable roles 2017-09-18 08:59:29 +08:00
Simey Lameze
2fc95ecf80 MDL-59994 competency: improve user competency unit test 2017-09-18 08:32:12 +08:00
Simey Lameze
8c13028c9d MDL-59994 competency: dont list competencies from deleted users 2017-09-18 08:32:12 +08:00
Dan Poltawski
91cbdda6af weekly release 3.4dev 2017-09-15 08:49:23 +01:00
Dan Poltawski
3ec75fb64d Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-09-15 08:49:21 +01:00
Dan Poltawski
f125ce6522 Merge branch 'MDL-58835_master-fix2' of https://github.com/dmonllao/moodle 2017-09-14 12:25:47 +01:00
David Monllao
3f6933d896 MDL-58835 report_insights: Force window reload when no more predictions 2017-09-14 12:55:03 +02:00
Jun Pataleta
a2bcf808d9 Merge branch 'wip-MDL-59775-fix' of https://github.com/marinaglancy/moodle 2017-09-14 12:17:14 +08:00
Marina Glancy
f9af542769 MDL-59775 forms: css correction 2017-09-14 12:05:12 +08:00
Jun Pataleta
afe9093748 Merge branch 'MDL-59926' of https://github.com/stronk7/moodle 2017-09-14 09:47:22 +08:00
Eloy Lafuente (stronk7)
583b297d6c MDL-59926 behat: Make the search bootstrapbase + boost compatible
By combining the title attribute search with the "icon" class instead
of old "img" or new "i" elements we achieve that without too much
complication.
2017-09-14 01:26:30 +02:00
Eloy Lafuente (stronk7)
c06e187aaf Merge branch 'MDL-59243-master' of git://github.com/jleyva/moodle 2017-09-13 12:09:52 +02:00
Juan Leyva
4834e127eb MDL-59243 mod_workshop: Return creation status in create_submission WS 2017-09-13 11:41:28 +02:00
Dan Poltawski
cf7430f07c Merge branch 'MDL-58835_master-fix' of git://github.com/dmonllao/moodle 2017-09-13 09:04:39 +01:00
David Monllao
a6edbef556 MDL-58835 report_insights: Fix redirections 2017-09-13 09:49:14 +02:00
Mark Nelson
9a1067f389 MDL-59900 core_admin: moved analytic links to their own category 2017-09-13 11:40:40 +08:00
AMOS bot
648e9e1b17 Automatically generated installer lang files 2017-09-13 00:06:29 +08:00
Dan Poltawski
59f431e8a7 Merge branch 'MDL-59084-master' of git://github.com/andrewnicols/moodle 2017-09-12 15:28:26 +01:00
Andrew Nicols
7e4c4b6f1f MDL-59084 core: Allow adhoc tasks to run as a specified user 2017-09-12 21:58:50 +08:00
Dan Poltawski
77d2c7b937 Merge branch 'MDL-60039_master' of git://github.com/dmonllao/moodle 2017-09-12 11:28:59 +01:00
David Monllao
d08f177042 MDL-60039 search: Force messaging search areas to be reindexed 2017-09-12 11:57:00 +02:00
Dan Poltawski
68e3c5f71b Merge branch 'MDL-59929' of git://github.com/timhunt/moodle 2017-09-12 10:54:11 +01:00
Eloy Lafuente (stronk7)
2c821c1b82 Merge branch 'wip-MDL-59775-master' of git://github.com/marinaglancy/moodle 2017-09-12 11:44:47 +02:00
Mark Nelson
391663ce28 MDL-59995 core_admin: added setting to define Python bin path 2017-09-12 17:33:16 +08:00
Dan Poltawski
8e085aacc0 Merge branch 'MDL-58835_master' of git://github.com/dmonllao/moodle 2017-09-12 09:44:56 +01:00
Eloy Lafuente (stronk7)
776ca0238e Merge branch 'MDL-59761-master' of git://github.com/danpoltawski/moodle 2017-09-12 10:41:17 +02:00
David Monllao
0500bc49f1 Merge branch 'MDL-57407-master' of git://github.com/jleyva/moodle 2017-09-12 10:33:30 +02:00
Jun Pataleta
d887e98b56 Merge branch 'MDL-59243-master' of git://github.com/jleyva/moodle 2017-09-12 16:29:43 +08:00
Dan Poltawski
e970f8b3d3 MDL-59761 eslint: update to v4.6.1
The new versions got released while this issue was waiting for peer
review.
2017-09-12 09:24:10 +01:00
Eloy Lafuente (stronk7)
bf30e4dc86 Merge branch 'MDL-60086-master' of https://github.com/snake/moodle 2017-09-12 09:56:23 +02:00
Jun Pataleta
63b384d02a Merge branch 'MDL-59919-master' of git://github.com/ryanwyllie/moodle 2017-09-12 14:58:06 +08:00
David Monllao
dc9f39bfc3 Merge branch 'MDL-59399-master' of git://github.com/ryanwyllie/moodle 2017-09-12 08:12:26 +02:00