1605660ad2
Merge branch 'MDL-43690_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
2014-01-20 14:24:44 +08:00
e35e70f83d
Merge branch 'MDL-42495-m26' of git://github.com/micaherne/moodle into MOODLE_26_STABLE
2014-01-20 13:21:34 +08:00
217d839ded
MDL-43690 quiz_question_tostring missing s().
...
This meant that the edit quiz page sometimes had invalid HTML.
2014-01-17 10:47:00 +00:00
ba541f01b6
Merge branch 'm26_MDL-43222' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE
2014-01-15 22:02:29 +01:00
64156342ad
MDL-43222 SCORM: Fix invalid sql
2014-01-16 09:49:36 +13:00
f5191afd30
Merge branch 'm26_MDL-43222' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE
2014-01-14 16:45:38 +01:00
30354dc0d2
Merge branch 'MDL-43178_forum_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE
2014-01-14 15:26:52 +08:00
24607ba326
Merge branch 'MDL-43371-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-14 14:05:27 +08:00
020705cca0
Merge branch 'MDL-43610-m26' of git://github.com/micaherne/moodle into MOODLE_26_STABLE
2014-01-14 12:37:17 +08:00
1e65c37e97
Merge branch 'm26_MDL-42792' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE
2014-01-14 11:28:44 +08:00
b3eacbd5da
Merge branch 'MDL-43412_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
2014-01-14 10:46:34 +08:00
8c75f05721
Merge branch 'MDL-43109_26' of https://github.com/mdikih/moodle into MOODLE_26_STABLE
2014-01-13 21:51:54 +01:00
378240d57d
MDL-43646 "disapprove" changed to "undo approval"
2014-01-10 19:55:23 +01:00
d339d41274
MDL-43590 move unapprove to undo approval
2014-01-10 18:55:17 +01:00
4b6c90cb17
MDL-46310 assign Prevent blind marking submission notification email being sent to noreplyemail address
2014-01-10 16:03:17 +00:00
02b5deb65a
Merge branch 'MDL-43590-en_fix_26' of git://github.com/mudrd8mz/moodle into MOODLE_26_STABLE
2014-01-10 10:10:27 +01:00
e71ac727e3
MDL-43222 SCORM: correct check for list of attempts and make correct check for current attempt in scorm_get_toc
2014-01-10 22:04:54 +13:00
8c5dd5e5eb
MDL-42792 SCORM: Prevent JS error when network connection fails. - return false to SCORM package so that issue can be detected and reported.
2014-01-10 21:06:39 +13:00
b4de89cc95
MDL-43178 mod_forum: fixed the digest setting confirmation message
2014-01-10 08:42:21 +08:00
d9aa7cbb6f
Merge branch 'wip-MDL-43283-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2014-01-09 23:07:52 +01:00
7e3c5c34d6
MDL-43371 mod_lesson: Remove files upon page or module deletion
2014-01-09 16:23:17 +01:00
61d35d7b9d
MDL-43283 mod_chat: corrected SQL query to follow strict groupping rules
2014-01-09 15:38:29 +08:00
8772689453
MDL-43590 Merge English strings from the en_fix language pack
2014-01-09 01:11:59 +01:00
4cbc5af3a6
MDL-43412 quiz with grade period and password did not work.
...
Once the attempt became overdue, it was impossible to get in to submit
it because of a redirect loop. This fix resovles that loop, so the
student can enter their password and get in.
2014-01-08 18:00:56 +00:00
d99f765ee6
Merge branch 'MDL-43595-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE
2014-01-08 11:34:48 +08:00
87f4750d75
MDL-43595: The dropdowns for editpdf stopped working due to a recent change.
2014-01-08 09:20:04 +08:00
5c283bb713
Merge branch 'wip-MDL-42310-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE
2014-01-08 01:52:12 +01:00
99a57908f5
Merge branch 'MDL-42607_rss_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE
2014-01-08 00:42:45 +01:00
e57bc1637c
Merge branch 'm26_MDL-43482_Lot_Of_Passed_By_Reference_Messages' of https://github.com/scara/moodle into MOODLE_26_STABLE
2014-01-07 17:20:49 +08:00
836399115b
Merge branch 'MDL-42995-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-07 11:51:18 +08:00
396b5cc75b
MDL-42995 mod_assign: Extended tests for update_calendar method
2014-01-06 10:32:06 +01:00
49a9cc9bd1
MDL-42995 mod_assign: Remove files from calendar event description
2014-01-06 10:32:00 +01:00
0f399f7f74
Merge branch 'MDL-43454-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-06 15:52:17 +08:00
0cb1903bfd
Merge branch 'MDL-35973_redirect_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE
2014-01-06 11:28:25 +13:00
ec9f2a7d3f
Merge branch 'MDL-42212-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-06 10:30:13 +13:00
44b74479cb
MDL-35973 lib: added a page title to redirect() and added 2 seconds to the page redirection when posting in a forum
2014-01-05 20:08:05 +08:00
025000a221
MDL-42310 feedback mod - Enable filtering of multichoice and multichoice rated controls
...
Conflicts:
mod/feedback/item/multichoice/lib.php
mod/feedback/item/multichoicerated/lib.php
Signed-off-by: Michael Milette <michael.milette@instruxmedia.com >
2014-01-03 10:30:11 +08:00
a90069245d
MDL-42607 mod_forum:fixed some inefficiencies in forum RSS generation
2014-01-02 10:50:54 +08:00
f29b93ad61
MDL-43482 Chat Lot of "Only variables should be passed by reference".
2013-12-24 11:06:22 +01:00
83797afa91
Merge branch 'MDL-43438-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2013-12-24 11:23:06 +13:00
d3220e229e
Merge branch 'MDL-43250-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE
2013-12-24 10:44:04 +13:00
1c5052e29f
Merge branch 'MDL-35032-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2013-12-23 15:57:49 +13:00
a4c14b94ca
Merge branch 'MDL-43318-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE
2013-12-23 00:39:48 +01:00
206b1f6d6d
MDL-43318 Assign: Fix bug when editing previous attempt feedback
2013-12-20 11:15:00 +08:00
83e305fa8c
MDL-43404 behat: Avoid failures at framework level as much as possible
...
- Move them to i_look_for_exceptions() so they will be
thrown at a step (scenario) level.
- Accept alerts only when they are detected to avoid
all the following scenarios to be failing; they would
continue executing, but they will all fail if the alert
is still there
- Add a step to avoid add_scorm.feature to fail
- Refine the UnknownError catch
2013-12-19 16:03:40 +08:00
50809576b5
MDL-43454 mod_assignment: Use of undefined constants FILE_*
2013-12-19 07:22:06 +01:00
15d16015b7
MDL-43438 mod_assignment: Prevent double inclusion of plugin files
2013-12-18 09:18:07 +01:00
04b53e0e0c
Merge branch 'MDL-43025-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE
2013-12-17 22:59:14 +01:00
f01cac675a
Merge branch 'MDL-43074-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE
2013-12-18 09:58:51 +13:00
6e39ee0c82
Merge branch 'wip-MDL-43295-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE
2013-12-17 16:36:00 +11:00
Dan Poltawski