271bfb48b8
Merge branch 'MDL-36263-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-13 17:43:21 +08:00
6a1bcbfdab
MDL-36263 Assignment: Fix backport for counting submissions of unenrolled students
2012-12-13 17:41:17 +08:00
137d63fe96
Merge branch 'MDL-36897_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-12-13 09:55:07 +08:00
d8a7ef0e42
MDL-36897 quiz review: fixup previous commit.
2012-12-12 08:13:43 +00:00
18a0b829a4
MDL-36644 Assignment: prepend the course upload limit to the options array
...
Ensure that the course upload limit is the first option in the list of available choices for the Maximum submission size select.
2012-12-12 08:57:21 +08:00
8869233e26
Merge branch 'm23_MDL-35737' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
2012-12-12 08:44:13 +08:00
ecdee4a925
Merge branch 'MDL-30700-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-11 19:58:19 +01:00
7350e439bf
Merge branch 'MDL-36243_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
2012-12-11 16:24:34 +08:00
0887f75587
MDL-30700 Assignment 2.2: Added text_sorting function to tablelib
...
Allows oracle to sort by text (clob) columns (should be used sparingly).
2012-12-11 15:41:56 +08:00
f2190bac6c
Merge branch 'MDL-36712-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-11 14:01:14 +08:00
1ff0a314c9
Merge branch 'MDL-36591-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-11 13:57:11 +08:00
556f228a9e
Merge branch 'MDL-36897_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-12-11 13:54:23 +08:00
f95ba651fc
Merge branch 'MDL-36828_23' of https://github.com/aolley/moodle into MOODLE_23_STABLE
2012-12-11 11:44:40 +08:00
237ea8768c
Merge branch 'MDL-36905_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
2012-12-11 15:44:32 +13:00
b2fa6cfa93
Merge branch 'MDL-34052-23' of https://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-11 10:39:42 +08:00
f6ca5cf303
MDL-29442 add missing utf-8 to entity html encoding and decoding
2012-12-11 10:23:12 +13:00
3c805e592c
Merge branch 'MDL-36263-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-11 10:10:07 +13:00
667dfa5e7c
Merge branch 'MDL-36805-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE
2012-12-11 09:14:59 +13:00
8fdecaa51a
MDL-36805 Correct docs for workshop_grade_item_update in mod_workshop
...
The documentation suggested that the modname field should be present on the
$workshop parameter when this is not required. It is not used in any point
in the function and the $workshop variable is never passed to another
function which may use it.
2012-12-10 12:27:30 +00:00
ae4e512f66
Merge branch 'MDL-36167-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-10 17:32:30 +08:00
870d2fff8e
Merge branch 'MDL-36549_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
2012-12-10 14:19:10 +08:00
66586db224
Merge branch 'MDL-36835-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-10 14:02:24 +08:00
ccca91bd9e
MDL-36579: Adding missing fields in mod/lti backup
2012-12-10 14:16:36 +13:00
0d76053893
Merge branch 'MDL-36887-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
2012-12-10 11:47:44 +13:00
45fd888c52
Merge branch 'wip-MDL-35221-MOODLE_23_STABLE' of git://github.com/kwiliarty/moodle into MOODLE_23_STABLE
2012-12-10 10:41:20 +13:00
f384987ead
Merge branch 'wip-MDL-36906-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE
2012-12-10 10:33:33 +13:00
4dd8a25f5d
Merge branch 'wip-MDL-36915-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE
2012-12-10 10:27:07 +13:00
f62c457ece
MDL-36243 question->questiontext and question->generalfeedback should always be strings
2012-12-08 20:47:32 +01:00
50c88ad26c
MDL-36897 quiz: redirect teachers from summary to review page.
...
There is already logic like this at the top of attempt.php. If the
teacher arrives at one of these pages for a student's attempt, for
example by clicking a link in the logs, then they should be redirected
to the review page to see the students attempt in its current state.
2012-11-30 15:53:12 +00:00
40c1230f1f
MDL-36263 Assignment: Do not count submissions of unenrolled users
2012-11-30 15:36:11 +08:00
46c678ab33
MDL-36908 Assignment: Additional fixes for preventing empty submissions
...
Conflicts:
mod/assign/assignmentplugin.php
mod/assign/locallib.php
mod/assign/renderer.php
2012-11-30 12:46:25 +08:00
dceeeb29e0
MDL-36887 quiz: reorder upgrade.txt's
2012-11-30 11:44:33 +08:00
691cd371f0
MDL-36915 - mod/data: A database with no entries no longer displays the export to portfolio button.
2012-11-30 10:09:48 +08:00
4f6e4a5b75
MDL-36835 Assignment: Do not show javascript warning when toggling quickgrading
2012-11-30 10:05:40 +08:00
d3da4d8c1a
MDL-35221 mod_feedback: replace checkbox with advcheckbox for all requirable feedback question types
2012-11-29 12:30:20 -05:00
16d31e2376
MDL-36914: Assignment upgrade. Clean up patch to include outcomes in the upgrade
...
Thanks to Nathan Mares for reporting this issue.
2012-11-29 16:11:04 +08:00
fb9c26d092
MDL-36914: Re-associate all grade_item records when upgrading assignments to prevent data loss
2012-11-29 16:11:03 +08:00
e8dd799570
MDL-36905 accessibility for assignment grading: add label for grading actions and operations select options
2012-11-29 15:11:34 +08:00
85094b8fa4
MDL-36906 - mod_data: Latitude and Logitude error fix.
...
Thanks to Marcus Boon for providing a patch for this issue.
mod/data/field/latlong/kml.php was missing a context variable.
This was causing an error when trying to download a kml file for
google earth. This variable has now been included.
2012-11-29 14:50:16 +08:00
1c951c4649
MDL-36858 SCORM: improve lang help for attempts grading to warn about failed status.
2012-11-29 12:53:51 +08:00
a38a5cefb3
Merge branch 'MDL-35966-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-11-28 14:15:41 +08:00
8abd89f17e
MDL-36591 Assignment - rewrite image urls in online text summaries
2012-11-28 10:19:47 +08:00
0b7a458885
Merge branch 'MDL-36336_MOODLE_23_STABLE' of git://github.com/moodlerooms/moodle into MOODLE_23_STABLE
2012-11-28 11:47:53 +13:00
4254a7495c
Merge branch 'MDL-36012-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-11-28 11:12:30 +13:00
2dd7131e1e
MDL-35966 Assignment - Localisation issue - use userdate not strftime
...
This is causing a database error (reported on MySQL) when strftime returns
non-utf8 characters. This occurs when sending assignment notifications.
This was reported and a solution provided by Chien Wen-Chang(簡文章).
2012-11-27 16:18:15 +08:00
c9368a425a
Merge branch 'MDL-34695_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
2012-11-27 14:23:44 +08:00
89ac5e8782
Merge branch 'MDL-36184-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-11-27 13:58:29 +08:00
42e0a59d5b
MDL-34052 assignment - Disable submission and feedback plugins based on assign type when upgrading
2012-11-27 13:39:53 +08:00
63945c8de2
MDL-36828: mod_scorm: Allow deletion of scorm modules if no scorm_scoes data exists
2012-11-26 15:33:16 +10:30
f9fa262aa9
Merge branch 'wip-MDL-36551-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE
2012-11-26 14:44:27 +13:00
Dan Poltawski