f4b9cea5fc
Merge branch 'MDL-38352-en_fix_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE
2013-03-06 17:28:19 +01:00
3658d00c2b
MDL-38352 Merge English strings from the en_fix language pack
2013-03-06 16:55:00 +01:00
57b0cfaaf1
Merge branch 'wip-MDL-34775-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE
2013-03-05 17:03:44 +08:00
fa1a43c43e
Merge branch 'MDL-38282_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
2013-03-05 16:14:26 +08:00
a05b00c686
Merge branch 'MDL-30481_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE
2013-03-05 12:56:14 +08:00
083b0a54aa
Merge branch 'MDL-37522-published-attachment_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE
2013-03-04 20:47:02 +01:00
892ee7ee56
Merge branch 'MDL-35350_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE
2013-03-04 16:12:54 +13:00
fb2ac5029c
Merge branch 'MDL-35127-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
2013-03-04 16:07:59 +13:00
97f7bfc457
MDL-39282 quiz: always allow removal of bogus questions.
2013-03-01 17:34:17 +00:00
c24b75e257
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:51:44 +01:00
445146552a
MDL-32125 mod_forum: Updating subscription mode not reflecting subscribers
2013-02-28 11:59:26 -05:00
79e21e7d75
MDL-34775 - Forum, RSS - Fixing RSS entries option to be disabled if RSS is not enabled
2013-02-28 15:50:28 +08:00
d5c6c474c2
MDL-35350 Advanced uploading assignment: add submission timestamp on assignment index page
2013-02-28 14:04:50 +08:00
73646066a4
MDL-35127 Assignment - declare the variables in the outer scope (for readability)
2013-02-27 09:59:03 +08:00
507507352b
Merge branch 'MDL-35127_m24' of git://github.com/merrill-oakland/moodle into MDL-35127-24
2013-02-27 09:58:24 +08:00
37cb15e634
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-26 09:48:46 -05:00
e6e074cc70
MDL-30481 Advanced upload assignment: Fixed assignment available date string to appropriately identify past or future availability
2013-02-26 17:41:04 +08:00
f881b74bd8
Merge branch 'MDL-38076-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
2013-02-26 10:14:51 +01:00
a5c4a76848
MDL-37835 Assignment unit tests fail when custom submission types are installed.
...
The assignment generator will now take all submission/feedback modules into concideration when creating new assignments.
2013-02-26 10:09:16 +01:00
c9c205e450
MDL-38113: Blind Marking grader email reveals submitters details
2013-02-25 11:14:17 +08:00
45551ed4df
Merge branch 'MDL-38061-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
2013-02-25 10:20:55 +08:00
a083389c63
Merge branch 'MDL-35175_24' of git://github.com/rlorenzo/moodle into MOODLE_24_STABLE
2013-02-25 09:52:19 +08:00
351cd1416f
MDL-38061 Assignment - Use $CFG->showuseridentity to add extra fields to the assignment grading table/user summary.
...
Conflicts:
mod/assign/gradingtable.php
mod/assign/locallib.php
mod/assign/renderable.php
mod/assign/renderer.php
2013-02-22 10:32:08 +08:00
d863b93f5c
MDL-37894 Amend tests with new openclose rule.
2013-02-20 01:37:08 +01:00
5ddaf0a8ff
Merge branch 'MDL-37894_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
2013-02-20 00:40:21 +01:00
8e628ee242
MDL-32620 whitespace + comment fixes.
2013-02-19 13:23:10 +01:00
2fc00b3a5d
MDL-32620: Fixing up white space in comment
2013-02-19 13:23:01 +01:00
53a993e103
Fixing an issue with not sending the launch_presentation_return_url
2013-02-19 13:22:55 +01:00
bf0c578f16
Merge branch 'm24_MDL-37449_Reports_ORA-00918_column_ambiguously_defined' of https://github.com/scara/moodle into MOODLE_24_STABLE
2013-02-19 13:41:55 +08:00
fd8c97d264
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:28:45 +00:00
5bcea4d315
MDL-38076 usability: Fix wrong position of new 2.4 icons
2013-02-18 09:41:31 +08:00
9b6485865c
MDL-37449 Incorrect doubled 'u.email' field in the SQL query (Oracle error: ORA-00918)
2013-02-15 21:19:14 +01:00
03fd922158
MDL-38040 Clean core from CRLFs
2013-02-15 02:20:28 +01:00
47d8bb6e25
MDL-37883 Assignment Grade import/export. Additional fix to prevent different grade rounding on export.
2013-02-13 15:35:39 +08:00
b20c4d58db
MDL-35175 - Lesson shows no attempts if associated with a grouping
2013-02-12 15:27:50 -08:00
db41eeb8bd
Merge branch 'wip-mdl-37633-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE
2013-02-12 15:49:55 +08:00
353fac6f48
MDL-37633 Forum: Allow fronpage user to have forum:allowforcesubscribe capability by default
...
Conflicts:
mod/forum/version.php
2013-02-12 15:01:05 +08:00
25da216389
Merge branch 'MDL-37883-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
2013-02-12 13:47:44 +08:00
519375f9fe
Merge branch 'MDL-37074-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
2013-02-12 13:39:34 +08:00
ccc32eba06
Merge branch 'MDL-37924_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
2013-02-12 13:36:04 +08:00
af5d66f999
Merge branch 'MDL-37039-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
2013-02-11 14:33:27 +08:00
e2d9006792
MDL-37924 quiz settings: change wrong 'fix' => 'adv'.
2013-02-08 12:50:17 +00:00
dc85a9e833
MDL-37774 Do not pass trailing slash if the method does not want it
2013-02-08 12:53:23 +01:00
b9dc4c3cbe
MDL-37039 Assignment - Do not apply filters to grading table for offline assignments
...
Because the filters do not make sense for offline assignments, they are hidden. But if the active filter
prevents you from seeing any assignments you cannot change it. This change makes it so the filters are
also not applied when the assignment is an offline assignment.
2013-02-08 15:48:08 +08:00
1d16b7f80c
MDL-37074 Assign theming: Use addClass/removeClass instead of setAttribute to preserve existing classes
2013-02-08 15:18:53 +08:00
99aa14d1ff
MDL-37883 Assign offline marking: Properly handle french decimal grades when importing worksheet.
2013-02-06 15:45:43 +08:00
cd1792a902
MDL-30144 Assignmnet 2.2: fixed context retrival
2013-02-06 13:22:17 +08:00
44a29a501a
Merge branch 'MDL-37800_24' of git://github.com/grabs/moodle into MOODLE_24_STABLE
2013-02-05 12:43:15 +08:00
747e16f7b0
MDL-37801 mod_glossary - encode / decode links to 'showentry' pages during backup & restore
2013-02-05 01:03:14 +01:00
bd11fca3aa
Merge branch 'm24_MDL-33078' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE
2013-02-04 23:59:14 +01:00
Eloy Lafuente (stronk7)