63032 Commits

Author SHA1 Message Date
Damyon Wiese
b277230aad Merge branch 'MDL-39956-master' of git://github.com/FMCorz/moodle 2013-08-20 12:21:04 +08:00
Dan Poltawski
bfa4c3f358 Merge branch 'MDL-36002-master' of git://github.com/damyon/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-08-20 12:17:16 +08:00
Dan Poltawski
6f44a73369 Merge branch 'w33_MDL-39474_m26_debugdeveloper' of https://github.com/skodak/moodle
Conflicts:
	lib/upgrade.txt
2013-08-20 11:42:03 +08:00
Dan Poltawski
8ab325fb00 Merge branch 'MDL-38203' of git://github.com/timhunt/moodle 2013-08-20 11:28:39 +08:00
Dan Poltawski
57cb5f5afa Merge branch 'WIP-MDL-36044-master' of git://github.com/nadavkav/moodle 2013-08-20 11:07:53 +08:00
Dan Poltawski
54a868d3be Merge branch 'MDL-39236-master' of git://github.com/nadavkav/moodle 2013-08-20 10:59:31 +08:00
Dan Poltawski
9d66c2bb5b Merge branch 'MDL-39980' of git://github.com/timhunt/moodle 2013-08-20 10:47:45 +08:00
Dan Poltawski
599d7d9bdf Merge branch 'MDL-30839-master' of git://github.com/phalacee/moodle 2013-08-19 17:40:37 +08:00
Damyon Wiese
ea8c248c96 MDL-36002 keyboard drag drop: Hidden activities and labels
Get the correct title for hidden activities and labels.
2013-08-19 16:18:23 +08:00
Damyon Wiese
e5cb7f8b7b Merge branch 'master_MDL-39572' of https://github.com/totara/moodle 2013-08-19 15:42:17 +08:00
Damyon Wiese
26ae471585 Merge branch 'MDL-40896' of git://github.com/timhunt/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-08-19 15:38:23 +08:00
Damyon Wiese
5ebe37fb27 Revert "MDL-41106 cache: several fixes for the session cache."
This reverts commit 89182546a0ae93a2aef79383bac902c77c7801f8.
This reverts commit 170b05362a82b2c1f5353551b7bd6fe4246fe951.
This reverts commit 2e9d5a534e8e3045923055baa1609d66cec0affe.
2013-08-19 15:32:08 +08:00
Dan Poltawski
c3b087ccc3 Merge branch 'MDL-40893-master' of https://github.com/mr-russ/moodle 2013-08-19 14:50:01 +08:00
Damyon Wiese
3415e1ca59 Merge branch 'wip-MDL-41106-m26' of git://github.com/samhemelryk/moodle 2013-08-19 13:50:46 +08:00
Damyon Wiese
d51f9d5fd0 Merge branch 'wip-MDL-36789-master' of git://github.com/marinaglancy/moodle 2013-08-19 13:29:55 +08:00
Dan Poltawski
bee137b65a Merge branch 'MDL-39703_master' of https://github.com/nadavkav/moodle 2013-08-19 13:08:10 +08:00
Dan Poltawski
a945d48127 Merge branch 'master_MDL-37393' of github.com:danmarsden/moodle 2013-08-19 12:57:34 +08:00
Jason Fowler
0c99005a9a MDL-30839 Accessibility, Forms - Improve accessibility or error messages 2013-08-19 09:54:41 +08:00
Sam Hemelryk
89182546a0 MDL-41106 cache: tidied up several elements 2013-08-19 11:32:08 +12:00
Marina Glancy
170b05362a 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
2013-08-19 09:28:36 +12:00
Nadav Kavalerchik
373c610ed1 MDL-39703 Roles, Themes: Fix "Add role" dialog width and position, in RTL mode (theme/clean) 2013-08-18 21:51:51 +03:00
Nadav Kavalerchik
42fabe1e87 MDL-36044 - Delete Icon ("X") blocks Score numbers, when in RTL mode (mod/assign , Rubrics editor) 2013-08-18 17:40:00 +03:00
Nadav Kavalerchik
6700806403 MDL-39236 - Right align table cells during install process, when in RTL mode (theme/standard, actually theme/base) 2013-08-16 11:53:14 +03:00
Russell Smith
536e9be605 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.
2013-08-16 10:06:13 +10:00
Sam Hemelryk
2e9d5a534e 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.
2013-08-16 11:27:55 +12:00
Simon Coggins
be8c6d7bc8 MDL-39572: Fix sql_order_by_text() to use length argument correctly 2013-08-16 11:26:54 +12:00
Simon Coggins
be4bf53d6d MDL-39572: Fix existing tests and add more to demonstrate issue with sql_order_by_text() 2013-08-16 11:26:54 +12:00
Matteo Scaramuccia
9d507f1d70 MDL-37393 SCORM: Fixed PHP Strict Standards errors with AICC packages 2013-08-16 09:28:41 +12:00
Dan Marsden
d4978e044e MDL-37393 SCORM: Fix existing AICC scoes to use correct parent/child relationships
also fix bad version used by patch in MDL-39239
2013-08-16 09:28:40 +12:00
Tim Hunt
9e6eb082ff MDL-38203 multianswer qtype: feedback pop-up should be constrained.
So that, when there is a lot of feedback, it is all visible.
2013-08-15 14:15:38 +01:00
Tim Hunt
afb1b3d03b 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.
2013-08-15 12:55:13 +01:00
Marina Glancy
676fa06af3 MDL-36789 Quick course cache integrity check for deleted modules 2013-08-15 21:48:24 +10:00
Tim Hunt
89b04bef50 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.
2013-08-15 12:20:07 +01:00
Tim Hunt
2f7827b241 MDL-40896 Add missing question edit CSS to bootstrapbase. 2013-08-15 12:18:00 +01:00
Dan Poltawski
838d78a9ff weekly release 2.6dev 2013-08-15 16:38:05 +08:00
Dan Poltawski
7031373ba8 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-08-15 16:37:59 +08:00
Dan Poltawski
5d5c1bb801 fix permissions 2013-08-15 16:37:27 +08:00
Damyon Wiese
bbb483b259 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.
2013-08-15 16:15:32 +08:00
Damyon Wiese
dd66b6ab48 MDL-36002 core: Make drag and drop keyboard friendly (round 2) 2013-08-15 14:39:00 +08:00
Andrew Nicols
0462b6a1a5 MDL-4908 Forum: Basic maildigest setting tests 2013-08-15 17:20:49 +12:00
Andrew Nicols
84869cb679 MDL-4908 Forum: Correctly check for appropriate login on maildigest changes 2013-08-15 15:24:15 +12:00
Sam Hemelryk
d333a3f2da Merge branch 'MDL-41200' of https://github.com/rwijaya/moodle 2013-08-15 15:16:19 +12:00
Damyon Wiese
fd782261de 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.
2013-08-15 10:52:24 +08:00
Rossiani Wijaya
d8817b4a7f MDL-41200 Filepicker: Reduce the string length to fit the dialog size nicely. 2013-08-15 10:38:58 +08:00
Rossiani Wijaya
0a5c86ddef MDL-41200 filepicker: change header string to select.
Add length limitation for header, so it fits nicely in mobile devices
2013-08-15 10:28:56 +08:00
Sam Hemelryk
702d1f853e Revert "MDL-36002 core: Make drag and drop keyboard friendly"
This reverts commit 7c271b9, 313e585, ade4695, and 70b4027

Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-08-15 13:59:06 +12:00
AMOS bot
e341bc4f96 Automatically generated installer lang files 2013-08-15 00:54:42 +00:00
Damyon Wiese
ae19c68c9c MDL-39851 javascript: More behat fixes for filepicker changes. 2013-08-14 17:12:03 +08:00
Dan Poltawski
260ea3d9a1 Merge branch 'MDL-39954-master' of git://github.com/FMCorz/moodle 2013-08-14 15:38:37 +08:00
Frederic Massart
29b8b7c7ad MDL-39954 event: Fixed errors raised while triggering event 2013-08-14 15:29:12 +08:00