Eloy Lafuente (stronk7)
2bc620b363
Merge branch 'w37_MDL-35071_m24_enrolrestore' of git://github.com/skodak/moodle
2012-09-14 01:08:49 +02:00
Tim Hunt
2c76c89422
MDL-35419 question manual grading: valdiation must handle 0,5
...
Yet another , as decimal separator issue!
To fix this nicely, I refactored some code into question_utils.
2012-09-13 16:33:15 +01:00
Simon Coggins
cf0387ff08
MDL-34644 SCORM fix completion when only completion on view is selected.
2012-09-13 14:38:36 +12:00
Damyon Wiese
49d83b9d96
MDL-35388: Change get_output to get_renderer to remove duplicated function
2012-09-13 10:06:09 +08:00
Damyon Wiese
fd637d38ac
Merge branch 'MDL-35388' of git://github.com/Lightwork-Marking/moodle into integration
...
Conflicts:
mod/assign/locallib.php
2012-09-13 10:03:40 +08:00
Paul Charsley
2cffef9f41
MDL-35388 modifications to allow php unit tests to be run
2012-09-13 13:44:05 +12:00
AMOS bot
ca53403554
Automatically generated installer lang files
2012-09-13 00:34:32 +00:00
Sam Hemelryk
36b76c1ff9
Merge branch 'master_MDL-32125_forum_subscription_change_reflected' of git://github.com/kanikagoyal/moodle
2012-09-13 11:25:47 +12:00
Sam Hemelryk
fd9a54c2e3
Merge branch 'wip-mdl-30667' of git://github.com/rajeshtaneja/moodle
2012-09-13 11:19:30 +12:00
Sam Hemelryk
4113e2951e
Merge branch 'MDL-29872_c' of git://github.com/rwijaya/moodle
2012-09-13 11:13:01 +12:00
Eloy Lafuente (stronk7)
7ec68510d9
Merge branch 'MDL-34082' of git://github.com/timhunt/moodle
2012-09-12 17:19:17 +02:00
Tim Hunt
e08eaf7da3
MDL-34082 course restrict modules: typo in MDL-19125 upgrade code.
2012-09-12 16:15:11 +01:00
Eloy Lafuente (stronk7)
7f34030583
Merge branch 'master_MDL-33755' of git://github.com/danmarsden/moodle
2012-09-12 12:17:04 +02:00
Dan Marsden
29b244545b
MDL-33755: SCORM fix spacing/coding guidelines
2012-09-12 20:19:44 +12:00
Dan Marsden
812bdaeb12
MDL-33755 SCORM: fix the way launch is triggered
...
fixes bug with the way it handles skipview set to first time.
2012-09-12 20:16:57 +12:00
Dan Marsden
410b7c9bcc
MDL-33755 SCORM: new quick function to check if a user has scorm data/tracks - better/quicker way to check as full track info isn't needed.
2012-09-12 19:53:56 +12:00
Dan Marsden
234415c4ea
MDL-33755 SCORM: use correct constants for skipview instead of magic numbers
2012-09-12 19:38:49 +12:00
Petr Škoda
2fbfdfd005
MDL-35071 fix plugins typo which was breaking roles restore for some plugins
...
Thanks Eloy for spotting this!
2012-09-12 08:56:44 +02:00
Aparup Banerjee
bf6d9e8c21
Merge branch 'MDL-35264_fix' of git://github.com/dmonllao/moodle
2012-09-12 14:47:50 +08:00
Aparup Banerjee
55fcd5678e
Merge branch 'MDL-34967' of git://github.com/mouneyrac/moodle
2012-09-12 14:26:34 +08:00
David Monllao
1fa2dfbcb6
MDL-35264 mod_chat Bigger frame for text input
2012-09-12 13:52:50 +08:00
Sam Hemelryk
37d3caac51
Merge branch 'MDL-34088' of git://github.com/raymondAntonio/moodle
2012-09-12 11:35:41 +12:00
Sam Hemelryk
4b7377847f
MDL-34568 mod_quiz: Fixed up whitespace issue
2012-09-12 11:20:35 +12:00
Sam Hemelryk
6aa130499b
Merge branch 'wip-mdl-34568' of git://github.com/rajeshtaneja/moodle
2012-09-12 11:08:56 +12:00
Sam Hemelryk
939d182d1e
Merge branch 'wip-MDL-34223-master' of git://github.com/marinaglancy/moodle
2012-09-12 10:50:57 +12:00
Sam Hemelryk
1d26f4a5de
Merge branch 'MDL-30829-master' of git://github.com/FMCorz/moodle
2012-09-12 10:28:16 +12:00
Sam Hemelryk
223285a640
Merge branch 'MDL-34692' of git://github.com/raymondAntonio/moodle
2012-09-12 10:22:54 +12:00
Rex Lorenzo
ff37d63c1b
MDL-35376 - Shortcut/alias not working for Private file repo
2012-09-11 14:23:12 -07:00
Eloy Lafuente (stronk7)
ae066a4691
Merge branch 'master_MDL-34544' of git://github.com/danmarsden/moodle
2012-09-11 21:33:06 +02:00
Rex Lorenzo
1336e2e160
MDL-35374 - Cannot delete blocks off frontpage
2012-09-11 12:27:17 -07:00
Eloy Lafuente (stronk7)
97f6be20ac
MDL-34962 whitespace fix
2012-09-11 20:09:08 +02:00
Eloy Lafuente (stronk7)
498bc10c36
MDL-34962 Tidy up tests a bit
2012-09-11 19:38:12 +02:00
Eloy Lafuente (stronk7)
6e52a71bee
Merge branch 'MDL-34962' of git://github.com/Lightwork-Marking/moodle
2012-09-11 18:53:35 +02:00
Eloy Lafuente (stronk7)
e633ea6b46
Merge branch 'MDL-34984' of git://github.com/rwijaya/moodle
2012-09-11 16:28:46 +02:00
Tim Hunt
cacb8fa08a
MDL-34841 error importing questions with long names.
...
The problem was with the non-UTF-8-safe way that a question name
was being constructed from the question text.
I have done a proper fix with methods in the base class to
carefully construct a question name that is reasonable, and
which will fit in the database column. Then I have changed all
importers to use the new methods.
I also remembered not to break the lesson in the process.
2012-09-11 15:04:00 +01:00
Aparup Banerjee
5c7cca95e7
Merge branch 'MDL-34970' of git://github.com/mouneyrac/moodle
2012-09-11 19:12:29 +08:00
Aparup Banerjee
5e7e3bc20f
Merge branch 'MDL-34972' of git://github.com/mouneyrac/moodle
2012-09-11 18:41:01 +08:00
Aparup Banerjee
96e5f78a6e
Merge branch 'MDL-34973' of git://github.com/mouneyrac/moodle
2012-09-11 17:16:20 +08:00
Aparup Banerjee
875d0e5916
MDL-31276 mod_assign Phpdocs polish
2012-09-11 16:53:56 +08:00
Aparup Banerjee
f4f1fd0b6c
Merge branch 'MDL-31276-NOCSVLIB' of git://github.com/netspotau/moodle-mod_assign
2012-09-11 16:39:30 +08:00
Damyon Wiese
7a2b911c6b
MDL-31276: Phpdocs cleanup for offline grading feature
2012-09-11 15:48:19 +08:00
Aparup Banerjee
27fec8650b
Merge branch 'wip-MDL-29463-master' of git://github.com/phalacee/moodle
2012-09-11 14:46:44 +08:00
Sam Hemelryk
f9959166ca
Merge branch 'MDL-35190' of git://github.com/mouneyrac/moodle
2012-09-11 16:46:13 +12:00
Frederic Massart
2ee34c85ac
MDL-34765 Course: Fixed missing argument in course reordering
2012-09-11 16:41:44 +12:00
Sam Hemelryk
92a763eb55
Merge branch 'MDL-34765-master' of git://github.com/FMCorz/moodle
2012-09-11 15:31:32 +12:00
Sam Hemelryk
1d856f68db
Merge branch 'MDL-30018' of https://github.com/stronk7/moodle
2012-09-11 15:22:39 +12:00
Sam Hemelryk
35cd9f1f83
Merge branch 'MDL-10259_master' of git://github.com/dmonllao/moodle
2012-09-11 15:19:16 +12:00
Sam Hemelryk
84342b4e3c
Merge branch 'MDL-30857_master' of git://github.com/dmonllao/moodle
2012-09-11 15:10:59 +12:00
Sam Hemelryk
72258d36db
Merge branch 'master_MDL-33755' of git://github.com/danmarsden/moodle
2012-09-11 15:08:11 +12:00
Aparup Banerjee
47d474b66c
Merge branch 'wip-MDL-30898-master' of git://github.com/phalacee/moodle
2012-09-11 11:05:25 +08:00