Dan Poltawski [Mon, 4 Jan 2016 18:13:08 +0000 (18:13 +0000)]
Merge branch 'MDL-52614_master' of https://github.com/nadavkav/moodle
Dan Poltawski [Mon, 4 Jan 2016 15:31:51 +0000 (15:31 +0000)]
Merge branch 'MDL-52645-master-enfix' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 4 Jan 2016 15:06:17 +0000 (15:06 +0000)]
Merge branch 'MDL-52576_user_profile' of https://github.com/BenKelada/moodle
Dan Poltawski [Mon, 4 Jan 2016 11:36:14 +0000 (11:36 +0000)]
Merge branch 'MDL-52638_m31v1' of https://github.com/sbourget/moodle
Dan Poltawski [Mon, 4 Jan 2016 10:51:05 +0000 (10:51 +0000)]
Merge branch 'MDL-49231-master' of git://github.com/jleyva/moodle
Helen Foster [Mon, 4 Jan 2016 10:48:33 +0000 (11:48 +0100)]
MDL-52645 lang: Merge English strings from the en_fix language pack
Nadav Kavalerchik [Sun, 27 Dec 2015 15:04:24 +0000 (17:04 +0200)]
MDL-52614 Workshop: Right align user's picture on Assessed submission.
Andrew Nicols [Mon, 4 Jan 2016 05:53:40 +0000 (13:53 +0800)]
Merge branch 'MDL-49566_master' of git://github.com/markn86/moodle
Dan Poltawski [Fri, 18 Dec 2015 11:34:13 +0000 (11:34 +0000)]
MDL-52552 course management: insufficient cleaning of search output
Andrew Nicols [Mon, 4 Jan 2016 01:20:31 +0000 (09:20 +0800)]
Merge branch 'MDL-51445_m31v1' of https://github.com/sbourget/moodle
Ben Kelada [Mon, 21 Dec 2015 21:37:02 +0000 (08:37 +1100)]
MDL-52576 forum: fix user profile picture in external service
Stephen Bourget [Fri, 1 Jan 2016 23:54:45 +0000 (18:54 -0500)]
MDL-52638 activity_results: Improve Behat tests
Juan Leyva [Wed, 30 Dec 2015 11:36:05 +0000 (12:36 +0100)]
MDL-49231 mod_glossary: Fix SQL queries for Oracle
Juan Leyva [Wed, 30 Dec 2015 11:30:08 +0000 (12:30 +0100)]
MDL-49231 mod_glossary: Fix tests for Postgres (ordering)
Frederic Massart [Wed, 25 Nov 2015 09:37:04 +0000 (17:37 +0800)]
MDL-49231 mod_glossary: Minor coding style improvements
Frederic Massart [Tue, 27 Oct 2015 11:16:19 +0000 (19:16 +0800)]
MDL-49231 mod_glossary: Ensure consistent order when pagination is used
Frederic Massart [Mon, 19 Oct 2015 08:14:03 +0000 (16:14 +0800)]
MDL-49231 mod_glossary: Update service definition
Frederic Massart [Mon, 19 Oct 2015 06:39:56 +0000 (14:39 +0800)]
MDL-49231 mod_glossary: External function get_entries_to_approve
Frederic Massart [Mon, 19 Oct 2015 06:37:50 +0000 (14:37 +0800)]
MDL-49231 mod_glossary: Update view and print to use new lib functions
Frederic Massart [Tue, 13 Oct 2015 13:12:47 +0000 (21:12 +0800)]
MDL-49231 mod_glossary: External function get_entries_by_term
Frederic Massart [Tue, 13 Oct 2015 12:43:12 +0000 (20:43 +0800)]
MDL-49231 mod_glossary: External function get_entry_by_id
Frederic Massart [Tue, 13 Oct 2015 11:10:55 +0000 (19:10 +0800)]
MDL-49231 mod_glossary: External function get_entries_by_search
Frederic Massart [Tue, 13 Oct 2015 09:13:29 +0000 (17:13 +0800)]
MDL-49231 mod_glossary: Moving DB queries to glossary lib
Frederic Massart [Tue, 13 Oct 2015 08:28:33 +0000 (16:28 +0800)]
MDL-49231 mod_glossary: Use a query builder to avoid code duplication
Frederic Massart [Tue, 13 Oct 2015 03:40:24 +0000 (11:40 +0800)]
MDL-49231 mod_glossary: Adding a method to validate a glossary by ID
Frederic Massart [Tue, 13 Oct 2015 03:09:59 +0000 (11:09 +0800)]
MDL-49231 mod_glossary: External function get_entries_by_author_id
Frederic Massart [Mon, 12 Oct 2015 12:35:37 +0000 (20:35 +0800)]
MDL-49231 mod_glossary: External function get_entries_by_author
Frederic Massart [Mon, 12 Oct 2015 10:47:41 +0000 (18:47 +0800)]
MDL-49231 mod_glossary: External function get_authors
Frederic Massart [Mon, 12 Oct 2015 09:42:58 +0000 (17:42 +0800)]
MDL-49231 mod_glossary: External function get_entries_by_category
Frederic Massart [Mon, 12 Oct 2015 09:42:34 +0000 (17:42 +0800)]
MDL-49231 mod_glossary: External function get_categories
Frederic Massart [Mon, 12 Oct 2015 07:06:49 +0000 (15:06 +0800)]
MDL-49231 mod_glossary: External function get_entries_by_date
Frederic Massart [Tue, 6 Oct 2015 12:24:15 +0000 (20:24 +0800)]
MDL-49231 mod_glossary: External function get_entries_by_letter
Frederic Massart [Tue, 6 Oct 2015 08:24:28 +0000 (16:24 +0800)]
MDL-49231 mod_glossary: External function view_entry
Frederic Massart [Tue, 6 Oct 2015 07:02:50 +0000 (15:02 +0800)]
MDL-49231 mod_glossary: External function view_glossary
Dan Poltawski [Thu, 31 Dec 2015 08:16:35 +0000 (08:16 +0000)]
weekly release 3.1dev
Dan Poltawski [Thu, 31 Dec 2015 08:16:31 +0000 (08:16 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Monllao [Thu, 31 Dec 2015 05:20:40 +0000 (13:20 +0800)]
Merge branch 'MDL-52347_master-fix' of git://github.com/dmonllao/moodle
AMOS bot [Wed, 30 Dec 2015 16:03:52 +0000 (00:03 +0800)]
Automatically generated installer lang files
Dan Poltawski [Wed, 30 Dec 2015 09:05:43 +0000 (09:05 +0000)]
MDL-50357 groups: remove pointless option of groups_delete_group_members
Dan Poltawski [Wed, 30 Dec 2015 09:19:17 +0000 (09:19 +0000)]
Merge branch 'MDL-50357_master' of git://github.com/markn86/moodle
David Monllao [Wed, 30 Dec 2015 06:47:45 +0000 (14:47 +0800)]
MDL-52347 format_social: Replicate wait between new discussions
Mark Nelson [Mon, 21 Dec 2015 09:05:50 +0000 (17:05 +0800)]
MDL-50357 core_group: tidy up the function groups_delete_group_members
AMOS bot [Tue, 29 Dec 2015 16:03:54 +0000 (00:03 +0800)]
Automatically generated installer lang files
Juan Leyva [Tue, 17 Nov 2015 12:23:26 +0000 (13:23 +0100)]
MDL-50428 mod_scorm: Fix tests for mod_scorm_launch_sco
Michael Aherne [Tue, 8 Dec 2015 12:23:40 +0000 (12:23 +0000)]
MDL-52439 assign: correct get_user_submission() phpdoc
Dan Poltawski [Tue, 29 Dec 2015 10:04:42 +0000 (10:04 +0000)]
Merge branch 'MDL-52275_master' of git://github.com/markn86/moodle
Mark Nelson [Tue, 22 Dec 2015 06:46:02 +0000 (14:46 +0800)]
MDL-49566 core: used reflection in unit tests
Also split the tests into multiple functions for each scenario.
David Monllao [Tue, 29 Dec 2015 07:35:15 +0000 (15:35 +0800)]
Merge branch 'MDL-51889_master' of git://github.com/markn86/moodle
David Monllao [Tue, 29 Dec 2015 06:05:42 +0000 (14:05 +0800)]
Merge branch 'MDL-52530' of git://github.com/eugeneventer/moodle-fixes
David Monllao [Tue, 29 Dec 2015 06:03:10 +0000 (14:03 +0800)]
Merge branch 'wip-mdl-52347' of git://github.com/rajeshtaneja/moodle
David Monllao [Tue, 29 Dec 2015 05:47:06 +0000 (13:47 +0800)]
Merge branch 'MDL-52591-master' of git://github.com/danpoltawski/moodle
Mark Nelson [Mon, 2 Nov 2015 23:20:32 +0000 (18:20 -0500)]
MDL-51889 enrol_guest: always check password before re-enabling
Ankit Agarwal [Wed, 3 Jun 2015 07:01:40 +0000 (12:31 +0530)]
MDL-49566 core: Write unittests for MDL-45898
Ankit Agarwal [Mon, 8 Jun 2015 01:55:48 +0000 (07:25 +0530)]
MDL-49566 myprofile: Fix bugs in myprofilelib
Ankit Agarwal [Thu, 4 Jun 2015 09:40:18 +0000 (15:10 +0530)]
MDL-49566 notes: Notes link should not show up for guests
David Monllao [Tue, 29 Dec 2015 02:46:52 +0000 (10:46 +0800)]
Merge branch 'MDL-50428-master' of git://github.com/jleyva/moodle
Conflicts:
mod/scorm/version.php
version.php
David Monllao [Tue, 29 Dec 2015 02:03:59 +0000 (10:03 +0800)]
MDL-52597 mod_forum: Remove duplicated query
David Monllao [Tue, 29 Dec 2015 02:01:07 +0000 (10:01 +0800)]
Merge branch 'MDL-52597-master' of git://github.com/andrewnicols/moodle
AMOS bot [Mon, 28 Dec 2015 16:03:55 +0000 (00:03 +0800)]
Automatically generated installer lang files
AMOS bot [Sun, 27 Dec 2015 16:04:00 +0000 (00:04 +0800)]
Automatically generated installer lang files
AMOS bot [Thu, 24 Dec 2015 16:03:55 +0000 (00:03 +0800)]
Automatically generated installer lang files
Marina Glancy [Mon, 30 Nov 2015 02:16:47 +0000 (10:16 +0800)]
MDL-52347 behat: fix random failures on fast computer
Rajesh Taneja [Thu, 24 Dec 2015 05:43:01 +0000 (13:43 +0800)]
MDL-52606 behat: Added time delay to avoid random fails
If attempts are created at same timestamp, then results are
not same, and lesson module finds that attmpt was in progress.
To avoid this problem, attempts should be created at different
timestamp.
Dan Poltawski [Wed, 23 Dec 2015 11:35:50 +0000 (11:35 +0000)]
weekly release 3.1dev
Dan Poltawski [Wed, 23 Dec 2015 11:35:46 +0000 (11:35 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Wed, 23 Dec 2015 11:29:01 +0000 (11:29 +0000)]
Merge branch 'MDL-52595-master' of git://github.com/andrewnicols/moodle
Mark Nelson [Wed, 23 Dec 2015 06:17:25 +0000 (14:17 +0800)]
MDL-52275 core: fixed grade-to-pass being overwritten
Thanks goes to W.J. Roes for the patch.
Andrew Nicols [Wed, 23 Dec 2015 06:24:35 +0000 (14:24 +0800)]
MDL-52597 mod_forum: Remove sleep from tests
Andrew Nicols [Wed, 23 Dec 2015 02:26:20 +0000 (10:26 +0800)]
MDL-52595 tests: Disable xdebug for travis runs
Andrew Nicols [Wed, 23 Dec 2015 02:04:51 +0000 (10:04 +0800)]
Merge branch 'MDL-52355-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Wed, 23 Dec 2015 01:45:42 +0000 (09:45 +0800)]
MDL-52355 mod_data: Added Gregorian hour and minute values
Shamim Rezaie [Tue, 1 Dec 2015 07:53:51 +0000 (18:53 +1100)]
MDL-52355 mod_data: Make date field respect the calendar type in use
Updated the date subplugin to consider that the input date element
values might be for any calendar type and not just the Gregorian
calendar.
Shamim Rezaie [Tue, 1 Dec 2015 04:37:07 +0000 (15:37 +1100)]
MDL-52354 select_time: Make select_time respect the set calendar type
The select_time method updated to display form elements in accordance
to the calendar type plugin that is in use.
Andrew Nicols [Wed, 23 Dec 2015 01:08:48 +0000 (09:08 +0800)]
Merge branch 'MDL-52060-master-arn' of https://github.com/andrewnicols/moodle
Andrew Nicols [Tue, 22 Dec 2015 03:42:35 +0000 (11:42 +0800)]
MDL-52060 phpunit: Add tests for test_set_table_modified_by_sql
Eugene Venter [Wed, 16 Dec 2015 04:16:27 +0000 (17:16 +1300)]
MDL-52530 unittest: more robust capability assignments for guest
for core_files_file_storage_testcase and core_repositorylib_testcase
Dan Poltawski [Tue, 22 Dec 2015 18:34:25 +0000 (18:34 +0000)]
MDL-52591 grunt: make shifter task respect --no-color
Eloy Lafuente (stronk7) [Tue, 22 Dec 2015 16:13:51 +0000 (17:13 +0100)]
Merge branch 'MDL-49743-master' of git://github.com/danpoltawski/moodle
AMOS bot [Tue, 22 Dec 2015 16:03:59 +0000 (00:03 +0800)]
Automatically generated installer lang files
Dan Poltawski [Tue, 22 Dec 2015 13:17:54 +0000 (13:17 +0000)]
Merge branch 'master_MDL-51916' of https://github.com/danmarsden/moodle
Dan Poltawski [Tue, 22 Dec 2015 13:15:02 +0000 (13:15 +0000)]
Merge branch 'MDL-52365_new' of git://github.com/mkassaei/moodle
M Kassaei [Tue, 1 Dec 2015 15:44:59 +0000 (15:44 +0000)]
MDL-52365 qtype ddwtos & ddimageortext: 20 drag items IE11/Edge
Eloy Lafuente (stronk7) [Tue, 22 Dec 2015 12:07:01 +0000 (13:07 +0100)]
Merge branch 'MDL-51719-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Tue, 22 Dec 2015 11:58:28 +0000 (11:58 +0000)]
Merge branch 'wip-MDL-51239-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 22 Dec 2015 11:17:11 +0000 (11:17 +0000)]
Merge branch 'MDL-52556-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 22 Dec 2015 09:47:13 +0000 (09:47 +0000)]
MDL-52017 enrol_self: fix incorrect empty statement
Ironically this was detected by causing a syntax error on php54
David Monllao [Tue, 22 Dec 2015 08:36:29 +0000 (16:36 +0800)]
Merge branch 'MDL-52017_master' of git://github.com/markn86/moodle
David Monllao [Tue, 22 Dec 2015 08:28:18 +0000 (16:28 +0800)]
Merge branch 'MDL-51886-master' of git://github.com/dpalou/moodle
Conflicts:
version.php
David Monllao [Tue, 22 Dec 2015 08:23:33 +0000 (16:23 +0800)]
Merge branch 'MDL-52073-master' of git://github.com/jleyva/moodle
Conflicts:
version.php
Rajesh Taneja [Thu, 26 Nov 2015 07:31:56 +0000 (15:31 +0800)]
MDL-52060 phpunit: Keep track of modified database for reset
Keep list of modified tables, so they can be reset
without any guess work
Andrew Nicols [Tue, 22 Dec 2015 07:13:38 +0000 (15:13 +0800)]
Merge branch 'MDL-52250-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 22 Dec 2015 05:51:14 +0000 (13:51 +0800)]
Merge branch 'MDL-52289-master' of git://github.com/jleyva/moodle
Mark Nielsen [Fri, 20 Nov 2015 21:55:27 +0000 (13:55 -0800)]
MDL-52060 phpunit: Improve get_message_processors reset
Mark Nielsen [Fri, 20 Nov 2015 21:53:22 +0000 (13:53 -0800)]
MDL-52060 phpunit: Prevent querying database metadata
Rajesh Taneja [Wed, 11 Nov 2015 07:57:10 +0000 (15:57 +0800)]
MDL-52060 phpunit: Check file only if needed
Rajesh Taneja [Wed, 11 Nov 2015 03:26:10 +0000 (11:26 +0800)]
MDL-52060 phpunit: Keep track of initial reset sequence
Andrew Nicols [Tue, 22 Dec 2015 05:11:27 +0000 (13:11 +0800)]
Merge branch 'MDL-23128-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 22 Dec 2015 04:33:57 +0000 (12:33 +0800)]
Merge branch 'MDL-52363' of git://github.com/mkassaei/moodle
David Monllao [Tue, 22 Dec 2015 03:24:45 +0000 (11:24 +0800)]
Merge branch 'wip-mdl-52376' of git://github.com/rajeshtaneja/moodle
David Monllao [Tue, 22 Dec 2015 03:16:36 +0000 (11:16 +0800)]
Merge branch 'MDL-52558-master' of git://github.com/sammarshallou/moodle
