David Mudrak
c8ea2c4572
MDL-28298 workshop: do not use a constant without explicit inclusion of the library
...
Instead of including whole formslib just to get the constant defined, I
decided to hard-code the value and put the reference to the comment so
that eventual grep would spot it. Of course that is is not nice at all
but it's lesser of two evils imho.
2011-07-13 10:28:28 +02:00
Chris Follin
84b2b9aa77
MDL-27305 forum: Added missing item to forum_get_view_actions
2011-07-13 14:22:18 +08:00
Eloy Lafuente (stronk7)
e62a947eec
Merge branch 'MDL-28221-resource-conversion' of git://github.com/mudrd8mz/moodle
2011-07-12 16:57:54 +02:00
Eloy Lafuente (stronk7)
dd8f2538b6
Merge branch 'master_MDL-28017' of git://github.com/danmarsden/moodle
...
Conflicts:
mod/scorm/version.php
2011-07-12 16:28:36 +02:00
Dan Marsden
59cdcb9770
MDL-28017 - SCORM unset old config var
2011-07-12 09:46:23 +12:00
David Mudrak
47f5964381
MDL-28221 Legacy resource URL pointing to the course itself are migrated as File module
...
This patch replays the logic of resource_20_migrate() function. If a
file is referred via URL to the course files of the course being
backed up, then such a resource is converted to the File module
(mod/resource) rather than URL module.
2011-07-11 23:30:28 +02:00
David Mudrak
498c722d0f
MDL-28221 resource: improved file not found handling
...
When the referenced file is not found, do not rely on the record in
resource_old as the resource can be actually restored from a 1.9 backup.
2011-07-11 23:30:28 +02:00
David Mudrak
c6c9a3bcdb
MDL-28221 resource: fixed a typo in variable names
2011-07-11 23:30:28 +02:00
Eloy Lafuente (stronk7)
701570b5e4
Merge branch 'master_MDL-26942' of git://github.com/danmarsden/moodle
2011-07-11 19:47:14 +02:00
Eloy Lafuente (stronk7)
7660f09ee6
Merge branch 'MDL-27741' of git://github.com/rwijaya/moodle
2011-07-11 19:35:41 +02:00
Eloy Lafuente (stronk7)
3fe120a6c6
Merge branch 'MDL-26165' of git://github.com/timhunt/moodle
2011-07-11 16:32:17 +02:00
Eloy Lafuente (stronk7)
cf5b3dad05
Merge branch 'MDL-27483' of git://github.com/timhunt/moodle
2011-07-11 16:25:42 +02:00
Eloy Lafuente (stronk7)
d5497dcc86
MDL-28109 scorm - new settings => version bump
2011-07-11 15:54:11 +02:00
Eloy Lafuente (stronk7)
2abfc1c630
Merge branch 'master_MDL-28109' of git://github.com/danmarsden/moodle
2011-07-11 15:42:21 +02:00
Rossiani Wijaya
0d3780a1e8
MDL-27741 forum subscribe link: Removed 'no' string in social course format to display a subscribe link if user is not enrolled
2011-07-11 17:07:55 +08:00
Sam Hemelryk
59772e4749
Merge branch 'wip-mdl-27954' of git://github.com/rajeshtaneja/moodle
2011-07-11 16:01:26 +08:00
Dan Marsden
6eca9e1c63
MDL-28017 SCORM - remove admin setting incorrectly added as it was never used.
2011-07-11 15:42:53 +12:00
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
