moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 19:06:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73249 commits 37 branches 544 tags 1.3 GiB
Commit graph

73249 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Nicols
ed8caffa5a Merge branch 'MDL-49613' of https://github.com/NeillM/moodle 2015-04-23 08:40:44 +08:00
Dan Poltawski
a8d8783988 Merge branch 'MDL-49921-master' of git://github.com/jleyva/moodle 2015-04-22 16:40:15 +01:00
Dan Poltawski
296a428776 Merge branch 'wip-MDL-49953-master' of git://github.com/marinaglancy/moodle 2015-04-22 12:06:46 +01:00
Dan Poltawski
1f23341f7d Merge branch 'MDL-49800-master' of git://github.com/FMCorz/moodle 2015-04-22 10:47:56 +01:00
David Monllao
e5c5ced912 Merge branch 'MDL-49933-master' of git://github.com/lucisgit/moodle 2015-04-22 17:02:19 +08:00
Neill Magill
9d72ae249c MDL-49613 access: count_role_users gives unexpected results 
The count_role_users function in lib/accesslib.php gives the wrong results if a user has the
same role at multiple levels in a context path.

For example a user is a coursecreator on a course and the category that the course is in,
in this case they would be counted twice, rather than being recognised as the same user.

This change will make the function only count unique users.
 2015-04-22 09:34:45 +01:00
Neill Magill
3a92084c6b MDL-49613 access: Unit test for count_role_users 2015-04-22 09:34:44 +01:00
Juan Leyva
c8f1d8a026 MDL-49921 forum: Handle exceptions correctly in get_forums_by_courses 2015-04-22 09:47:18 +02:00
David Monllao
ac0f0f9dd9 Merge branch 'MDL-49849-master' of git://github.com/gurgus/moodle 2015-04-22 14:40:37 +08:00
Dave Cooper
f13a911317 MDL-49849 profile: Split site access information into it's own section 2015-04-22 14:08:18 +08:00
Marina Glancy
5894432c50 MDL-49953 enrol_cohort: correction to string 2015-04-22 13:40:03 +08:00
Marina Glancy
42c92eef33 MDL-49953 enrol_cohort: check courseid when looking for group 2015-04-22 13:39:02 +08:00
Andrew Nicols
e28767f414 Merge branch 'MDL-49753-master' of https://github.com/alexmitin/moodle 2015-04-22 11:00:21 +08:00
Tony Butler
2224f2c598 MDL-49933 mod_assign: Sort marker select lists alphabetically by name 2015-04-21 16:58:38 +01:00
Dan Poltawski
d0704fd9e2 Merge branch 'patch-2' of https://github.com/sk-unikent/moodle 2015-04-21 15:38:32 +01:00
Dan Poltawski
df9981cfda on-demand release 2.9beta+ 2015-04-21 11:15:23 +01:00
Dan Poltawski
4f6f5f1a10 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-04-21 11:15:21 +01:00
Simey Lameze
0525a7a8f1 MDL-49854 core_user: fix the myprofile lib inclusion 2015-04-21 12:04:40 +08:00
Simey Lameze
e35bac3e80 MDL-49854 core: User navigation refinements 
Fixing some reported issues:
- Removing unnecessary conditional include
- Require login in grade/report/mygrades.php
- Remove unnecessary defined('MOODLE_INTERNAL') call
- Fixing context_header::__construct $imagedata param type
 2015-04-21 11:46:32 +08:00
Andrew Nicols
9d745218e8 Merge branch 'MDL-49902-master' of git://github.com/jleyva/moodle 2015-04-21 11:40:39 +08:00
Andrew Nicols
6866527275 MDL-40811 uploaduser: Optimise testuser code 2015-04-21 11:34:00 +08:00
Andrew Nicols
7464939f6d Merge branch 'MDL-40881_master' of https://github.com/nadavkav/moodle 2015-04-21 11:17:16 +08:00
Andrew Nicols
793645a03f Merge branch 'm29_MDL-49782' of https://github.com/totara/moodle 2015-04-21 10:43:48 +08:00
AMOS bot
cb2fc25ba0 Automatically generated installer lang files 2015-04-21 00:04:17 +08:00
Andrew Nicols
bd305d3dcb Merge branch 'wip-mdl-49799-m' of https://github.com/rajeshtaneja/moodle 2015-04-20 12:22:18 +08:00
David Monllao
970d54d076 Merge branch 'MDL-48187_master' of git://github.com/markn86/moodle 2015-04-20 12:20:28 +08:00
David Monllao
1577072b7b Merge branch 'wip-MDL-49880-master' of git://github.com/abgreeve/moodle 2015-04-20 12:12:44 +08:00
Mark Nelson
595b911a98 MDL-48187 core_course: use updated '$grade_item' 2015-04-19 20:30:21 -07:00
Rajesh Taneja
0fe86bbdbb MDL-49799 behat: replaced asd.com with example.com 
asd.com is a valid domain, we should use reserved domain names for testing
 2015-04-20 11:21:20 +08:00
David Monllao
b9476466f1 Merge branch 'm29_MDL-49904' of git://github.com/totara/moodle 2015-04-20 10:40:37 +08:00
Adrian Greeve
08000e535d MDL-49880 mod_lesson: Fixed notice while importing questions. 
Cloze questions (not supported by lesson) threw up a notice saying that
the course wasn't set.
 2015-04-20 09:12:20 +08:00
Dan Poltawski
d302ba231f Moodle release 2.9beta 2015-04-17 10:54:51 +01:00
Dan Poltawski
6cf6e64d51 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-04-17 10:54:49 +01:00
Rajesh Taneja
f8b71928d2 MDL-49456 behat: Use proper dir separator to support different os 2015-04-17 11:48:37 +08:00
David Monllao
b312e7f13a Merge branch 'MDL-48723_master_forum-plagiarism_errors' of git://github.com/colin-umn/moodle 2015-04-17 10:41:20 +08:00
Brian Barnes
cfff4da9f6 MDL-49904 user: set title when editing another user 2015-04-17 12:09:30 +12:00
Juan Leyva
ea2fa324d7 MDL-49902 forum: Add missing capability check in mod_forum_view_forum 2015-04-16 22:07:11 +02:00
Dan Poltawski
8da277ea96 Merge branch 'MDL-49894-master' of git://github.com/jleyva/moodle 2015-04-16 16:10:23 +01:00
Dan Poltawski
9697b3da0a Merge branch 'MDL-49573-master' of git://github.com/gurgus/moodle 2015-04-16 16:08:22 +01:00
Juan Leyva
6d28e2cfa6 MDL-49894 webservices: Add missing API changes in upgrade.txt 2015-04-16 15:19:42 +02:00
Juan Leyva
b235aef094 MDL-49894 forum: Add deprecated information for get_forum_discussions 2015-04-16 14:53:11 +02:00
Dan Poltawski
f9fc19cdae Merge branch 'MDL-49844-master' of git://github.com/lameze/moodle 2015-04-16 13:45:20 +01:00
Dan Poltawski
aa96a20027 Merge branch 'MDL-49837-master' of git://github.com/jleyva/moodle 2015-04-16 10:32:14 +01:00
Dan Poltawski
1d81e1afc0 Merge branch 'MDL-49842-master' of git://github.com/xow/moodle 2015-04-16 10:30:28 +01:00
David Monllao
89a6290fb9 Merge branch 'MDL-45131-master' of git://github.com/jleyva/moodle 2015-04-16 17:04:34 +08:00
David Monllao
960c0ec405 Merge branch 'wip-mdl-49456' of git://github.com/rajeshtaneja/moodle 2015-04-16 16:39:20 +08:00
Juan Leyva
80cb20afe5 MDL-45131 notes: Add validation for returned parameters in WS tests 2015-04-16 10:25:52 +02:00
Juan Leyva
82fc915f08 MDL-45131 grades: Add validation for returned parameters in WS tests 2015-04-16 10:25:34 +02:00
Juan Leyva
605c421b58 MDL-45131 user: Add validation for returned parameters in WS tests 2015-04-16 10:25:33 +02:00
Juan Leyva
52fa3e6538 MDL-45131 message: Add validation for returned parameters in WS tests 2015-04-16 10:25:32 +02:00