Andrew Nicols [Tue, 28 Apr 2015 02:25:25 +0000 (10:25 +0800)]
Merge branch 'MDL-49926-master' of git://github.com/mastnym/moodle
Andrew Nicols [Tue, 28 Apr 2015 01:50:37 +0000 (09:50 +0800)]
Merge branch 'MDL-49814' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 27 Apr 2015 13:47:58 +0000 (14:47 +0100)]
Merge branch 'MDL-49993_master' of git://github.com/grabs/moodle
Rajesh Taneja [Thu, 23 Apr 2015 07:28:47 +0000 (15:28 +0800)]
MDL-49948 lesson: Answer and response format should be known for each form
Dan Poltawski [Mon, 27 Apr 2015 13:28:27 +0000 (14:28 +0100)]
Merge branch 'MDL-49913' of git://github.com/jmvedrine/moodle
Tim Hunt [Thu, 23 Apr 2015 14:57:29 +0000 (15:57 +0100)]
MDL-49814 quiz: make question dependency clear in the nav
Dan Poltawski [Mon, 27 Apr 2015 10:03:32 +0000 (11:03 +0100)]
Merge branch 'MDL-49956_getstring' of https://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 27 Apr 2015 09:46:08 +0000 (10:46 +0100)]
Merge branch 'MDL-49977_master' of git://github.com/markn86/moodle
Andreas Grabs [Sun, 26 Apr 2015 17:03:34 +0000 (19:03 +0200)]
MDL-49993 mod_feedback: Question auto numbers have no space between number and question
Jean-Michel Vedrine [Wed, 22 Apr 2015 11:07:27 +0000 (13:07 +0200)]
MDL-49913 mod_lesson: studentanswer format should be HTML
Jean-Michel Vedrine [Wed, 22 Apr 2015 10:51:59 +0000 (12:51 +0200)]
MDL-49913 mod_lesson: fix import scores and jumps
Jean-Michel Vedrine [Wed, 22 Apr 2015 10:45:51 +0000 (12:45 +0200)]
MDL-49913 mod_lesson: defaultanswer to avoid duplication
Jean-Michel Vedrine [Wed, 22 Apr 2015 10:38:23 +0000 (12:38 +0200)]
MDL-49913 mod_lesson: round question grades on import
Dan Poltawski [Fri, 24 Apr 2015 11:10:20 +0000 (12:10 +0100)]
on-demand release 2.9beta+
Dan Poltawski [Fri, 24 Apr 2015 08:41:20 +0000 (09:41 +0100)]
Merge branch 'MDL-49960-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Fri, 24 Apr 2015 03:38:07 +0000 (11:38 +0800)]
Merge branch 'MDL-49311-master' of git://github.com/lameze/moodle
Andrew Nicols [Fri, 24 Apr 2015 02:25:29 +0000 (10:25 +0800)]
Merge branch 'MDL-49813' of https://github.com/mkassaei/moodle
Dan Poltawski [Thu, 23 Apr 2015 12:32:33 +0000 (13:32 +0100)]
Merge branch 'MDL-49946' of https://github.com/jmvedrine/moodle
Dan Poltawski [Thu, 23 Apr 2015 10:39:18 +0000 (11:39 +0100)]
Merge branch 'MDL-49972-master' of git://github.com/FMCorz/moodle
David Monllao [Thu, 23 Apr 2015 07:53:31 +0000 (15:53 +0800)]
Merge branch 'MDL-49937-master' of git://github.com/jleyva/moodle
Andrew Nicols [Thu, 23 Apr 2015 07:32:12 +0000 (15:32 +0800)]
Merge branch 'm29_MDL-49922' of https://github.com/totara/moodle
Andrew Nicols [Thu, 23 Apr 2015 05:51:11 +0000 (13:51 +0800)]
Merge branch 'MDL-49477-master' of git://github.com/FMCorz/moodle
Martin Mastny [Thu, 23 Apr 2015 05:21:19 +0000 (13:21 +0800)]
MDL-49926 gradereport: Cursor changes to pointer on hover
Martin Mastny [Mon, 20 Apr 2015 07:56:58 +0000 (15:56 +0800)]
MDL-49926 gradereport: Feedback gets saved when editing grade in ajax mode
papillon [Mon, 16 Mar 2015 15:59:11 +0000 (00:59 +0900)]
MDL-49311 user: fix default sorting problem
Andrew Davis [Wed, 22 Apr 2015 13:18:08 +0000 (21:18 +0800)]
MDL-49956 admin: removed unused get_string() params
Mark Nelson [Thu, 23 Apr 2015 23:23:47 +0000 (16:23 -0700)]
MDL-49977 mod_assign: added missing page titles
M Kassaei [Wed, 15 Apr 2015 09:48:58 +0000 (10:48 +0100)]
MDL-49813 quiz: add sections in the right place after page changes
Frederic Massart [Thu, 23 Apr 2015 06:17:21 +0000 (14:17 +0800)]
MDL-49972 preferences: Fix incorrect title and headings
Juan Leyva [Wed, 22 Apr 2015 08:08:53 +0000 (10:08 +0200)]
MDL-49937 data: Handle admins/managers in get_databases_by_courses
Frederic Massart [Thu, 23 Apr 2015 06:05:55 +0000 (14:05 +0800)]
MDL-49960 message: Adding behat test for recent conversations
Frederic Massart [Thu, 23 Apr 2015 04:08:33 +0000 (12:08 +0800)]
MDL-49960 message: Prevent coding error when getting recent convos
Andrew Nicols [Thu, 23 Apr 2015 03:49:16 +0000 (11:49 +0800)]
Merge branch 'MDL-34921_master_unwanted-sitehome-redirects' of https://github.com/colin-umn/moodle
Andrew Nicols [Thu, 23 Apr 2015 00:40:44 +0000 (08:40 +0800)]
Merge branch 'MDL-49613' of https://github.com/NeillM/moodle
Jean-Michel Vedrine [Wed, 22 Apr 2015 17:38:59 +0000 (19:38 +0200)]
MDL-49946 mod_lesson: improve qformat_default::defaultquestion
Dan Poltawski [Wed, 22 Apr 2015 15:40:15 +0000 (16:40 +0100)]
Merge branch 'MDL-49921-master' of git://github.com/jleyva/moodle
Dan Poltawski [Wed, 22 Apr 2015 11:06:46 +0000 (12:06 +0100)]
Merge branch 'wip-MDL-49953-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 22 Apr 2015 09:47:56 +0000 (10:47 +0100)]
Merge branch 'MDL-49800-master' of git://github.com/FMCorz/moodle
Viduranga Wijesooriya [Wed, 25 Mar 2015 19:33:45 +0000 (01:03 +0530)]
MDL-49477 availability_grade-form: checkbox disable problem fixed
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
David Monllao [Wed, 22 Apr 2015 09:02:19 +0000 (17:02 +0800)]
Merge branch 'MDL-49933-master' of git://github.com/lucisgit/moodle
Neill Magill [Fri, 20 Mar 2015 14:31:34 +0000 (14:31 +0000)]
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.
Neill Magill [Fri, 20 Mar 2015 13:46:27 +0000 (13:46 +0000)]
MDL-49613 access: Unit test for count_role_users
Juan Leyva [Mon, 20 Apr 2015 10:23:20 +0000 (12:23 +0200)]
MDL-49921 forum: Handle exceptions correctly in get_forums_by_courses
David Monllao [Wed, 22 Apr 2015 06:40:37 +0000 (14:40 +0800)]
Merge branch 'MDL-49849-master' of git://github.com/gurgus/moodle
Dave Cooper [Mon, 20 Apr 2015 06:29:21 +0000 (14:29 +0800)]
MDL-49849 profile: Split site access information into it's own section
Marina Glancy [Thu, 9 Apr 2015 04:43:53 +0000 (12:43 +0800)]
MDL-49953 enrol_cohort: correction to string
Marina Glancy [Wed, 22 Apr 2015 05:32:22 +0000 (13:32 +0800)]
MDL-49953 enrol_cohort: check courseid when looking for group
Andrew Nicols [Wed, 22 Apr 2015 03:00:21 +0000 (11:00 +0800)]
Merge branch 'MDL-49753-master' of https://github.com/alexmitin/moodle
Tony Butler [Mon, 20 Apr 2015 11:24:04 +0000 (12:24 +0100)]
MDL-49933 mod_assign: Sort marker select lists alphabetically by name
Dan Poltawski [Tue, 21 Apr 2015 14:38:32 +0000 (15:38 +0100)]
Merge branch 'patch-2' of https://github.com/sk-unikent/moodle
Dan Poltawski [Tue, 21 Apr 2015 10:15:23 +0000 (11:15 +0100)]
on-demand release 2.9beta+
Dan Poltawski [Tue, 21 Apr 2015 10:15:21 +0000 (11:15 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Simey Lameze [Tue, 21 Apr 2015 04:00:13 +0000 (12:00 +0800)]
MDL-49854 core_user: fix the myprofile lib inclusion
Simey Lameze [Fri, 17 Apr 2015 02:57:39 +0000 (10:57 +0800)]
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
Andrew Nicols [Tue, 21 Apr 2015 03:40:39 +0000 (11:40 +0800)]
Merge branch 'MDL-49902-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 21 Apr 2015 03:34:00 +0000 (11:34 +0800)]
MDL-40811 uploaduser: Optimise testuser code
Andrew Nicols [Tue, 21 Apr 2015 03:17:16 +0000 (11:17 +0800)]
Merge branch 'MDL-40881_master' of https://github.com/nadavkav/moodle
Andrew Nicols [Tue, 21 Apr 2015 02:43:48 +0000 (10:43 +0800)]
Merge branch 'm29_MDL-49782' of https://github.com/totara/moodle
AMOS bot [Mon, 20 Apr 2015 16:04:17 +0000 (00:04 +0800)]
Automatically generated installer lang files
Andrew Nicols [Mon, 20 Apr 2015 04:22:18 +0000 (12:22 +0800)]
Merge branch 'wip-mdl-49799-m' of https://github.com/rajeshtaneja/moodle
David Monllao [Mon, 20 Apr 2015 04:20:28 +0000 (12:20 +0800)]
Merge branch 'MDL-48187_master' of git://github.com/markn86/moodle
David Monllao [Mon, 20 Apr 2015 04:12:44 +0000 (12:12 +0800)]
Merge branch 'wip-MDL-49880-master' of git://github.com/abgreeve/moodle
Mark Nelson [Fri, 17 Apr 2015 00:03:45 +0000 (17:03 -0700)]
MDL-48187 core_course: use updated '$grade_item'
Rajesh Taneja [Tue, 14 Apr 2015 02:47:05 +0000 (10:47 +0800)]
MDL-49799 behat: replaced asd.com with example.com
asd.com is a valid domain, we should use reserved domain names for testing
David Monllao [Mon, 20 Apr 2015 02:40:37 +0000 (10:40 +0800)]
Merge branch 'm29_MDL-49904' of git://github.com/totara/moodle
Brian Barnes [Mon, 20 Apr 2015 01:20:38 +0000 (13:20 +1200)]
MDL-49922 badges: replaced unnecessary fieldset
Adrian Greeve [Fri, 17 Apr 2015 03:30:18 +0000 (11:30 +0800)]
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.
Dan Poltawski [Fri, 17 Apr 2015 09:54:51 +0000 (10:54 +0100)]
Moodle release 2.9beta
Dan Poltawski [Fri, 17 Apr 2015 09:54:49 +0000 (10:54 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Rajesh Taneja [Fri, 17 Apr 2015 02:18:21 +0000 (10:18 +0800)]
MDL-49456 behat: Use proper dir separator to support different os
David Monllao [Fri, 17 Apr 2015 02:41:20 +0000 (10:41 +0800)]
Merge branch 'MDL-48723_master_forum-plagiarism_errors' of git://github.com/colin-umn/moodle
Brian Barnes [Thu, 16 Apr 2015 23:35:05 +0000 (11:35 +1200)]
MDL-49904 user: set title when editing another user
Juan Leyva [Thu, 16 Apr 2015 19:31:22 +0000 (21:31 +0200)]
MDL-49902 forum: Add missing capability check in mod_forum_view_forum
Dan Poltawski [Thu, 16 Apr 2015 15:10:23 +0000 (16:10 +0100)]
Merge branch 'MDL-49894-master' of git://github.com/jleyva/moodle
Dan Poltawski [Thu, 16 Apr 2015 15:08:22 +0000 (16:08 +0100)]
Merge branch 'MDL-49573-master' of git://github.com/gurgus/moodle
Juan Leyva [Thu, 16 Apr 2015 13:19:42 +0000 (15:19 +0200)]
MDL-49894 webservices: Add missing API changes in upgrade.txt
Juan Leyva [Thu, 16 Apr 2015 12:53:11 +0000 (14:53 +0200)]
MDL-49894 forum: Add deprecated information for get_forum_discussions
Dan Poltawski [Thu, 16 Apr 2015 12:45:20 +0000 (13:45 +0100)]
Merge branch 'MDL-49844-master' of git://github.com/lameze/moodle
Dan Poltawski [Thu, 16 Apr 2015 09:32:14 +0000 (10:32 +0100)]
Merge branch 'MDL-49837-master' of git://github.com/jleyva/moodle
Dan Poltawski [Thu, 16 Apr 2015 09:30:28 +0000 (10:30 +0100)]
Merge branch 'MDL-49842-master' of git://github.com/xow/moodle
David Monllao [Thu, 16 Apr 2015 09:04:34 +0000 (17:04 +0800)]
Merge branch 'MDL-45131-master' of git://github.com/jleyva/moodle
David Monllao [Thu, 16 Apr 2015 08:39:20 +0000 (16:39 +0800)]
Merge branch 'wip-mdl-49456' of git://github.com/rajeshtaneja/moodle
Juan Leyva [Thu, 16 Apr 2015 08:23:18 +0000 (10:23 +0200)]
MDL-45131 notes: Add validation for returned parameters in WS tests
Juan Leyva [Thu, 16 Apr 2015 08:22:59 +0000 (10:22 +0200)]
MDL-45131 grades: Add validation for returned parameters in WS tests
Juan Leyva [Mon, 13 Apr 2015 14:38:19 +0000 (16:38 +0200)]
MDL-45131 user: Add validation for returned parameters in WS tests
Juan Leyva [Mon, 13 Apr 2015 14:38:11 +0000 (16:38 +0200)]
MDL-45131 message: Add validation for returned parameters in WS tests
Juan Leyva [Mon, 13 Apr 2015 14:37:59 +0000 (16:37 +0200)]
MDL-45131 files: Add validation for returned parameters in WS tests
Juan Leyva [Mon, 13 Apr 2015 14:37:49 +0000 (16:37 +0200)]
MDL-45131 enrol: Add validation for returned parameters in WS tests
Juan Leyva [Mon, 13 Apr 2015 14:37:37 +0000 (16:37 +0200)]
MDL-45131 course: Add validation for returned parameters in WS tests
Dan Poltawski [Thu, 16 Apr 2015 08:22:21 +0000 (09:22 +0100)]
Merge branch 'm29_MDL-47004_LDAP_Better_Default_ObjectClass' of https://github.com/scara/moodle
Dan Poltawski [Thu, 16 Apr 2015 07:53:15 +0000 (08:53 +0100)]
Merge branch 'MDL-49741-master' of git://github.com/FMCorz/moodle
Rajesh Taneja [Tue, 7 Apr 2015 03:48:35 +0000 (11:48 +0800)]
MDL-49456 behat: Fixed following issues in parallel run
1. Parallel run without feature should exit with success
2. Updated exit codes to be more clear for each process
3. Fixed wwwroot and dataroot while executing with tags
4. Added support for running scenario/feature
5. Added support for or'ing tags
6. Added support for running single behat site
7. Fixed wrong example in help
8. Use parallel run only when parallel > 1
9. Exit showing behat site is not installed
10. Exit with error, if not a valid option
11. Added usage in help to explain how to use command
12. run.php should be able to run from any path
13. Pass all arguments to single run
Dave Cooper [Mon, 13 Apr 2015 11:26:03 +0000 (19:26 +0800)]
MDL-49573 gradereport_singleview: Add tests for bulk grade inserts
Dave Cooper [Thu, 9 Apr 2015 15:14:09 +0000 (23:14 +0800)]
MDL-49573 gradereport_singleview: Fixed bulk insert override logic.
John Okely [Wed, 15 Apr 2015 02:33:14 +0000 (10:33 +0800)]
MDL-49842 install: Set front page summary to '' after cli install
This is to prevent front page summary from appearing as a 'new setting'
after the first upgrade of a site installed via cli.
Andrew Nicols [Thu, 16 Apr 2015 03:22:59 +0000 (11:22 +0800)]
Merge branch 'MDL-49871-master' of git://github.com/FMCorz/moodle
David Monllao [Thu, 16 Apr 2015 02:11:15 +0000 (10:11 +0800)]
MDL-49377 admin: Refining message
Credit goes to Helen Foster.
David Monllao [Thu, 16 Apr 2015 01:44:10 +0000 (09:44 +0800)]
Merge branch 'MDL-49377-master-updatemsg' of git://github.com/mudrd8mz/moodle
Andrew Nicols [Wed, 15 Apr 2015 23:45:04 +0000 (07:45 +0800)]
Merge branch 'patch-1' of https://github.com/sk-unikent/moodle
Rajesh Taneja [Wed, 15 Apr 2015 23:12:47 +0000 (07:12 +0800)]
MDL-18309 behat: Fixed navigating to edit profile