594276893e
Merge branch 'MDL-39103-master' of git://github.com/xow/moodle
...
Conflicts:
mod/lesson/lib.php
2015-01-15 08:33:27 +00:00
584e582bfc
Merge branch 'MDL-45784-master' of git://github.com/xow/moodle
2015-01-15 08:32:45 +00:00
db387f25de
Merge branch 'MDL-47931' of git://github.com/jmvedrine/moodle
2015-01-15 08:32:44 +00:00
d55a433d6c
Merge branch 'MDL-48750_m29' of https://github.com/sbourget/moodle
2015-01-15 08:32:43 +00:00
8c9390c5eb
Merge branch 'MDL-40326' of git://github.com/jmvedrine/moodle
2015-01-15 08:32:42 +00:00
261b858985
Merge branch 'MDL-14730' of git://github.com/jmvedrine/moodle
2015-01-15 08:32:42 +00:00
26a1fbbd15
Merge branch 'MDL-43898-master' of git://github.com/danpoltawski/moodle
2015-01-15 08:32:38 +00:00
6aa08f9442
Merge branch 'MDL-31774' of git://github.com/jmvedrine/moodle
2015-01-15 08:32:35 +00:00
002da93948
MDL-48813 Lesson: Removed unused GROUPMEMBERSONLY
2015-01-12 10:49:41 -05:00
99334f6a56
Merge branch 'MDL-38142-master' of git://github.com/FMCorz/moodle
2015-01-12 11:55:34 +08:00
db5a9ca117
Merge branch 'MDL-47692_master' of git://github.com/markn86/moodle
2015-01-12 10:05:39 +08:00
b351e4460a
MDL-48418 mod/assign: Fix text in 'late submission' row
2015-01-12 09:00:44 +10:30
8eef88589a
MDL-48750 Lesson: Behat test for lesson attempt info
...
behat test provided by Jean-Michel Vedrine
2015-01-10 17:13:17 -05:00
91d9008108
MDL-40326 mod_lesson: progress bar is not reset by course reset
2015-01-10 18:54:54 +01:00
a30e935aa7
MDL-31774 mod_lesson: Wrong jumps in lessons with mutiple clusters
2015-01-10 18:30:06 +01:00
ca3327133b
MDL-36824 Lesson: Media File should be displayed as a block
2015-01-09 18:15:27 -05:00
73f419ea43
MDL-48574 assign: Test workflow_state_updated fired on batch and single.
2015-01-09 15:18:05 +00:00
c1500a8270
MDL-48750 Lesson: Fix attempt info displayed by course overview block
2015-01-09 09:10:11 -05:00
5ca2e765fa
MDL-14730 mod_lesson: allow linking to pages inside a lesson
2015-01-09 11:33:35 +01:00
6b5d34b18d
MDL-38142 mod_forum: Allow viewing of student posts in hidden courses
2015-01-09 11:34:24 +08:00
0fe6a900ac
MDL-47931 mod_lesson: remove the useless grade_item_delete function
2015-01-08 21:28:28 +01:00
2d586d1d85
MDL-48675 mod_lesson: behat tests for pages edition
2015-01-08 20:59:59 +01:00
a748983aa2
MDL-48675 mod_lesson: Error displayed while editing content page jumps
...
This change also fix MDL-32343 and MDL-31778 related to problems
when editing cluster pages.
2015-01-08 20:58:15 +01:00
43fd794963
MDL-45784 lesson: Remove preview link for students viewing lesson
...
Credit to Pete Jones for the fix.
2015-01-08 13:26:53 +08:00
ae3663a082
Merge branch 'MDL-48748-master-enfix' of git://github.com/mudrd8mz/moodle
2015-01-07 17:15:52 +01:00
5bd9cdec1d
MDL-48574 assign: Fire workflow_state_updated event on batch and single.
...
This change adds the workflow_state_updated event when changing workflow
state using the single grading page and the quick grading mechanisms.
Previously, it only fired for batch updates using
process_set_batch_marking_workflow_state().
2015-01-07 13:57:03 +00:00
3f94c97a99
MDL-46498 mod_assign: fixed failing behat test due to GS
2015-01-06 20:48:35 -08:00
9a99c21caf
Merge branch 'master_MDL-48428' of https://github.com/greg-or/moodle-mod_assign
2015-01-07 10:23:57 +08:00
b301753ba9
Merge branch 'MDL-48549_master' of git://github.com/markn86/moodle
2015-01-07 09:37:35 +08:00
b7853012b8
MDL-48748 lang: Merge English strings from the en_fix language pack
2015-01-06 21:53:17 +01:00
b9c86823c7
MDL-48034 mod_lesson: grade capability missing RISK_XSS
2015-01-06 12:50:40 +00:00
9157b842c4
Merge branch 'MDL-46015' of git://github.com/jmvedrine/moodle
2015-01-06 11:57:58 +00:00
ada0fc253c
Merge branch 'MDL-47070' of git://github.com/jmvedrine/moodle
2015-01-06 11:26:41 +00:00
fba50fc273
Merge branch 'MDL-48372-master' of git://github.com/ankitagarwal/moodle
2015-01-06 11:22:45 +00:00
ccd8992b29
Merge branch 'MDL-48534_master' of https://github.com/markn86/moodle
2015-01-06 11:11:42 +00:00
02ff22e925
MDL-39103 lesson: Fix lesson administration block
...
Credit to Joseph Rézeau for the fix
2015-01-06 14:51:53 +08:00
0953e38792
Merge branch 'MDL-38222' of git://github.com/jmvedrine/moodle
2015-01-06 12:27:04 +08:00
a7a50c2cee
Merge branch 'MDL-48704-master' of git://github.com/ankitagarwal/moodle
2015-01-06 11:58:29 +08:00
19e819bad4
Merge branch 'MDL-48707' of git://github.com/jmvedrine/moodle
2015-01-06 11:49:57 +08:00
fefd49f70e
MDL-20304 lesson: Uncomment tests following MDL-48631
2015-01-06 10:37:17 +08:00
fc8925206e
Merge branch 'MDL-20304-master' of git://github.com/danpoltawski/moodle
2015-01-06 10:37:10 +08:00
e653b9a469
Merge branch 'MDL-48631' of git://github.com/jmvedrine/moodle
2015-01-06 09:08:14 +08:00
4aef356fd2
Merge branch 'MDL-46498_master' of https://github.com/markn86/moodle
2015-01-05 17:47:52 +00:00
f06fc2b5c4
MDL-48104 mod_assign: Strip out use of eval() for string parsing
...
I've also replaced other occurrences of M.str with the correct use of
M.util.get_string() instead.
2015-01-05 17:20:41 +00:00
c84888c1cc
MDL-48106 mod_glossary: Add missing sesskey checks
2015-01-05 13:37:54 +00:00
da4c33f510
MDL-47920 mod_lti: add capability checks, http headers
2015-01-05 12:48:09 +00:00
7f8b554644
MDL-47692 mod_quiz: added additional question_manually_graded trigger
2015-01-04 21:04:03 -08:00
c21c92f11f
MDL-48372 mod_data: Add http to urls without it during import
2015-01-02 10:37:32 +05:30
b5914b61da
MDL-47070 mod_lesson: useless db query that should be deleted
2015-01-01 22:07:59 +01:00
ed9b45ecf1
MDL-43898 lesson: Fix for positioning of blocks on continue.php
2014-12-31 09:09:05 +00:00
Dan Poltawski