Sam Hemelryk
7a5c6b98e1
Merge branch 'master_MDL-27947' of git://github.com/danmarsden/moodle
2011-07-11 11:31:13 +08:00
Sam Hemelryk
f7776c0fc8
Merge branch 'glossary_multilang_master' of git://github.com/stronk7/moodle
2011-07-11 11:14:44 +08:00
Rajesh Taneja
ea2052ab8e
MDL-27954 mod_database - fixed search navigation link
2011-07-11 10:09:44 +08:00
Eloy Lafuente (stronk7)
b86f930647
MDL-28048 glossary - fix double ampersand & missing string
2011-07-11 01:36:30 +02:00
Eloy Lafuente (stronk7)
bce3e3dca5
MDL-28048 glossary - add multilang support to categories
2011-07-11 01:02:06 +02:00
Dan Marsden
3c0b04c440
MDL-28109 - allow admin to decide which scorm settings are advanced, tidy up order of settings
2011-07-11 10:18:16 +12:00
Dan Marsden
0ffaa76be3
MDL-28109 - allow adming to decide which scorm settings are advanced, tidy up order of settings
2011-07-10 11:10:56 +12:00
Eloy Lafuente (stronk7)
aef91ddfa7
MDL-27018 restore - decode links missing url->externalurl support
2011-07-09 13:33:50 +02:00
Dan Marsden
c5803aaa7f
MDL-27947 - fix TOC display on skipview - use correct org in TOC title
2011-07-09 11:40:32 +12:00
Dan Marsden
8a4561accc
SCORM MDL-26942 - get first scoid if not set
2011-07-09 11:06:36 +12:00
Dan Marsden
8cb7096bc5
SCORM MDL-26942 - fix ending of lists.
2011-07-09 11:06:35 +12:00
Dan Marsden
b6c88d755b
SCORM MDL-26942 - initial fix for list in toc
2011-07-09 11:06:35 +12:00
Dan Marsden
0797000aa9
SCORM MDL-26942 - move scorm_get_toc to locallib.php
2011-07-09 11:06:35 +12:00
Dan Marsden
27a9658f97
SCORM MDL-26942 remove empty file and add todo
2011-07-09 11:06:35 +12:00
Dan Marsden
db0a77cc1a
SCORM MDL-26942 merge scorm_get_toc to decrease duplicated code and simplify toc display
2011-07-09 11:05:54 +12:00
Eloy Lafuente (stronk7)
7e1fa4f019
fix permissions
2011-07-08 11:13:19 +02:00
Eloy Lafuente (stronk7)
1f767468ac
Merge branch 'MDL-28015-workshop-sql' of git://github.com/mudrd8mz/moodle
2011-07-08 01:11:13 +02:00
David Mudrak
20e7fd839a
MDL-28015 workshop - fixed unique list of columns in ORDER BY clause
...
MSSQL requires that the columns in the ORDER BY clause list must be
unique. The patch populates the list of fields by combining an array of
explicit sort definition with an array of implicit (default) sort
definition.
2011-07-07 15:17:27 +02:00
Tim Hunt
7bf53cf233
MDL-27483 make quiz repagination more robust.
2011-07-07 12:38:06 +01:00
Eloy Lafuente (stronk7)
26635fd7f9
Merge branch 'MDL-28169' of git://github.com/nebgor/moodle
2011-07-07 10:21:32 +02:00
Aparup Banerjee
c5a8abfedd
MDL-28169 Installation Added 2.1 upgrade (idiot proof) lines to upgrade scripts.
2011-07-07 11:40:38 +08:00
Eloy Lafuente (stronk7)
907cc4ceb7
Merge branch 'master_MDL-28110' of git://github.com/danmarsden/moodle
2011-07-07 03:00:42 +02:00
Eloy Lafuente (stronk7)
627e4bd4a7
Merge branch 'master_MDL-28111' of git://github.com/danmarsden/moodle
2011-07-07 02:36:28 +02:00
Eloy Lafuente (stronk7)
535a635afc
Merge branch 'w26_MDL-28117_m22_dataurlhack' of git://github.com/skodak/moodle
2011-07-07 01:32:30 +02:00
Eloy Lafuente (stronk7)
4357214a49
Merge branch 'MDL-28100' of git://git.luns.net.uk/moodle
2011-07-07 00:12:19 +02:00
Eloy Lafuente (stronk7)
83ca5bef34
Merge branch 'MDL-28222' of git://github.com/timhunt/moodle
2011-07-06 20:27:52 +02:00
Tim Hunt
82c07ea4f4
MDL-28222 quiz reports missing context in call to quiz_report_feedback_for_grade.
2011-07-06 19:08:52 +01:00
Eloy Lafuente (stronk7)
cb600c4606
Merge branch 'MDL-28166' of git://github.com/timhunt/moodle
2011-07-06 19:03:59 +02:00
Tim Hunt
6c7da46108
MDL-26165 quiz submit are-you-sure is potentially confusing.
2011-07-06 14:49:38 +01:00
Tim Hunt
81522abd63
MDL-28166 fix some more instances of my favourite becuase typo.
2011-07-06 14:19:25 +01:00
Tim Hunt
cbb8b55c33
MDL-28166 send quiz event notifications asynchronously.
...
This avoids the problem that you cannot send messages in transactions.
It also means that the quiz submission will not be prevented, and the
message will still be sent eventually, if any part of the messaging
system is giving intermittent errors when the student wants to submit
their quiz.
2011-07-06 14:16:30 +01:00
Sam Hemelryk
8f49f9ce8e
Merge branch 'MDL-27934' of git://git.luns.net.uk/moodle
2011-07-06 13:24:47 +08:00
Sam Hemelryk
5b966cbb3b
Merge branch 'MDL-28135' of git://github.com/nebgor/moodle
2011-07-06 10:53:48 +08:00
Eloy Lafuente (stronk7)
34d5507ab8
Merge branch 'wip-MDL-28172-master' of git://github.com/samhemelryk/moodle
2011-07-06 01:52:32 +02:00
Eloy Lafuente (stronk7)
9a160c7c46
MDL-28196 quiz calls get_in_or_equal (fixing missing $DB)
2011-07-05 22:02:30 +02:00
Tim Hunt
b149b78859
MDL-28196 quiz calls get_in_or_equal (not DB->get_in_or_equal) in two places
...
Also, another minor error in one method call.
2011-07-05 14:29:30 +01:00
Rossiani Wijaya
54c37fbd88
MDL-27555 assignment module: remove 'submitted' option from optional setting for offline assignment type.
2011-07-05 15:33:33 +08:00
Aparup Banerjee
728ebac7f2
MDL-28135 general Updating all hardcoded "docs.moodle.org/en/Development:" type doc links to "docs.moodle.org/dev/"
2011-07-05 14:27:31 +08:00
Petr Skoda
3f8465ca4b
MDL-28117 include repo lib when hacking file_picker renderer
2011-07-04 17:09:28 +02:00
Sam Hemelryk
b8d3c3f76e
MDL-28172 forum: Fixed up overzealous check for portfolio enabled.
2011-07-04 15:04:16 +08:00
Dan Marsden
d9306a9c1f
SCORM MDL-28110 fix string name
2011-07-03 12:51:56 +12:00
Dan Marsden
0ab985f918
SCORM MDL-28110 set default for forcejavascript to yes - add string explaining what it does.
2011-07-03 12:51:56 +12:00
Dan Marsden
ca4eda13b5
SCORM MDL-28111 tidy up formatting of code
2011-07-03 12:49:29 +12:00
Dan Marsden
f7b5c6aae6
SCORM MDL-28111 tidy up formatting of code
2011-07-03 12:49:29 +12:00
Dan Poltawski
2207a21bfe
MDL-28100 - page resource was not using context for text filtering
2011-07-02 13:34:05 +01:00
Sun Zhigang
0e30d4c7c7
MDL-27934 Upload Assignment - Remove useless code
2011-07-02 09:52:28 +01:00
Eloy Lafuente (stronk7)
0e2901443c
Merge branch 'MDL-28103' of git://github.com/timhunt/moodle
2011-07-01 22:17:16 +02:00
Tim Hunt
e7933796a8
MDL-28103 make the upgrade more robust in the presence of old garbage data in the DB.
2011-07-01 20:54:42 +01:00
Eloy Lafuente (stronk7)
715a5bb732
MDL-27829 blocks - lang string fixes. Credit goes to Helen!
2011-07-01 20:38:06 +02:00
Tim Hunt
4a6ac0ceb1
MDL-28103 fix silly error in quiz_upgrade_very_old_question_sessions.
2011-07-01 17:13:45 +01:00
