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
75230 commits 37 branches 544 tags 1.3 GiB
Commit graph

3487 commits

Author SHA1 Message Date
Jamie Pratt
5901152a05 MDL-47494 gapselect: NOBUG oops. Forgot to change plug in name inside function 2012-06-21 14:17:27 +07:00
Jamie Pratt
0ac7a9be18 MDL-47494 ddwtos: NOBUG oops. Forgot to change plug in name inside function 2012-06-21 14:17:26 +07:00
Jamie Pratt
c48797ac26 MDL-47494 gapselect: NOBUG added extra options param for file access 2012-06-21 14:07:42 +07:00
Jamie Pratt
6ab6252f8a MDL-47494 ddwtos: NOBUG added extra options param for file access 2012-06-21 14:07:41 +07:00
Jamie Pratt
940c0c76cb MDL-47494 gapselect: Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes 2012-06-21 13:42:52 +07:00
Jamie Pratt
5de5ae31ee MDL-47494 ddwtos: Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes 2012-06-21 13:42:44 +07:00
Jamie Pratt
db344be62c MDL-47494 ddimageortext: Merge branch 'wip_lib_php_fixes_2_1' into wip_lib_fixes 2012-06-21 13:40:01 +07:00
Jamie Pratt
0749cc7c30 MDL-47494 ddimageortext: NOBUG fixes for fileaccess through lib.php 
added missing lib.php files and fixed comments
 2012-06-21 12:45:11 +07:00
Jamie Pratt
981f50588d MDL-47494 gapselect: NOBUG fixes for fileaccess through lib.php 
added missing lib.php files and fixed comments
 2012-06-21 12:45:11 +07:00
Jamie Pratt
ceb9e80486 MDL-47494 ddwtos: NOBUG fixes for fileaccess through lib.php 
added missing lib.php files and fixed comments
 2012-06-21 12:45:11 +07:00
Tim Hunt
08b47def1f MDL-47494 ddwtos: Merge pull request #4 from jamiepratt/wip_unittestconversions 
NOBUG changed unit tests to use PHPUnit
 2012-06-20 04:21:55 -07:00
Tim Hunt
d33e1b6a78 MDL-47494 gapselect: Merge pull request #4 from jamiepratt/wip_unittestconversions 
NOBUG changed unit tests to use PHPUnit
 2012-06-20 04:18:33 -07:00
Tim Hunt
77192cf305 MDL-47494 ddmarker: Merge remote-tracking branch 'jp/wip_unittestconversions' 
Conflicts:
	tests/question_test.php
	tests/questiontype_test.php
	tests/shapes_test.php
	tests/walkthrough_test.php
 2012-06-20 10:54:05 +01:00
Tim Hunt
41db46c6f9 MDL-47494 ddmarker: Merge pull request #7 from jamiepratt/wip_readme 
Wip readme
 2012-06-20 02:46:47 -07:00
Jamie Pratt
bd6d6e4a87 MDL-47494 ddmarker: NOBUG change in file access api in 2.3 2012-06-19 20:11:44 +07:00
Jamie Pratt
4c0f4ffe8e MDL-47494 ddimageortext: NOBUG change in file access api in 2.3 2012-06-19 20:11:24 +07:00
Jamie Pratt
0291aa6672 MDL-47494 ddmarker: Merge branch 'wip_readme_2_1' into wip_readme 2012-06-19 19:16:09 +07:00
Jamie Pratt
d7423110fd MDL-47494 ddmarker: NOBUG fixing sql for mysql. Thanks to Alain Roussel. 
removed usage of 'drop' keyword as table alias
 2012-06-19 19:14:08 +07:00
Jamie Pratt
b3adccfb61 MDL-47494 gapselect: NOBUG changed unit tests to use PHPUnit 2012-06-19 14:55:21 +07:00
Jamie Pratt
543e4deef1 MDL-47494 ddwtos: NOBUG changed unit tests to use PHPUnit 2012-06-19 14:53:53 +07:00
Jamie Pratt
4c72a49cd7 MDL-47494 ddmarker: NOBUG using phpunit instead of simpletest library 2012-06-19 14:41:31 +07: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
Jamie Pratt
c7b2d1fbd9 MDL-47494 ddimageortext: NOBUG changed unit tests to use PHPUnit 2012-06-16 16:57:53 +07:00
Tim Hunt
ba6425ab3d MDL-33779 question: code clean-up 2012-06-15 14:02:15 +01:00
Eugene Shwab
ae486a635a MDL-47494 ddwtos: Translate to russian language 2012-06-14 14:01:17 +04:00
Eugene Shwab
8c743d7d8d MDL-47494 ddmarker: Translate to russian language 2012-06-13 14:45:23 +04: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
Eugene Shwab
2029b1d80e MDL-47494 gapselect: Translate to russian language 2012-06-08 16:06:38 +04: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