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
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)
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)
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()
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
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.
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.
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
Mark Nelson [Thu, 8 Aug 2013 08:50:28 +0000 (16:50 +0800)]
MDL-39957 course: added PHPUnit test for the new course_updated event
Mark Nelson [Thu, 8 Aug 2013 08:50:10 +0000 (16:50 +0800)]
MDL-39957 course: replaced the course_updated legacy event
Mark Nelson [Thu, 8 Aug 2013 08:48:48 +0000 (16:48 +0800)]
MDL-39957 course: added PHPUnit test for the new course_created event
Mark Nelson [Thu, 8 Aug 2013 08:48:17 +0000 (16:48 +0800)]
MDL-39957 course: replaced the course_created legacy event
Dan Poltawski [Thu, 15 Aug 2013 08:38:05 +0000 (16:38 +0800)]
weekly release 2.6dev
Dan Poltawski [Thu, 15 Aug 2013 08:37:59 +0000 (16:37 +0800)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Dan Poltawski [Thu, 15 Aug 2013 08:37:27 +0000 (16:37 +0800)]
fix permissions
Damyon Wiese [Thu, 15 Aug 2013 08:03:44 +0000 (16:03 +0800)]
MDL-36002 Drag and Drop: Improvements to keyboard drag and drop
List of fixes:
* Add a simulated drag start event to fix problems with block drag and drop that
were expecting it.
* Add an access-hidden title for the General section in a course format. This
is used to provide the text for the drop region (better than the first activity in the section)
* Changed the text in the list to 'Move to "General"' instead of 'Move after General'. This
makes more sense for activities when you have a list of activities and sections together.
Damyon Wiese [Thu, 15 Aug 2013 06:39:00 +0000 (14:39 +0800)]
MDL-36002 core: Make drag and drop keyboard friendly (round 2)
Andrew Nicols [Wed, 14 Aug 2013 11:05:12 +0000 (12:05 +0100)]
MDL-4908 Forum: Basic maildigest setting tests
Andrew Nicols [Wed, 14 Aug 2013 10:08:31 +0000 (11:08 +0100)]
MDL-4908 Forum: Correctly check for appropriate login on maildigest changes
Sam Hemelryk [Thu, 15 Aug 2013 03:16:19 +0000 (15:16 +1200)]
Merge branch 'MDL-41200' of https://github.com/rwijaya/moodle
Damyon Wiese [Thu, 15 Aug 2013 02:52:24 +0000 (10:52 +0800)]
MDL-39851 javascript: Fixes for filepicker dialogs
Fixes display issues with the filepicker dialogs that were
converted to M.core.dialogue.
Note: These dialogue use table based layouts and the table width is not
counted in the form that it sits in. I have changed the dialogues to have
a wider width but for really small screens this causes horizontal scrolling.
The only solution for that is to rewrite all the filepicker/filemanager dialogs
to use css for layout.
Rossiani Wijaya [Thu, 15 Aug 2013 02:38:58 +0000 (10:38 +0800)]
MDL-41200 Filepicker: Reduce the string length to fit the dialog size nicely.
Rossiani Wijaya [Wed, 14 Aug 2013 17:04:50 +0000 (01:04 +0800)]
MDL-41200 filepicker: change header string to select.
Add length limitation for header, so it fits nicely in mobile devices
Sam Hemelryk [Thu, 15 Aug 2013 01:59:06 +0000 (13:59 +1200)]
Revert "MDL-36002 core: Make drag and drop keyboard friendly"
This reverts commit
7c271b9,
313e585,
ade4695, and
70b4027
Conflicts:
theme/bootstrapbase/style/moodle.css
AMOS bot [Thu, 15 Aug 2013 00:54:42 +0000 (00:54 +0000)]
Automatically generated installer lang files
Damyon Wiese [Wed, 14 Aug 2013 09:09:45 +0000 (17:09 +0800)]
MDL-39851 javascript: More behat fixes for filepicker changes.
Dan Poltawski [Wed, 14 Aug 2013 07:38:37 +0000 (15:38 +0800)]
Merge branch 'MDL-39954-master' of git://github.com/FMCorz/moodle
Frederic Massart [Wed, 14 Aug 2013 06:53:43 +0000 (14:53 +0800)]
MDL-39954 event: Fixed errors raised while triggering event
Frederic Massart [Wed, 14 Aug 2013 06:53:08 +0000 (14:53 +0800)]
MDL-39954 event: Fixed namespace issue with \coding_exception
Dan Poltawski [Wed, 14 Aug 2013 06:51:31 +0000 (14:51 +0800)]
Merge branch 'MDL-36002-master-fix1' of git://github.com/damyon/moodle
Damyon Wiese [Wed, 14 Aug 2013 06:36:35 +0000 (14:36 +0800)]
MDL-36002 javascript: Fix keyboard drag/drop not opening win
This was caused by changes in MDL-39851.
Dan Poltawski [Wed, 14 Aug 2013 06:24:30 +0000 (14:24 +0800)]
MDL-41019 bump redirect_if_major_upgrade_required()
Damyon Wiese [Wed, 14 Aug 2013 03:03:53 +0000 (11:03 +0800)]
MDL-39851 javascript: Add behat fix for filepicker
The filepicker was changed to use M.core.dialogue - this
patch updates the behat suite to search the changed dom for
the file picker windows closed event.
Sam Hemelryk [Tue, 13 Aug 2013 21:15:00 +0000 (09:15 +1200)]
Merge branch 'MDL-4908-m' of git://github.com/andrewnicols/moodle
Conflicts:
version.php
Andrew Nicols [Tue, 6 Aug 2013 22:41:13 +0000 (23:41 +0100)]
MDL-4908 Forum: Add backup/restore steps for per-forum digest settings
Andrew Nicols [Fri, 19 Jul 2013 12:10:29 +0000 (13:10 +0100)]
MDL-4908 Forum: Add help for profile maildigest setting
Andrew Nicols [Fri, 19 Jul 2013 12:03:13 +0000 (13:03 +0100)]
MDL-4908 Forum: Add a digest option link to outgoing forum mails
Andrew Nicols [Fri, 5 Jul 2013 00:12:36 +0000 (01:12 +0100)]
MDL-4908 Forum: per-forum digests
Sam Hemelryk [Thu, 8 Aug 2013 04:24:00 +0000 (16:24 +1200)]
weekly release 2.6dev
AMOS bot [Wed, 7 Aug 2013 00:42:59 +0000 (00:42 +0000)]
Automatically generated installer lang files
AMOS bot [Tue, 6 Aug 2013 00:42:16 +0000 (00:42 +0000)]
Automatically generated installer lang files
AMOS bot [Fri, 2 Aug 2013 00:38:30 +0000 (00:38 +0000)]
Automatically generated installer lang files
Mark Nelson [Wed, 7 Aug 2013 03:14:48 +0000 (11:14 +0800)]
MDL-40662 block_course_overview: added addinstance capability string
Frederic Massart [Tue, 13 Aug 2013 09:26:35 +0000 (17:26 +0800)]
MDL-39956 cohort: Event clean up and made ready for integration
* Added more PHP Documentation
* Localised strings for get_name()
* get_legacy_eventname() is now static
* get_legacy_eventdata() is now protected
* Testing legacy event data
* Added missing defined('MOODLE_INTERNAL') checks
* Added missing call to add_record_snapshot()
Dan Poltawski [Mon, 15 Jul 2013 04:47:01 +0000 (12:47 +0800)]
MDL-39956 cohort: Add tests for new events
Dan Poltawski [Fri, 12 Jul 2013 06:21:37 +0000 (14:21 +0800)]
MDL-39956 cohort: Convert to new events
* \core\event\cohort_created
* \core\event\cohort_updated
* \core\event\cohort_deleted
* \core\event\cohort_member_added
* \core\event\cohort_member_removed
Dan Poltawski [Tue, 13 Aug 2013 06:55:48 +0000 (14:55 +0800)]
MDL-31836 upgrade.txt: add a note about encrypt change
Dan Poltawski [Tue, 13 Aug 2013 06:57:23 +0000 (14:57 +0800)]
Merge branch 'wip-MDL-31836-m26' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 13 Aug 2013 05:23:31 +0000 (13:23 +0800)]
Merge branch 'MDL-39954-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 13 Aug 2013 03:14:37 +0000 (11:14 +0800)]
Merge branch 'MDL-40668-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 13 Aug 2013 02:56:26 +0000 (10:56 +0800)]
Merge branch 'MDL-39851-master-squashed' of git://github.com/damyon/moodle
Damyon Wiese [Fri, 2 Aug 2013 05:39:25 +0000 (13:39 +0800)]
MDL-40668 tinymce: Remove collapsable editor options
We have an alternative (pdw toolbars)
Also, allow tinymce to be collapsed down to a single row.
Dan Poltawski [Tue, 13 Aug 2013 02:46:10 +0000 (10:46 +0800)]
MDL-39507 qtype_essay: hacky fix for unit tests
This is just to get the tests passing for integration purposes. Tim
may want to do a robust fix and revert this.
Damyon Wiese [Mon, 5 Aug 2013 03:13:16 +0000 (11:13 +0800)]
MDL-39851 M.core.dialogue: Various fixes
Items addressed
* Get rid of custom attribute srcNode
* Change extraClasses to a config only parameter.
* Change attribute fullscreen to a method.
* Restore the original window overflow value.
* Use setStyles instead of setStyle for performance.
* Tinymce end the zindex wars
* Prevent fullscreen dialogs in an iframe (tinymce managefiles plugin).
* tinymce: Cross browser fix for zindex on popups
* Use CSS for overflow changes (easier to keep track of the previous state).
* Fix Coding style for css changes
Damyon Wiese [Tue, 30 Jul 2013 03:35:59 +0000 (11:35 +0800)]
MDL-39851 filepicker: Fix for toolbar display wrapping on small screens
Damyon Wiese [Tue, 30 Jul 2013 02:30:13 +0000 (10:30 +0800)]
MDL-39851 forms: Convert filemanager popups to M.core.dialogue
Damyon Wiese [Thu, 13 Jun 2013 06:24:29 +0000 (14:24 +0800)]
MDL-39851 javascript: Full screen dialogs on small screens
This change adds support to M.core.dialogue for showing fullscreen
dialogs on small screen sizes. There are 2 new configuration values that
can be set to control this when creating a dialog (responsive and responsiveWidth).
Setting responsive to false will disable this functionality completely (old behaviour).
Setting responsiveWidth controls the screen width that the dialog will switch to
fullscreen mode. Try not to think of the device that will be accessing the dialog,
but the width at which the content of the dialog needs to be displayed differently.
The activity chooser and the filepicker are the two dialogs that have been converted
in this patch. The filepicker first had to be converted to use M.core.dialog and not
Y.Panel.
Sam Hemelryk [Tue, 13 Aug 2013 02:13:13 +0000 (14:13 +1200)]
Merge branch 'wip-mdl-39955' of git://github.com/rajeshtaneja/moodle