73270 Commits

Author SHA1 Message Date
Adrian Greeve
12261113a9 MDL-49888 navigation: Added missing reports to user profile.
Added statistics and grade to the reports section in the user
profile.
2015-04-28 14:30:26 +08:00
Dan Poltawski
d5d23acdf5 on-demand release 2.9beta+ 2015-04-24 12:10:20 +01:00
Dan Poltawski
14c5b3a23f Merge branch 'MDL-49960-master' of git://github.com/FMCorz/moodle 2015-04-24 10:19:21 +01:00
Andrew Nicols
b083e0f6f2 Merge branch 'MDL-49311-master' of git://github.com/lameze/moodle 2015-04-24 10:19:20 +01:00
Andrew Nicols
0264bb1ecb Merge branch 'MDL-49813' of https://github.com/mkassaei/moodle 2015-04-24 10:19:20 +01:00
Dan Poltawski
5975d9521a Merge branch 'MDL-49946' of https://github.com/jmvedrine/moodle 2015-04-24 10:19:19 +01:00
Dan Poltawski
9548d1e058 Merge branch 'MDL-49972-master' of git://github.com/FMCorz/moodle 2015-04-24 10:19:18 +01:00
David Monllao
9dbcdd8b1f Merge branch 'MDL-49937-master' of git://github.com/jleyva/moodle 2015-04-24 10:19:18 +01:00
Andrew Nicols
1cbfb67789 Merge branch 'm29_MDL-49922' of https://github.com/totara/moodle 2015-04-24 10:19:17 +01:00
Andrew Nicols
4815e4c5b1 Merge branch 'MDL-49477-master' of git://github.com/FMCorz/moodle 2015-04-24 10:19:17 +01:00
papillon
28d27e85d7 MDL-49311 user: fix default sorting problem 2015-04-24 09:10:22 +08:00
M Kassaei
32498c28ea MDL-49813 quiz: add sections in the right place after page changes 2015-04-23 16:54:50 +01:00
Frederic Massart
e14388e3a7 MDL-49972 preferences: Fix incorrect title and headings 2015-04-23 16:05:00 +08:00
Juan Leyva
8352aa50f3 MDL-49937 data: Handle admins/managers in get_databases_by_courses 2015-04-23 09:37:06 +02:00
Frederic Massart
c8b4b67a2f MDL-49960 message: Adding behat test for recent conversations 2015-04-23 14:05:55 +08:00
Frederic Massart
d9b5f9bb6c MDL-49960 message: Prevent coding error when getting recent convos 2015-04-23 12:08:33 +08:00
Andrew Nicols
b3b6588262 Merge branch 'MDL-34921_master_unwanted-sitehome-redirects' of https://github.com/colin-umn/moodle 2015-04-23 11:49:16 +08:00
Andrew Nicols
ed8caffa5a Merge branch 'MDL-49613' of https://github.com/NeillM/moodle 2015-04-23 08:40:44 +08:00
Jean-Michel Vedrine
6197497393 MDL-49946 mod_lesson: improve qformat_default::defaultquestion 2015-04-22 19:40:19 +02: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
Viduranga Wijesooriya
21e6aabce9 MDL-49477 availability_grade-form: checkbox disable problem fixed
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2015-04-22 17:33:54 +08: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
Brian Barnes
508e756eaf MDL-49922 badges: replaced unnecessary fieldset 2015-04-20 13:20:38 +12:00