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
Eloy Lafuente (stronk7)
b70a3b7106
Merge branch 'MDL-38093' of git://github.com/timhunt/moodle
2013-02-20 00:44:54 +01:00
Eloy Lafuente (stronk7)
f1b011d3a8
Merge branch 'MDL-37894' of git://github.com/timhunt/moodle
2013-02-20 00:39:44 +01:00
Eloy Lafuente (stronk7)
6d6bd5f114
MDL-32620 whitespace + comment fixes.
2013-02-19 13:21:18 +01:00
Eloy Lafuente (stronk7)
1ead0c63e9
Merge branch 'MDL-32620' of git://github.com/scriby/moodle
2013-02-19 13:13:43 +01:00
Dan Poltawski
61df003d53
Merge branch 'master_MDL-37660' of git://github.com/danmarsden/moodle
2013-02-19 15:04:56 +08:00
Dan Poltawski
fd507a8715
Merge branch 'm25_MDL-37449_Reports_ORA-00918_column_ambiguously_defined' of https://github.com/scara/moodle
2013-02-19 13:41:45 +08:00
Dan Poltawski
3770eadb82
Merge branch 'MDL-38047-master' of git://github.com/damyon/moodle
2013-02-19 13:31:11 +08:00
Damyon Wiese
b27fc5b64f
Merge branch 'wip-MDL-33774-master' of git://github.com/marinaglancy/moodle
2013-02-19 12:36:40 +08:00
Tim Hunt
e58b2c326b
MDL-38093 quiz settings: make overall feeback editors collapsible.
2013-02-18 18:13:51 +00:00
Tim Hunt
6e78a7bdb4
MDL-37894 Show the quiz close date even if the quiz is not open yet.
...
People care a lot about deadlines!
2013-02-18 10:27:37 +00:00
Dan Poltawski
9c70147d54
Merge branch 'MDL-31983-master' of git://github.com/FMCorz/moodle
2013-02-18 15:54:22 +08:00
Frederic Massart
2d10823a7c
MDL-38076 usability: Fix wrong position of new 2.4 icons
2013-02-18 09:40:49 +08:00
Dan Marsden
61fbdb0eec
MDL-37660 SCORM: move time related settings into general section and improve lang
2013-02-15 23:48:32 +13:00
Frederic Massart
ebd9ae6523
MDL-31983 navigation: Move reports from Navigation to Settings
2013-02-15 13:06:26 +08:00
Damyon Wiese
a5c793c38c
MDL-38047 Assignment unit tests - Shave 1 minute from the unit tests for mod_assign.
2013-02-15 12:36:21 +08:00
Damyon Wiese
b0da618b61
MDL-37337 Assignment: Restructure assignment settings screen to make it "wieldy"
2013-02-15 11:26:21 +08:00
Eloy Lafuente (stronk7)
9e7e1b1c9e
MDL-38040 Clean core from CRLFs
2013-02-15 02:13:32 +01:00
Matteo Scaramuccia
f1e316870d
MDL-37449 Incorrect doubled 'u.email' field in the SQL query (Oracle error: ORA-00918)
2013-02-14 21:38:05 +01:00
Marina Glancy
3008f86c3f
MDL-33774 mod_label stores the content where it is supposed to
...
removed hardcoded checking for 'label' module type
changed label update script
2013-02-14 19:46:19 +11:00
Damyon Wiese
f22bc6d963
Fix permissions
2013-02-14 13:43:58 +08:00
Mark Nielsen
e5ed5e6ab7
MDL-32620: Fixing up white space in comment
2013-02-13 09:21:03 -08:00
Damyon Wiese
7688a3191c
MDL-37883 Assignment Grade import/export. Additional fix to prevent different grade rounding on export.
2013-02-13 15:33:10 +08:00
Eloy Lafuente (stronk7)
fe4a6d3c38
Merge branch 'MDL-37953_master' of https://github.com/markn86/moodle
2013-02-12 10:12:01 +01:00
Dan Poltawski
6af8e417c3
Merge branch 'wip-mdl-37633' of git://github.com/rajeshtaneja/moodle
...
Conflicts:
mod/forum/db/upgrade.php
mod/forum/version.php
2013-02-12 15:48:33 +08:00
Rajesh Taneja
afd5e85ca8
MDL-37633 Forum: Allow fronpage user to have forum:allowforcesubscribe capability by default
2013-02-12 14:57:47 +08:00
Dan Poltawski
26f94655d5
Merge branch 'MDL-37883-master' of git://github.com/damyon/moodle
2013-02-12 13:47:37 +08:00
Dan Poltawski
4dea0a7719
Merge branch 'MDL-37074-master' of git://github.com/damyon/moodle
2013-02-12 13:39:07 +08:00
Tim Hunt
b4be77c570
MDL-37924 quiz settings: change wrong 'fix' => 'adv'.
2013-02-12 13:36:54 +08:00
Jerome Mouneyrac
909f27acf4
MDL-37410 External PHPunit test: used ->getDataGenerator()->enrol_user instead to manually enrol the user. + improve the unassignUserCapability to remove a capability assigned by getDataGenerator->enrol_users
2013-02-12 11:15:15 +08:00
Mark Nelson
8076010d37
MDL-37953 mod_forum: using named parameters to build SQL statement
2013-02-12 10:31:10 +08:00
Damyon Wiese
234fdc206c
Merge branch 'MDL-5875-master' of git://github.com/FMCorz/moodle
...
Conflicts:
version.php
2013-02-12 10:09:26 +08:00
Matt Oquist
da48404391
MDL-37953 mod_forum: replace hard-coded numbers with defined values
...
mod/forum/lib.php sets forum_posts.mailed to 0, 1, and 2. What do these numbers
mean? This patch creates defined values for these otherwise-mysterious
numbers.
2013-02-11 15:20:18 +08:00
Dan Poltawski
354348865c
Merge branch 'MDL-34137_label_dndupload' of git://github.com/davosmith/moodle
2013-02-11 14:55:13 +08:00
Dan Poltawski
9d7d0c4f2b
Merge branch 'MDL-37039-master' of git://github.com/damyon/moodle
2013-02-11 14:32:53 +08:00