mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-27 19:33:16 +02:00
Code Issues Projects Releases Wiki Activity
63,058 Commits 37 Branches 536 Tags
Commit Graph

63058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jenny Gray
df428badaf MDL-39800 tags: resolved weighting in block content 2013-08-20 14:26:20 +08:00
Dan Poltawski
d5b076a2ca Merge branch 'wip-MDL-37674-m26' of git://github.com/samhemelryk/moodle 2013-08-20 14:21:38 +08:00
Damyon Wiese
eedb6aae3f Merge branch 'MDL-27595-2' of https://github.com/bostelm/moodle 2013-08-20 13:31:16 +08:00
Damyon Wiese
43cc62ed13 Merge branch 'MDL-41036' of git://github.com/timhunt/moodle 2013-08-20 12:55:31 +08:00
Dan Poltawski
91a888df34 Merge branch 'MDL-39957_master' of https://github.com/markn86/moodle 2013-08-20 12:38:08 +08:00
Damyon Wiese
5a2356be38 Merge branch 'MDL-41122_master' of git://github.com/kastashov/moodle 2013-08-20 12:28:00 +08:00
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
Amy Groshek
dc3337b273 MDL-37674 - modify html_attributes() to add .no-header class when header will not be rendered 2013-08-16 09:17:44 +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
fa5c608c62 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.
 2013-08-15 12:19:47 +01:00
Tim Hunt
2f7827b241 MDL-40896 Add missing question edit CSS to bootstrapbase. 2013-08-15 12:18:00 +01:00
Henning Bostelmann
55e4100617 MDL-27595 backup: allow course import with warnings 
Proceed with import if warnings are found, but display the warnings afterwards
 2013-08-15 11:18:40 +01:00
Mark Nelson
cd14c5cab8 MDL-39957 course: replaced add_to_log for hiding/showing courses 2013-08-15 18:14:08 +08:00
Mark Nelson
e5959771b2 MDL-39957 course: added PHPUnit assertions for when a course_updated event is triggered by moving a course 2013-08-15 18:14:08 +08:00
Mark Nelson
ed54cb4110 MDL-39957 course: replaced add_to_log for moving courses 2013-08-15 18:14:08 +08:00
Mark Nelson
2bf2f3599e MDL-39957 course: altered the handling of legacy log data for the course_updated event 2013-08-15 18:14:08 +08:00
Mark Nelson
02cbb621d6 MDL-39957 course: added PHPUnit test for the new course_restored event 2013-08-15 18:14:08 +08:00
Mark Nelson
a4003c733a MDL-39957 course: replaced the course_restored legacy event 2013-08-15 18:14:08 +08:00
Mark Nelson
7240cd92f9 MDL-39957 course: added PHPUnit test for the new course_category_deleted event 2013-08-15 18:14:08 +08:00