Dan Poltawski [Tue, 22 Mar 2016 04:56:53 +0000 (12:56 +0800)]
MDL-39524 tests: fix incorrect phpdoc
Dan Poltawski [Tue, 22 Mar 2016 04:52:26 +0000 (12:52 +0800)]
Merge branch 'MDL-39524' of https://github.com/jrchamp/moodle
Dan Poltawski [Tue, 22 Mar 2016 04:51:30 +0000 (12:51 +0800)]
Merge branch 'MDL-39524-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Tue, 22 Mar 2016 04:47:07 +0000 (12:47 +0800)]
MDL-39524 tests: unit test for get_real_size()
Dan Poltawski [Tue, 22 Mar 2016 03:44:19 +0000 (11:44 +0800)]
Merge branch 'MDL-53049-anchor-offset' of https://github.com/brendanheywood/moodle
Dan Poltawski [Tue, 22 Mar 2016 03:38:47 +0000 (11:38 +0800)]
Merge branch 'MDL-53147-inbox-layout' of https://github.com/brendanheywood/moodle
David Monllao [Tue, 22 Mar 2016 03:35:54 +0000 (11:35 +0800)]
Merge branch 'MDL-53228-master' of git://github.com/andrewnicols/moodle
Mark Nelson [Tue, 22 Mar 2016 03:01:00 +0000 (11:01 +0800)]
MDL-48012 tool_recyclebin: removed indexes as FKs exist
Dan Poltawski [Tue, 22 Mar 2016 02:32:34 +0000 (10:32 +0800)]
Merge branch 'MDL-52158-master' of https://github.com/xow/moodle
Eloy Lafuente (stronk7) [Tue, 22 Mar 2016 02:16:51 +0000 (03:16 +0100)]
Merge branch 'MDL-53393-master' of git://github.com/cameron1729/moodle
David Monllao [Tue, 22 Mar 2016 01:57:51 +0000 (09:57 +0800)]
MDL-53513 libraries: Fix lessphp version
David Monllao [Tue, 22 Mar 2016 01:56:21 +0000 (09:56 +0800)]
Merge branch 'MDL-53513-master' of git://github.com/lameze/moodle
Dan Poltawski [Tue, 22 Mar 2016 01:54:03 +0000 (09:54 +0800)]
Merge branch 'wip-MDL-52619-master' of git://github.com/abgreeve/moodle
David Monllao [Tue, 22 Mar 2016 01:50:34 +0000 (09:50 +0800)]
Merge branch 'MDL-53456-master' of git://github.com/lameze/moodle
David Monllao [Tue, 22 Mar 2016 01:47:36 +0000 (09:47 +0800)]
Merge branch 'MDL-53512-master' of git://github.com/lameze/moodle
David Monllao [Tue, 22 Mar 2016 01:44:49 +0000 (09:44 +0800)]
Merge branch 'MDL-53455-master' of git://github.com/lameze/moodle
Conflicts:
lib/jquery/plugins.php
David Monllao [Tue, 22 Mar 2016 01:35:19 +0000 (09:35 +0800)]
Merge branch 'wip-MDL-53458-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Tue, 22 Mar 2016 01:25:40 +0000 (02:25 +0100)]
Merge branch 'MDL-53357-dont-break-urls' of https://github.com/brendanheywood/moodle
Simey Lameze [Fri, 18 Mar 2016 09:16:42 +0000 (17:16 +0800)]
MDL-53512 libraries: update google API library to version 1.1.7
David Monllao [Tue, 22 Mar 2016 00:01:16 +0000 (08:01 +0800)]
Merge branch 'MDL-53409-master' of git://github.com/crazyserver/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2016 23:45:48 +0000 (00:45 +0100)]
Merge branch 'wip-MDL-45274-master' of https://github.com/marinaglancy/moodle
David Monllao [Mon, 21 Mar 2016 23:44:31 +0000 (07:44 +0800)]
MDL-53454 lib: Fix incorrect jquery version
David Monllao [Mon, 21 Mar 2016 23:42:52 +0000 (07:42 +0800)]
Merge branch 'MDL-53454-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2016 23:14:25 +0000 (00:14 +0100)]
Merge branch 'MDL-48307-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 21 Mar 2016 23:24:37 +0000 (07:24 +0800)]
Merge branch 'wip-MDL-53457-master' of git://github.com/abgreeve/moodle
David Monllao [Mon, 21 Mar 2016 23:12:52 +0000 (07:12 +0800)]
Merge branch 'wip-MDL-53465-master' of git://github.com/abgreeve/moodle
David Monllao [Mon, 21 Mar 2016 22:56:40 +0000 (06:56 +0800)]
Merge branch 'MDL-53518-master' of git://github.com/lameze/moodle
David Monllao [Mon, 21 Mar 2016 22:51:57 +0000 (06:51 +0800)]
Merge branch 'MDL-53519-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2016 22:07:16 +0000 (23:07 +0100)]
Merge branch 'MDL-52978_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2016 22:01:46 +0000 (23:01 +0100)]
MDL-53034 mod_quiz: version mini-bump
Eloy Lafuente (stronk7) [Mon, 21 Mar 2016 21:58:28 +0000 (22:58 +0100)]
Merge branch 'MDL-53034-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2016 21:40:43 +0000 (22:40 +0100)]
Merge branch 'MDL-52888-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2016 21:20:00 +0000 (22:20 +0100)]
Merge branch 'MDL-52868-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 21 Mar 2016 09:42:19 +0000 (17:42 +0800)]
Merge branch 'MDL-52863-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 21 Mar 2016 09:27:20 +0000 (17:27 +0800)]
Merge branch 'MDL-52852-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 21 Mar 2016 09:09:15 +0000 (17:09 +0800)]
Merge branch 'MDL-52830-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 21 Mar 2016 09:05:05 +0000 (17:05 +0800)]
MDL-52813 mod_quiz: bump version
Diverge from stable branching
Dan Poltawski [Mon, 21 Mar 2016 08:37:57 +0000 (16:37 +0800)]
Merge branch 'MDL-52813-master' of git://github.com/jleyva/moodle
Brendan Heywood [Thu, 10 Mar 2016 13:05:07 +0000 (00:05 +1100)]
MDL-53049 themes: Offset href anchor when bootstrap header is fixed
On large screens the bootstrap header is static and can obscure the
anchor target content underneath it.
Dan Poltawski [Mon, 21 Mar 2016 07:23:37 +0000 (15:23 +0800)]
MDL-53260 cli: fix trailing whitespace
Dan Poltawski [Mon, 21 Mar 2016 07:14:23 +0000 (15:14 +0800)]
Merge branch 'MDL-53260-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Mon, 21 Mar 2016 03:53:27 +0000 (11:53 +0800)]
MDL-53260 upgrade: Make lang option default to the site language
Dan Poltawski [Mon, 21 Mar 2016 06:48:41 +0000 (14:48 +0800)]
Merge branch 'MDL-53407-editing-css' of https://github.com/Dagefoerde/moodle
Dan Poltawski [Mon, 21 Mar 2016 06:44:15 +0000 (14:44 +0800)]
Merge branch 'MDL-52952-master' of https://github.com/xow/moodle
Brendan Heywood [Sat, 27 Feb 2016 03:57:24 +0000 (14:57 +1100)]
MDL-53147 theme_bootstrapbase: Fix message page responsive layout issues
Dan Poltawski [Mon, 21 Mar 2016 06:12:10 +0000 (14:12 +0800)]
Merge branch 'MDL-53239_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 21 Mar 2016 06:01:46 +0000 (14:01 +0800)]
Merge branch 'MDL-53315-imap-namespace' of https://github.com/brendanheywood/moodle
Simey Lameze [Tue, 15 Mar 2016 02:30:40 +0000 (10:30 +0800)]
MDL-53455 libraries: upgrade jquery migrate to version 1.4.0
Dan Poltawski [Mon, 21 Mar 2016 05:37:00 +0000 (13:37 +0800)]
Merge branch 'wip-mdl-53564' of https://github.com/rajeshtaneja/moodle
Simey Lameze [Fri, 18 Mar 2016 06:49:43 +0000 (14:49 +0800)]
MDL-53519 auth_cas: update cas to version 1.3.4
Simey Lameze [Fri, 18 Mar 2016 07:14:03 +0000 (15:14 +0800)]
MDL-53518 libraries: upgrade mardown to 1.6.0 version
Simey Lameze [Fri, 18 Mar 2016 07:41:22 +0000 (15:41 +0800)]
MDL-53513 libraries: update lessphp to version 1.7.0.10
Simey Lameze [Mon, 14 Mar 2016 07:30:58 +0000 (15:30 +0800)]
MDL-53456 libraries: update requirejs to version 2.1.22
Cameron Ball [Mon, 21 Mar 2016 02:49:00 +0000 (10:49 +0800)]
MDL-53393 libraries: Upgrade Html2Text to 4.0.1
Nadav Kavalerchik [Thu, 10 Mar 2016 19:55:54 +0000 (21:55 +0200)]
MDL-53260 upgrade: Option to display CLI upgrade messages in English
David Monllao [Mon, 21 Mar 2016 03:53:30 +0000 (11:53 +0800)]
Merge branch 'MDL-52207-master' of git://github.com/cameron1729/moodle
Simey Lameze [Tue, 15 Mar 2016 01:05:55 +0000 (09:05 +0800)]
MDL-53454 libraries: upgrade jquery to 1.12.1 version
Dan Poltawski [Mon, 21 Mar 2016 03:37:35 +0000 (11:37 +0800)]
Merge branch 'MDL-53262-verp-confirm-from-support' of https://github.com/brendanheywood/moodle
Cameron Ball [Mon, 21 Mar 2016 03:03:24 +0000 (11:03 +0800)]
MDL-52207 upgradelib: Replace uses of Zend_Server_Reflection
Now that Zend has been removed we can only use native PHP reflection
methods.
Cameron Ball [Mon, 21 Mar 2016 03:02:55 +0000 (11:02 +0800)]
MDL-52207 libraries: Delete Zend framework
Let it RIP.
Dan Poltawski [Mon, 21 Mar 2016 03:02:03 +0000 (11:02 +0800)]
Merge branch 'MDL-53489' of git://github.com/timhunt/moodle
Jay Jayswal [Mon, 21 Mar 2016 02:06:43 +0000 (10:06 +0800)]
MDL-52158 auth: Improve recaptcha settings and help
Rajesh Taneja [Mon, 21 Mar 2016 02:11:07 +0000 (10:11 +0800)]
MDL-53564 behat: Fixed xpath to find social activity block
David Monllao [Mon, 21 Mar 2016 02:04:29 +0000 (10:04 +0800)]
Merge branch 'MDL-49963' of https://github.com/andrewhancox/moodle
David Monllao [Mon, 21 Mar 2016 01:41:09 +0000 (09:41 +0800)]
Merge branch 'MDL-48012_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 21 Mar 2016 01:31:07 +0000 (09:31 +0800)]
Merge branch 'MDL-53207' of https://github.com/dg711/moodle
David Monllao [Mon, 21 Mar 2016 01:25:19 +0000 (09:25 +0800)]
Merge branch 'MDL-52924-master' of git://github.com/jleyva/moodle
Conflicts:
version.php
Dan Poltawski [Mon, 21 Mar 2016 01:20:33 +0000 (09:20 +0800)]
Merge branch 'MDL-53548-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 21 Mar 2016 00:57:22 +0000 (08:57 +0800)]
Merge branch 'MDL-53412-master' of git://github.com/merrill-oakland/moodle
David Monllao [Mon, 21 Mar 2016 00:42:58 +0000 (08:42 +0800)]
Merge branch 'MDL-53509-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 21 Mar 2016 00:39:15 +0000 (08:39 +0800)]
Merge branch 'MDL-49934-master' of git://github.com/jleyva/moodle
Brendan Heywood [Sat, 27 Feb 2016 11:19:59 +0000 (22:19 +1100)]
MDL-53262 inboundmessage: Fix inconsistent confirm From vs email body
Brendan Heywood [Thu, 3 Mar 2016 12:25:51 +0000 (23:25 +1100)]
MDL-53315 inboundmessage: Add support for IMAP Namespaces
dg711 [Mon, 14 Mar 2016 06:39:22 +0000 (12:09 +0530)]
MDL-53207 message: display stock pic for msg from\to unreal user
Pau Ferrer Ocaña [Fri, 11 Mar 2016 11:58:17 +0000 (12:58 +0100)]
MDL-53409 question: Add tests for core_question_update_flag
Pau Ferrer Ocaña [Fri, 11 Mar 2016 08:50:20 +0000 (09:50 +0100)]
MDL-53409 question: New WS core_question_update_flag
sam marshall [Fri, 18 Mar 2016 13:44:50 +0000 (13:44 +0000)]
MDL-53548 Accessibility: Block show/hide keyboard access broken
Juan Leyva [Mon, 8 Feb 2016 17:28:42 +0000 (18:28 +0100)]
MDL-53034 mod_quiz: New WS mod_quiz_get_quiz_feedback_for_grade
Juan Leyva [Mon, 25 Jan 2016 14:19:26 +0000 (15:19 +0100)]
MDL-52888 mod_quiz: New Web Service mod_quiz_view_attempt_review
Juan Leyva [Mon, 25 Jan 2016 14:08:34 +0000 (15:08 +0100)]
MDL-52888 mod_quiz: New Web Service mod_quiz_view_attempt_summary
Juan Leyva [Mon, 25 Jan 2016 13:27:54 +0000 (14:27 +0100)]
MDL-52888 mod_quiz: New Web Service mod_quiz_view_attempt
Mark Nelson [Wed, 24 Feb 2016 05:59:06 +0000 (13:59 +0800)]
MDL-48012 tool_recyclebin: multiple changes before integration
- Added new icon for the recycle bin.
- Fixed issue where the course expiry setting was being used to display
the expiry messages in the category bin.
- Fixed failing Behat tests.
- Tidied Behat tests.
- General tidy up.
- Deleted three Behat feature files.
- Deleted 'delete_confirmation.feature' as it's testing JS functionality
that was removed (see comment further down). The 'basic_functionality.feature'
now tests deleting an activity and a course.
- Deleted 'description.feature' and added the tested functionality to
'basic_functionality.feature'.
- Deleted 'logs_test.feature' and moved testing to PHPUnit tests.
- Added another scenario for restoring a course.
- Removed protected mod settings - it was discussed that this was not a necessary
feature. We should not be treating the recycle bin as a backup.
- Renamed events to conform to guidelines.
- Wrote new PHPUnit tests for events.
- Tidied up existing PHPUnit tests and extended them.
- Alphabetised lang file.
- Made changes to strings and string identifiers in the lang file and changed usages in code.
- Changed setting names to better identify their purpose.
- Renamed classes and file names so it's easier to identify their purpose.
- Renamed the 'deleted' column to 'timecreated' for consistency with other
Moodle tables, and to easily identify what the value represents.
- Changed the columns 'category' and 'course' to 'categoryid' and
'courseid' respectively.
- Changed the name of the table indexes for consistency with core.
- Removed module.js and any use of it and replaced with Moodle core libraries
for JS confirmation.
- Removed 'noevent' argument in delete_item().
- Removed unnecessary capabilities - we can use the same capabilties for both
recycle bins based on the context the capability was given.
- Removed '_' in the capability definitions to keep it consistent with core.
- Set page layout and headings for index.php - varies between the course and
category recycle bins.
- Deleted styles.css and centred columns using the flexible_table API.
- Fixed IDE and codechecker complaints.
- Made use of the files API, rather than writing directly to
"$CFG->dataroot . '/recyclebin'".
- Used make_temp_directory rather than expecting it to exist.
- Replaced debugging function calls with calls to the backup API to
display errors.
- Deleted the temporary backup file after a successful restore, or if it fails.
- If the restore fails for a course, delete the course we created.
- Removed unnecessary '\' characters when not in namespace.
- Used configduration class for expiry times in the settings.
- Cleanup course bin when a course is deleted.
- Cleanup a category bin when a category is deleted.
- Removed unnecessary throw tags.
- Changed default settings.
Grigory Baleevskiy [Sun, 31 Jan 2016 01:14:48 +0000 (12:14 +1100)]
MDL-52978 core_lib: fixed wrong days showing for dates in datepicker
Adrian Greeve [Tue, 15 Mar 2016 07:13:51 +0000 (15:13 +0800)]
MDL-53465 lib: Upgrade PHPMailer to 5.2.14
Adrian Greeve [Tue, 15 Mar 2016 04:51:04 +0000 (12:51 +0800)]
MDL-53458 lib: Upgrade Mustache.js to 2.2.1
Adrian Greeve [Tue, 15 Mar 2016 04:09:00 +0000 (12:09 +0800)]
MDL-53457 lib: Upgrade Mustache to 2.10.0
Adrian Greeve [Mon, 14 Mar 2016 08:01:09 +0000 (16:01 +0800)]
MDL-52619 lib: Update of ADODB to 5.20.3
Marina Glancy [Mon, 22 Feb 2016 14:21:18 +0000 (22:21 +0800)]
MDL-45274 mod_feedback: show heading on non-respondents page
Juan Leyva [Thu, 21 Jan 2016 21:39:39 +0000 (22:39 +0100)]
MDL-52868 mod_quiz: New Web Service mod_quiz_get_attempt_review
Juan Leyva [Thu, 21 Jan 2016 11:55:28 +0000 (12:55 +0100)]
MDL-52863 mod_quiz: New Web Service mod_quiz_process_attempt
Juan Leyva [Thu, 21 Jan 2016 16:21:45 +0000 (17:21 +0100)]
MDL-52863 mod_quiz: Move processattempt.php code to new API
Eloy Lafuente (stronk7) [Thu, 17 Mar 2016 13:00:25 +0000 (14:00 +0100)]
weekly release 3.1dev
Eloy Lafuente (stronk7) [Thu, 17 Mar 2016 13:00:20 +0000 (14:00 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Brendan Heywood [Thu, 17 Mar 2016 10:17:35 +0000 (21:17 +1100)]
MDL-53357 admin: Don't break urls after saving admin settings
David Monllao [Thu, 17 Mar 2016 08:34:44 +0000 (16:34 +0800)]
Merge branch 'm31_MDL-48680_Add_Score_Status_Events' of git://github.com/scara/moodle
Eric Merrill [Thu, 17 Mar 2016 05:13:15 +0000 (01:13 -0400)]
MDL-53412 search: Correctly handle Solr over SSL
David Monllao [Thu, 17 Mar 2016 04:45:47 +0000 (12:45 +0800)]
Merge branch 'wip-mdl-46891-m' of git://github.com/rajeshtaneja/moodle
Rajesh Taneja [Thu, 17 Mar 2016 04:20:22 +0000 (12:20 +0800)]
MDL-46891 behat: Allow replacing string in profile for parallel run
Adding a replace with run process in profile
should be allowed
David Monllao [Thu, 25 Feb 2016 07:02:01 +0000 (15:02 +0800)]
MDL-53239 grader report: Add all names to error msg
Dan Poltawski [Thu, 17 Mar 2016 02:50:06 +0000 (10:50 +0800)]
Merge branch 'MDL-51374_multiple-connections' of git://github.com/dmonllao/moodle