Marina Glancy [Wed, 21 Aug 2013 00:02:41 +0000 (10:02 +1000)]
Merge branch 'wip-mdl-40042' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 20 Aug 2013 21:06:43 +0000 (09:06 +1200)]
MDL-40931 useragent: converted useragent calls in ajaxenabled
Sam Hemelryk [Tue, 20 Aug 2013 23:03:35 +0000 (11:03 +1200)]
Revert "MDL-41258 Forum: Add additional unit tests for forum digest settings"
This reverts commit
0ef6f6860debcc2a5b67fecaeb57256377436b6b.
Sam Hemelryk [Tue, 20 Aug 2013 23:01:51 +0000 (11:01 +1200)]
Merge branch 'master_MDL-41144' of git://github.com/danmarsden/moodle
Sam Hemelryk [Tue, 20 Aug 2013 22:56:00 +0000 (10:56 +1200)]
Merge branch 'MDL-41159-master' of git://github.com/damyon/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Tue, 20 Aug 2013 22:48:02 +0000 (10:48 +1200)]
Merge branch 'MDL-41157-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 20 Aug 2013 22:21:04 +0000 (10:21 +1200)]
Merge branch 'MDL-41210-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 20 Aug 2013 22:09:08 +0000 (10:09 +1200)]
Merge branch 'MDL-41209-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 20 Aug 2013 21:59:19 +0000 (09:59 +1200)]
Merge branch 'MDL-41258-m' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 20 Aug 2013 21:56:16 +0000 (09:56 +1200)]
Merge branch 'MDL-41196-m' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 20 Aug 2013 10:21:17 +0000 (18:21 +0800)]
Merge branch 'MDL-41143-master' of git://github.com/FMCorz/moodle
Conflicts:
version.php
Dan Poltawski [Tue, 20 Aug 2013 09:51:18 +0000 (17:51 +0800)]
Merge branch 'MDL-41136-master' of git://github.com/FMCorz/moodle
Frederic Massart [Mon, 12 Aug 2013 07:24:26 +0000 (15:24 +0800)]
MDL-41143 mod_forum: Prevent unnessary loading of formslib
Dan Poltawski [Tue, 20 Aug 2013 09:10:05 +0000 (17:10 +0800)]
Merge branch 'MDL-41125-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 20 Aug 2013 09:03:47 +0000 (17:03 +0800)]
Merge branch 'w33_MDL-41094_m26_purgecleanup' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 20 Aug 2013 08:48:18 +0000 (16:48 +0800)]
MDL-40931 useragentlib: Removed unused class variable + version fix
Damyon Wiese [Tue, 20 Aug 2013 08:45:33 +0000 (16:45 +0800)]
Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 20 Aug 2013 08:44:09 +0000 (16:44 +0800)]
Merge branch 'MDL-41211-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 20 Aug 2013 08:34:18 +0000 (16:34 +0800)]
Merge branch 'MDL-39770_chat' of https://github.com/andyjdavis/moodle
Damyon Wiese [Tue, 20 Aug 2013 08:13:55 +0000 (16:13 +0800)]
Merge branch 'MDL-41191-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Tue, 20 Aug 2013 08:10:49 +0000 (16:10 +0800)]
Merge branch 'MDL-40709-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Tue, 20 Aug 2013 08:07:12 +0000 (16:07 +0800)]
Merge branch 'w33_MDL-40952_m26_opcacheunit' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 20 Aug 2013 08:01:12 +0000 (16:01 +0800)]
Merge branch 'MDL-41071-master' of git://github.com/FMCorz/moodle
Mark Nelson [Tue, 20 Aug 2013 07:42:12 +0000 (15:42 +0800)]
MDL-39957 course: added missing assertions for events
This occurred when an add_to_log call, with no associated legacy event,
was replaced with a new event. We should still call assertEventLegacyData
even though there is no legacy event data to compare with, simply ensure
that the expected data was passed.
Damyon Wiese [Tue, 20 Aug 2013 07:52:11 +0000 (15:52 +0800)]
MDL-40038 files: Removed commented code from unit test
Damyon Wiese [Tue, 20 Aug 2013 07:51:57 +0000 (15:51 +0800)]
Merge branch 'wip-MDL-40038-master' of git://github.com/abgreeve/moodle
Conflicts:
files/tests/externallib_test.php
Damyon Wiese [Tue, 20 Aug 2013 07:22:34 +0000 (15:22 +0800)]
Merge branch 'w33_MDL-41112_m26_cachedist' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 20 Aug 2013 07:13:02 +0000 (15:13 +0800)]
Merge branch 'wip-MDL-40974-m26' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 20 Aug 2013 06:53:57 +0000 (14:53 +0800)]
MDL-38197 tool_generator: fix use of raw LIKE sql
Dan Poltawski [Tue, 20 Aug 2013 06:55:07 +0000 (14:55 +0800)]
Merge branch 'MDL-38197-master' of git://github.com/sammarshallou/moodle
Damyon Wiese [Tue, 20 Aug 2013 06:45:34 +0000 (14:45 +0800)]
Merge branch 'MDL-40162_master' of https://github.com/totara/openbadges
Damyon Wiese [Tue, 20 Aug 2013 06:40:42 +0000 (14:40 +0800)]
Merge branch 'wip-mdl-40043' of git://github.com/rajeshtaneja/moodle
Conflicts:
course/tests/courselib_test.php
lang/en/moodle.php
Jenny Gray [Mon, 29 Jul 2013 11:25:31 +0000 (12:25 +0100)]
MDL-39800 tags: moved cloud sorting to print function
Jenny Gray [Mon, 8 Jul 2013 14:16:51 +0000 (15:16 +0100)]
MDL-39800 tags: Applied weight and ordering fix on all more page options
Also:
Fixed weight and ordering on more page show=all
Fixed weight and ordering on more page show=my
rationalised tag_print_cloud lines now identical
Jenny Gray [Mon, 8 Jul 2013 13:49:15 +0000 (14:49 +0100)]
MDL-39800 tags: resolved weighting in block content
Dan Poltawski [Tue, 20 Aug 2013 06:21:38 +0000 (14:21 +0800)]
Merge branch 'wip-MDL-37674-m26' of git://github.com/samhemelryk/moodle
Rajesh Taneja [Wed, 14 Aug 2013 07:43:17 +0000 (15:43 +0800)]
MDL-40043 Events API: Added user_loggedinas event to replace add_to_log
Rajesh Taneja [Wed, 14 Aug 2013 02:14:51 +0000 (10:14 +0800)]
MDL-40043 Events API: Added course_section_updated event to replace add_to_log
Damyon Wiese [Tue, 20 Aug 2013 05:31:16 +0000 (13:31 +0800)]
Merge branch 'MDL-27595-2' of https://github.com/bostelm/moodle
Damyon Wiese [Tue, 20 Aug 2013 04:55:31 +0000 (12:55 +0800)]
Merge branch 'MDL-41036' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 20 Aug 2013 04:38:08 +0000 (12:38 +0800)]
Merge branch 'MDL-39957_master' of https://github.com/markn86/moodle
Damyon Wiese [Tue, 20 Aug 2013 04:28:00 +0000 (12:28 +0800)]
Merge branch 'MDL-41122_master' of git://github.com/kastashov/moodle
Damyon Wiese [Tue, 20 Aug 2013 04:21:04 +0000 (12:21 +0800)]
Merge branch 'MDL-39956-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 20 Aug 2013 04:17:16 +0000 (12:17 +0800)]
Merge branch 'MDL-36002-master' of git://github.com/damyon/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Tue, 20 Aug 2013 03:42:03 +0000 (11:42 +0800)]
Merge branch 'w33_MDL-39474_m26_debugdeveloper' of https://github.com/skodak/moodle
Conflicts:
lib/upgrade.txt
Dan Poltawski [Tue, 20 Aug 2013 03:28:39 +0000 (11:28 +0800)]
Merge branch 'MDL-38203' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 20 Aug 2013 03:07:53 +0000 (11:07 +0800)]
Merge branch 'WIP-MDL-36044-master' of git://github.com/nadavkav/moodle
Dan Poltawski [Tue, 20 Aug 2013 02:59:31 +0000 (10:59 +0800)]
Merge branch 'MDL-39236-master' of git://github.com/nadavkav/moodle
Dan Poltawski [Tue, 20 Aug 2013 02:47:45 +0000 (10:47 +0800)]
Merge branch 'MDL-39980' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 19 Aug 2013 09:40:37 +0000 (17:40 +0800)]
Merge branch 'MDL-30839-master' of git://github.com/phalacee/moodle
Damyon Wiese [Mon, 19 Aug 2013 08:18:23 +0000 (16:18 +0800)]
MDL-36002 keyboard drag drop: Hidden activities and labels
Get the correct title for hidden activities and labels.
Damyon Wiese [Mon, 19 Aug 2013 07:42:17 +0000 (15:42 +0800)]
Merge branch 'master_MDL-39572' of https://github.com/totara/moodle
Damyon Wiese [Mon, 19 Aug 2013 07:38:23 +0000 (15:38 +0800)]
Merge branch 'MDL-40896' of git://github.com/timhunt/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Mon, 19 Aug 2013 07:31:24 +0000 (15:31 +0800)]
Revert "MDL-41106 cache: several fixes for the session cache."
This reverts commit
89182546a0ae93a2aef79383bac902c77c7801f8.
This reverts commit
170b05362a82b2c1f5353551b7bd6fe4246fe951.
This reverts commit
2e9d5a534e8e3045923055baa1609d66cec0affe.
Dan Poltawski [Mon, 19 Aug 2013 06:50:01 +0000 (14:50 +0800)]
Merge branch 'MDL-40893-master' of https://github.com/mr-russ/moodle
Damyon Wiese [Mon, 19 Aug 2013 05:50:46 +0000 (13:50 +0800)]
Merge branch 'wip-MDL-41106-m26' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 19 Aug 2013 05:29:55 +0000 (13:29 +0800)]
Merge branch 'wip-MDL-36789-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 19 Aug 2013 05:08:10 +0000 (13:08 +0800)]
Merge branch 'MDL-39703_master' of https://github.com/nadavkav/moodle
Dan Poltawski [Mon, 19 Aug 2013 04:57:34 +0000 (12:57 +0800)]
Merge branch 'master_MDL-37393' of github.com:danmarsden/moodle
Andrew Davis [Mon, 24 Jun 2013 13:36:43 +0000 (21:36 +0800)]
MDL-39770 mod_chat: improved the chat experience on small screens
Jason Fowler [Mon, 12 Aug 2013 03:03:53 +0000 (11:03 +0800)]
MDL-30839 Accessibility, Forms - Improve accessibility or error messages
Sam Hemelryk [Sun, 18 Aug 2013 22:00:44 +0000 (10:00 +1200)]
MDL-41106 cache: tidied up several elements
Marina Glancy [Sun, 18 Aug 2013 07:54:50 +0000 (17:54 +1000)]
MDL-41106 Cleaning up expired elements in session cache store
- Always make sure the elements in cache are sorted so we need to remove only elements in the beginning of array
- Remove expired elements from session store to free memory
- Minor bug fixes
Nadav Kavalerchik [Sun, 18 Aug 2013 18:51:51 +0000 (21:51 +0300)]
MDL-39703 Roles, Themes: Fix "Add role" dialog width and position, in RTL mode (theme/clean)
Nadav Kavalerchik [Sun, 14 Oct 2012 21:37:29 +0000 (23:37 +0200)]
MDL-36044 - Delete Icon ("X") blocks Score numbers, when in RTL mode (mod/assign , Rubrics editor)
Andrew Nicols [Wed, 14 Aug 2013 15:50:43 +0000 (16:50 +0100)]
MDL-41258 Forum: Add additional unit tests for forum digest settings
sam marshall [Fri, 2 Aug 2013 12:57:59 +0000 (13:57 +0100)]
MDL-38197 Script to generate standard-size large course for testing
Nadav Kavalerchik [Fri, 19 Apr 2013 08:43:08 +0000 (11:43 +0300)]
MDL-39236 - Right align table cells during install process, when in RTL mode (theme/standard, actually theme/base)
Rajesh Taneja [Thu, 8 Aug 2013 04:43:02 +0000 (12:43 +0800)]
MDL-40042 Completion: added course_completion_updated event to remove related add_to_log
Russell Smith [Tue, 30 Jul 2013 06:00:57 +0000 (16:00 +1000)]
MDL-40893 backup: cache question answers for performance
To constrain memory we only cache a single question's answers.
A quiz must display this many answers, so it will not result
in undue memory pressure.
We now match on the full answer text rather than the first 255
characters. This removes the risk of matching questions with the
same start.
Sam Hemelryk [Thu, 15 Aug 2013 23:22:15 +0000 (11:22 +1200)]
MDL-41106 cache: several fixes for the session cache.
This issue makes several fixes for the session loader and the session store.
* maxsize argument now works for session caches.
* fixed performance hole when interation occurs frequently.
* fixed cache purge bug occuring when multiple caches are defined before being used.
* improved lastaccess handling.
Simon Coggins [Wed, 14 Aug 2013 23:54:19 +0000 (11:54 +1200)]
MDL-39572: Fix sql_order_by_text() to use length argument correctly
Simon Coggins [Wed, 14 Aug 2013 23:54:10 +0000 (11:54 +1200)]
MDL-39572: Fix existing tests and add more to demonstrate issue with sql_order_by_text()
Yuliya Bozhko [Thu, 15 Aug 2013 23:12:12 +0000 (11:12 +1200)]
MDL-40162 badges: Image url breaks when slashargumets is not supported
Dan Marsden [Mon, 12 Aug 2013 08:58:02 +0000 (20:58 +1200)]
MDL-41144 enrol_flatfile: ignore deleted users.
Matteo Scaramuccia [Sat, 15 Jun 2013 06:52:50 +0000 (08:52 +0200)]
MDL-37393 SCORM: Fixed PHP Strict Standards errors with AICC packages
Dan Marsden [Fri, 11 Jan 2013 08:57:32 +0000 (21:57 +1300)]
MDL-37393 SCORM: Fix existing AICC scoes to use correct parent/child relationships
also fix bad version used by patch in MDL-39239
Amy Groshek [Thu, 24 Jan 2013 22:15:12 +0000 (16:15 -0600)]
MDL-37674 - modify html_attributes() to add .no-header class when header will not be rendered
Sam Hemelryk [Tue, 30 Jul 2013 05:00:54 +0000 (17:00 +1200)]
MDL-40931 useragent: separated user agent functionality into a lib
This commit moves user agent related functionality out of several
core libraries and combines it into a more manageable class.
All core uses are converted and functions deprecated in favor
of the new class.
Sam Hemelryk [Thu, 1 Aug 2013 02:55:32 +0000 (14:55 +1200)]
MDL-40974 course: fixed group mode icon now has tooltip
Tim Hunt [Tue, 26 Feb 2013 16:37:06 +0000 (16:37 +0000)]
MDL-38203 multianswer qtype: feedback pop-up should be constrained.
So that, when there is a lot of feedback, it is all visible.
Andrew Nicols [Wed, 14 Aug 2013 15:40:16 +0000 (16:40 +0100)]
MDL-41196 Unit Tests: Add a phpmailer message sink
Tim Hunt [Mon, 5 Aug 2013 15:51:05 +0000 (16:51 +0100)]
MDL-39980 question engine: Attempt on last loses response files
When doing Each attempt builds on last, we need to copy any response
files into a draft file area, and then re-save them.
While writing the unit test for this, I had to deal with a todo in the
question engine so that questions with files in the response could be
unit-tested.
I also found an fixed a bug with qtype_essay_question::is_same_response
and fixed some notices in the existing essay/manual graded unit tests.
Marina Glancy [Fri, 9 Aug 2013 03:09:26 +0000 (13:09 +1000)]
MDL-36789 Quick course cache integrity check for deleted modules
Tim Hunt [Thu, 8 Aug 2013 17:30:33 +0000 (18:30 +0100)]
MDL-41093 qtype match: unique index upgrade problem.
Eliminate duplicate rows before we try to add a unique index. We
arbitrarily keep the duplicate row with the lowest id.
Tim Hunt [Mon, 5 Aug 2013 17:36:56 +0000 (18:36 +0100)]
MDL-41036 Question category info should use HTML editor
This is a minimal fix. All this code could do with a clean-up, but at
the moment, it works, so I am not going to touch it.
Tim Hunt [Thu, 8 Aug 2013 14:20:25 +0000 (15:20 +0100)]
MDL-40896 Add missing question edit CSS to bootstrapbase.
Henning Bostelmann [Thu, 1 Aug 2013 11:43:12 +0000 (12:43 +0100)]
MDL-27595 backup: allow course import with warnings
Proceed with import if warnings are found, but display the warnings afterwards
Mark Nelson [Fri, 9 Aug 2013 10:01:48 +0000 (18:01 +0800)]
MDL-39957 course: replaced add_to_log for hiding/showing courses
Mark Nelson [Mon, 12 Aug 2013 03:47:32 +0000 (11:47 +0800)]
MDL-39957 course: added PHPUnit assertions for when a course_updated event is triggered by moving a course
Mark Nelson [Fri, 9 Aug 2013 10:01:05 +0000 (18:01 +0800)]
MDL-39957 course: replaced add_to_log for moving courses
Mark Nelson [Fri, 9 Aug 2013 09:58:30 +0000 (17:58 +0800)]
MDL-39957 course: altered the handling of legacy log data for the course_updated event
Mark Nelson [Thu, 8 Aug 2013 08:57:01 +0000 (16:57 +0800)]
MDL-39957 course: added PHPUnit test for the new course_restored event
Mark Nelson [Thu, 8 Aug 2013 08:56:49 +0000 (16:56 +0800)]
MDL-39957 course: replaced the course_restored legacy event
Mark Nelson [Thu, 8 Aug 2013 08:56:23 +0000 (16:56 +0800)]
MDL-39957 course: added PHPUnit test for the new course_category_deleted event
Mark Nelson [Thu, 8 Aug 2013 08:56:13 +0000 (16:56 +0800)]
MDL-39957 course: replaced the course_category_deleted legacy event
Mark Nelson [Thu, 8 Aug 2013 08:55:48 +0000 (16:55 +0800)]
MDL-39957 course: added PHPUnit test for the new course_content_deleted event
Mark Nelson [Thu, 8 Aug 2013 08:55:30 +0000 (16:55 +0800)]
MDL-39957 course: replaced the course_content_deleted legacy event
Mark Nelson [Thu, 8 Aug 2013 08:51:36 +0000 (16:51 +0800)]
MDL-39957 course: added PHPUnit test for the new course_deleted event
Mark Nelson [Thu, 8 Aug 2013 08:51:02 +0000 (16:51 +0800)]
MDL-39957 course: replaced the course_deleted legacy event