13679 Commits

Author SHA1 Message Date
Damyon Wiese
ce91af8114 Merge branch 'MDL-38282' of git://github.com/timhunt/moodle 2013-03-05 16:06:31 +08:00
Aparup Banerjee
da33f689dc Merge branch 'MDL-30481' of git://github.com/rwijaya/moodle 2013-03-05 12:55:41 +08:00
Aparup Banerjee
b4f110f1a4 Merge branch 'MDL-33946_label_dndupload_text' of git://github.com/davosmith/moodle 2013-03-05 10:21:25 +08:00
Eloy Lafuente (stronk7)
cdbbd48a66 Merge branch 'MDL-38261-workshop-attachments-size' of git://github.com/mudrd8mz/moodle 2013-03-05 00:48:47 +01:00
Eloy Lafuente (stronk7)
1de87afc24 Merge branch 'MDL-37522-published-attachment' of git://github.com/mudrd8mz/moodle 2013-03-04 20:46:41 +01:00
Eloy Lafuente (stronk7)
5a341e9183 Merge branch 'MDL-31390-m' of git://github.com/andrewnicols/moodle 2013-03-04 18:08:54 +01:00
Sam Hemelryk
486f9dbecc Merge branch 'MDL-38243-master' of git://github.com/lucisgit/moodle 2013-03-04 16:25:50 +13:00
Sam Hemelryk
5722822302 Merge branch 'MDL-35350' of git://github.com/rwijaya/moodle 2013-03-04 16:13:09 +13:00
Sam Hemelryk
1668803ae2 Merge branch 'MDL-35127-master' of git://github.com/damyon/moodle 2013-03-04 16:08:08 +13:00
Tim Hunt
9fc29eec6d MDL-39282 quiz: always allow removal of bogus questions. 2013-03-01 17:33:32 +00:00
Andrew Robert Nicols
5251450372 MDL-31390 Convert set_source_sql with order clauses to set_source_table 2013-03-01 11:29:01 +00:00
Davo Smith
5efae6823d MDL-33946 mod_label - create label from text dragged and dropped into the course 2013-02-28 21:43:30 +00:00
Tim Hunt
ae271eba1f MDL-38209 quiz CSS: strip browser-specific rules. 2013-02-28 18:33:45 +00:00
Tim Hunt
c04ed8d51c MDL-38209 quiz CSS: fix coding style. 2013-02-28 18:33:45 +00:00
David Mudrák
4cd2b45548 MDL-38261 Replace deprecated file_encode_url() in workshop renderer 2013-02-28 18:53:37 +01:00
David Mudrák
57c1c7edfc MDL-38261 Display workshop submission attachments in a preview mode 2013-02-28 18:53:37 +01:00
David Mudrák
2d4a3e6894 MDL-37522 Serve images from published submissions
If the user is allowed to see the published submission, she must be also
able to see images in it (both embedded into the text as well as
attached to the submission). See the logic in submission.php as a
reference.
2013-02-28 18:53:08 +01:00
Gilles-Philippe Leblanc
4a913724d0 MDL-32125 mod_forum: Updating subscription mode not reflecting subscribers 2013-02-28 11:33:51 -05:00
Ruslan Kabalin
ae9fe89afa MDL-38243 mod_assessment: make assessment forms non-collapsible 2013-02-28 10:28:18 +00:00
Rossiani Wijaya
8b8d7fcd17 MDL-34774 Lesson module: fixed report stats for 'high score' and 'low score' values where there is only one attempt with 0 score 2013-02-28 16:05:14 +08:00
Michael de Raadt
ce744f7134 MDL-35350 Advanced uploading assignment: add submission timestamp on assignment index page 2013-02-28 14:06:01 +08:00
Damyon Wiese
520fee918e MDL-36832 Assignment Use MUC for useridlist: Fix for quickgrading checkbox 2013-02-27 11:24:42 +08:00
Damyon Wiese
b8d3aa8fc8 MDL-35127 Assignment - declare the variables in the outer scope (for readability) 2013-02-27 09:27:55 +08:00
Eric Merrill
d77731d612 MDL-35127 mod_assign More efficient use of expensive database queries
Moving two relatively expensive DB queries so they are only executed when needed
instead of on every function call. They will still only execute once, and not
repeatedly during execution of the loop.
2013-02-27 09:01:25 +08:00
Eloy Lafuente (stronk7)
738b0965a4 Merge branch 'wip-MDL-37356-master' of git://github.com/abgreeve/moodle 2013-02-26 18:12:15 +01:00
Rossiani Wijaya
b9509a1e45 MDL-30481 Advanced upload assignment: Fixed assignment available date string to appropriately identify past or future availability 2013-02-26 17:38:55 +08:00
Eloy Lafuente (stronk7)
36650d6f51 Merge branch 'MDL-38076-master' of git://github.com/FMCorz/moodle 2013-02-26 10:14:28 +01:00
Eloy Lafuente (stronk7)
46e120c561 Merge branch 'MDL-37835-master' of git://github.com/damyon/moodle 2013-02-26 10:06:14 +01:00
Michael de Raadt
cf626656c6 MDL-34775 - Forum, RSS - Fixing RSS entries option to be disabled if RSS is not enabled 2013-02-26 14:03:00 +08:00
Damyon Wiese
115277060a MDL-37835 Assignment unit tests - Do not fail if custom plugins are installed. 2013-02-26 09:09:53 +08:00
Damyon Wiese
9c986ee01d MDL-38115 Assignment Unit tests : speedup (round 2) 2013-02-26 09:00:06 +08:00
Adrian Greeve
cffc08a63d MDL-37356 - mod_data: Database activity now uses format_float and unformat_float.
The longitude and latitude values were not using format_float and unformat_float.
Changes have been made to the manual entry of records, csv import of records, and the
display of these records.
2013-02-25 14:39:36 +08:00
Dan Poltawski
f4e34c5ffb Merge branch 'MDL-37770-master' of git://github.com/damyon/moodle 2013-02-25 14:32:01 +08:00
Dan Poltawski
e1350c61d1 Merge branch 'MDL-36832-master' of git://github.com/damyon/moodle 2013-02-25 14:19:36 +08:00
Dan Poltawski
b5457b4def MDL-37455 lang - fix trailing whitespace 2013-02-25 12:05:16 +08:00
Dan Poltawski
92adcc1cf0 Merge branch 'wip-MDL-37455-master' of git://github.com/marinaglancy/moodle 2013-02-25 11:43:48 +08:00
Tim Lock
9ecded01cc MDL-38113: Blind Marking grader email reveals submitters details 2013-02-25 11:13:25 +08:00
Dan Poltawski
1343f4c02b Merge branch 'MDL-38061-master' of git://github.com/damyon/moodle 2013-02-25 10:16:29 +08:00
Marina Glancy
c553530a8e MDL-37455 mod_folder can display content inline. Coding style corrections 2013-02-23 12:03:58 +11:00
Marina Glancy
ec62d8b4e5 MDL-37455 Performance improvement in mod_folder
We cache and store additional data in cm_info::customdata and do not
query DB every time the folder is displayed on a course page
2013-02-23 12:03:58 +11:00
Marina Glancy
38199c247b MDL-37455 Allow mod_folder to display the content inline on course page instead of on separate page 2013-02-23 12:03:58 +11:00
Rex Lorenzo
334c6d805f MDL-35175 - Lesson shows no attempts if associated with a grouping 2013-02-22 12:38:01 -08:00
Damyon Wiese
d08e6c31fb MDL-38061 Assignment - Use $CFG->showuseridentity to add extra fields to the assignment grading table/user summary. 2013-02-22 10:30:56 +08:00
Dan Poltawski
fc7d3fdc84 Merge branch 'MDL-33996-forum-advanced-timestamp' of git://github.com/mudrd8mz/moodle 2013-02-21 22:11:37 +08:00
David Mudrák
15f83171f5 MDL-33996 Remove the nopostscontaining string from the forum module
After Mark's improvements at the search results display page, the string
is not needed any more.
2013-02-21 14:50:15 +01:00
Mark Johnson
b74c9a9fec MDL-33996 Forum search. Stop displaying raw search strings to users 2013-02-21 14:48:56 +01:00
Damyon Wiese
0b352fd94e MDL-37770 Assignment submission comments do not work without javascript.
This is mostly fixed by MDL-36832 which correctly sets the $PAGE->url.

This patch hides the submit and textareas from submission comments in the grading table when
javascript is disabled and quickgrading is enabled. This particular combination results in a form
nested in a form which does not work (and cannot be fixed in a reasonable amount of time).
2013-02-21 11:55:24 +08:00
Damyon Wiese
c211409998 MDL-36832 Assignment Fix issues found by unit tests with previous patch 2013-02-21 11:22:06 +08:00
Damyon Wiese
d04557b364 MDL-36832 Assignment - Use MUC for caching the useridlist and change all pages to redirect after post.
This means that the $PAGE->url is properly set for all pages and is required to fix some edge cases with the comments api when
javascript is disabled. It also means logging in after a timeout will work nicely and other Good Things (tm).
2013-02-21 11:04:07 +08:00
Eloy Lafuente (stronk7)
3b00c13bf1 MDL-37894 Amend tests with new openclose rule. 2013-02-20 01:36:20 +01:00