moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 11:26:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54679 commits 37 branches 544 tags 1.3 GiB
Commit graph

2104 commits

Author SHA1 Message Date
Dan Poltawski
9a211c853d Merge branch 'MDL-33780_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-07-02 16:07:32 +08:00
Aparup Banerjee
b574c078a6 MDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts. 2012-06-29 11:37:01 +08:00
Tim Hunt
5af6c9676e MDL-33780 question import: strip UTF8 BOM 
Previously, if there was a byte-order mark at the start of the file, the
import would just break, which was silly. Much better to just strip it
off.
 2012-06-26 10:34:19 +01:00
Dan Poltawski
3248a1e1e4 Merge branch 'MDL-33794' of git://github.com/stronk7/moodle 
Conflicts:
	mod/assign/version.php
 2012-06-18 16:08:39 +08:00
Eloy Lafuente (stronk7)
c5e783e512 MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700 2012-06-18 02:37:00 +02:00
Eloy Lafuente (stronk7)
130aed6e7e MDL-33794 version.php: Fix some missing bits before bump. 2012-06-17 19:29:44 +02:00
Tim Hunt
ba6425ab3d MDL-33779 question: code clean-up 2012-06-15 14:02:15 +01:00
Marina Glancy
c469b3963b MDL-33446 Editor form field can filter return types 
- Added possibility for editor form field to specify return_types (default FILE_INTERNAL | FILE_EXTERNAL | FILE_REFERENCE)
- For assignment, workshop, quiz essay submissions and form posts do not allow FILE_REFERENCE
- Fixed mod_resource return_types, reset them to default, because filemanager does not know how to work with FILE_EXTERNAL links
 2012-06-12 11:03:43 +08:00
Aparup Banerjee
42fd396171 Merge branch 'MDL-33548' of git://github.com/timhunt/moodle 2012-06-11 13:55:20 +08:00
Dan Poltawski
55244f8527 Merge branch 'MDL-33577' of git://github.com/timhunt/moodle 2012-06-07 23:15:45 +08:00
Tim Hunt
b84477000a MDL-33577 qtype_multianswer: Fix strict syntax warning. 2012-06-07 12:32:41 +01:00
Tim Hunt
ee326d5e7d MDL-33548 quiz manual grading: check the grade is in range. 
To do this nicely, I refactored some code out of the quiz manual grading
report.
 2012-06-06 20:21:33 +01:00
Marina Glancy
2aad62e93c MDL-33467 fixed variable name conflict 2012-06-06 11:17:07 +01:00
Dan Poltawski
995e479067 Merge branch 'wip-MDL-33338-master' of git://github.com/marinaglancy/moodle 2012-05-28 15:43:33 +08:00
Dan Poltawski
830fdc8ce8 Merge branch 'wip-MDL-33356-master' of git://github.com/marinaglancy/moodle 2012-05-28 15:37:31 +08:00
Dan Poltawski
ffec9bc70f Merge branch 'MDL-31393' of git://github.com/timhunt/moodle 2012-05-28 15:23:01 +08:00
Marina Glancy
4c2fcbfc85 MDL-33338 recognising the mimetype for uploaded files 
- when file is uploaded in php, the tmpname does not have initial extension and mimetype recognition by extension fails
- another issue is that import form for questions fails with fatal error when it should just say that field is required
 2012-05-28 15:19:41 +08:00
Marina Glancy
6adb5f1363 MDL-33356 fixed a regression after function form_filemanager_redner() was deleted 2012-05-28 13:52:32 +08:00
Dan Poltawski
8119141b91 Merge branch 'MDL-33020' of git://github.com/timhunt/moodle 2012-05-25 10:14:17 +08:00
Marina Glancy
559276b153 MDL-32247,MDL-32831,MDL-32900 Use correct url building of file type icons 
- function get_mimetypes_array() now contains also information about filetype groups and language strings
- use 'smart' human-readable mimetype description
- never determine filetype group based on filetype icon image! remove function mimeinfo_from_icon()
- get rid of class filetype_parser and file lib/filestorage/file_types.mm, replaced with functions file_get_typegroup(), file_extension_in_typegroup() and file_mimetype_in_typegroup()
- support multiple icon sizes, not only 16 and 32
- retrieve filetype icon only using proper functions file_..._icon() from lib/filelib.php throughout the code
- increase size of repository thumbnails to 90 and icons to 24 (will take effect when new icons exist)
 2012-05-21 16:01:04 +08:00
Sam Hemelryk
d5e6fe3ecc Merge branch 'MDL-32727' of git://github.com/timhunt/moodle 
Conflicts:
	mod/quiz/db/upgrade.php
 2012-05-18 16:07:20 +12:00
Aparup Banerjee
ffa7d1cda0 Merge branch 'MDL-32087' of git://github.com/timhunt/moodle 2012-05-17 17:17:37 +08:00
Dan Poltawski
aa141671a3 Merge branch 'MDL-31814' of git://github.com/timhunt/moodle 2012-05-17 14:11:14 +08:00
Tim Hunt
5ef18d8250 MDL-33020 qtype unit tests: improve failure messages. 2012-05-15 17:55:29 +01:00
Tim Hunt
4267fc5272 MDL-32727 quiz upgrade: sort out potential unique key violations 
... before trying to create the unique index that should be there.
The violations may come from old buggy code.

We do two things.
1. First we delete all previews.
2. Then, if there are still problems, we renumber attempts to eliminate
the duplicates.
 2012-05-15 15:23:53 +01:00
Tim Hunt
18056cd8dd MDL-32087 question preview: add a help icon to the technical info. 2012-05-14 19:26:06 +01:00
Tim Hunt
05a7d15511 MDL-32087 question preview: update the code to use html_writer. 2012-05-14 19:26:05 +01:00
Tim Hunt
a2b4d8968c MDL-32087 question preview: add a Save button. 
Without this, there are some interactions with the question that could
only be tested by adding the question to a quiz, which was a pain.
 2012-05-14 19:26:04 +01:00
Tim Hunt
802f8d2af4 MDL-32087 question preview: make more technical info available. 
... but hide it in a collapsible region.
 2012-05-14 19:26:04 +01:00
Tim Hunt
fc6b4c1b4d MDL-31393 qtype_essay upgrade: save old question_answers.feebdack 2012-05-14 16:34:24 +01:00
Dan Poltawski
095de3cee6 Merge branch 'MDL-32863' of git://github.com/jonof/moodle 2012-05-14 20:49:05 +08:00
Dan Poltawski
eca95b639d Merge branch 'MDL-32375' of git://github.com/timhunt/moodle 2012-05-14 20:42:12 +08:00
Jonathon Fowler
0eefca3b66 MDL-32863 question: fix for Oracle ambiguous column error 2012-05-14 12:52:58 +10:00
Dan Poltawski
2edce32ad4 Merge branch 'MDL-32910' of git://github.com/timhunt/moodle 2012-05-14 10:10:03 +08:00
Tim Hunt
6cdef715df MDL-32375 question unit tests: fix breakage from phpunit coversion. 
Three things:

1. Fixes to select expectation.

2. Fixes to match walkthrough tests (No idea how these managed to pass
under Simpletest!)

3. Fix expected values for multianswer upgrade tests.
 2012-05-11 14:59:58 +01:00
Tim Hunt
1921d47b0a MDL-32910 MDL-32569 broke unit tests in third-party qtypes 2012-05-10 11:16:06 +01:00
Tim Hunt
ad3b37cf87 MDL-31814 question bank: fix possible error with sort columns. 2012-05-04 17:29:04 +01:00
Dan Poltawski
33e71140bb Merge branch 'MDL-32698_questionengine_typos' of git://github.com/davosmith/moodle 2012-05-07 12:05:43 +08:00
Davo Smith
d50e8a1bda MDL-32698 Question - Fixed typos in load_question_attempt 2012-05-01 10:17:08 +01:00
Dan Poltawski
73d595faf3 Merge branch 'MDL-32181' of https://github.com/ppichet/moodle 2012-05-01 10:30:43 +08:00
ppichet
0cba6a8d5e MDL-32181 question/calculatedmulti validate multianswers 
restructuring the validation function of edit_calculatedmulti_form.php
correcting attempt
defining = new stdClass() before using them : Strict standards
 2012-04-27 14:30:36 -04:00
Tim Hunt
75733895bb MDL-32613 qbank: improve print_choose_qtype_to_add_form for contrib modules. 2012-04-27 15:08:28 +01:00
Eloy Lafuente (stronk7)
d7f84a2962 Merge branch 'MDL-32471-thumbnails' of git://github.com/mudrd8mz/moodle 2012-04-25 15:14:27 +02:00
Eloy Lafuente (stronk7)
d3cb25dfef Merge branch 'MDL-32322' of git://github.com/timhunt/moodle 
Conflicts:
	mod/quiz/report/simpletest/testreportlib.php
	mod/quiz/report/statistics/simpletest/test_qstats.php
 2012-04-25 03:02:14 +02:00
David Mudrak
7a00d4385d MDL-32471 preview thumbnails support for other component types 
This commit affects mostly qtypes. Other standard components either do
not have pluginfile handler or have been already updated to the new API.
 2012-04-24 14:29:44 +02:00
Petr Skoda
4ca04fb58b MDL-32569 remove remaining references to simpletest and improve events test 2012-04-21 17:08:30 +02:00
Petr Skoda
f596005b6c MDL-32569 drop migrated module tests 2012-04-21 16:58:07 +02:00
Petr Skoda
2338458ac5 MDL-32569 drop all migrated question simpletests 2012-04-21 16:43:34 +02:00
Tim Hunt
ac4d91575a MDL-32322 quiz reports: name improvement attempt_report -> attempts_report. 2012-04-20 10:07:22 +01:00
ppichet
c9340ac145 MDL-32358 : numerical question: validation messages errors 
The selected unit parameter is added answer paramter when renderer call
 $question->get_validation_error() so that it mimics the
is_complete_response(array $response) structure.
 2012-04-15 22:11:10 -04:00