02796eab69
Merge branch 'wip-MDL-33377-master' of git://github.com/marinaglancy/moodle
2012-05-29 15:40:36 +08:00
786cd60ee3
Merge branch 'MDL-32824-master-2' of git://git.luns.net.uk/moodle
...
Conflicts:
course/format/weeks/format.js
course/format/weeks/lib.php
2012-05-29 15:21:55 +08:00
05d80ae6cd
Merge branch 'MDL-30888-master' of git://github.com/FMCorz/moodle
2012-05-29 15:12:38 +08:00
0ed8a933d6
Merge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle
2012-05-29 15:08:46 +08:00
9856d05c26
Merge branch 'MDL-33378-tiff-thumb' of git://github.com/mudrd8mz/moodle
2012-05-29 15:00:21 +08:00
a960dfa900
MDL-33397 Filepicker: cancel button always present in private files
2012-05-29 15:00:19 +08:00
fa31bfc181
Merge branch 'wip-MDL-33026-master' of git://github.com/marinaglancy/moodle
2012-05-29 14:58:31 +08:00
e73b42ca57
Merge branch 'wip-MDL-33399-m23' of git://github.com/samhemelryk/moodle
2012-05-29 14:57:05 +08:00
7f98b12f91
MDL-27120: Cache DB operations in restore_dbops
2012-05-29 14:44:07 +08:00
066af1bbc7
MDL-27120: Cache dirname transformations in progressive_parser::dirname
2012-05-29 14:44:07 +08:00
28729e23a4
mdl-27120 Fix static cache for backup_xml_transformer::register_link_encoders()
2012-05-29 14:44:07 +08:00
ec404105ae
mdl-27120 Fixed incorrect variable in parameter when adding form dependencies.
2012-05-29 14:44:07 +08:00
d729ef29cf
MDL-27120 Add global cache to backup_xml_transformer::register_link_encoders()
2012-05-29 14:44:07 +08:00
631764ea2f
MDL-27120 More efficient use of QuickForms in backup UI
2012-05-29 14:44:06 +08:00
f213bbd77a
MDL-27120 backup: replace sequential scan search with hash-based lookup.
2012-05-29 14:44:06 +08:00
7f1fcda5ad
Revert "Merge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle"
...
MDL-27120 backup: reverting due to phpunit failure at backup/converter/moodle1/tests/fixtures/lib_test.php test_stash_storage()
This reverts commit c70b7fd81fe6f5528585
2012-05-29 14:29:09 +08:00
5fece0f28d
MDL-33404 Fix defaults for ordinary files that are drag/dropped into the course page
2012-05-29 12:58:24 +08:00
849b9a6af7
MDL-33399 mixed: Fixed up calls to get_area_files that used empty sorts
2012-05-29 16:44:28 +12:00
9f4789b842
MDL-33399 files: Fixed up handling of empty sort in File API methods.
...
The following three methods of file_storage have been patched:
* get_external_files
* get_area_files
* get_directory_files
2012-05-29 16:38:47 +12:00
c70b7fd81f
Merge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle
2012-05-29 10:26:21 +08:00
f40f6c14b1
MDL-32221 - googledocs: Add support for all file types.
...
Now google supports 'file' as well as converted formats.
2012-05-29 10:13:21 +08:00
9b27ffa042
MDL-29857 - portfolio: Fix E_STRICT errors
2012-05-29 10:13:20 +08:00
e6f5528585
MDL-28949 upgrade: Split course completion upgrade into smaller chunks
2012-05-29 08:50:45 +12:00
bd633dda9a
Merge branch 'MDL-28949d' of git://github.com/srynot4sale/moodle
...
Conflicts:
lib/db/upgrade.php
version.php
2012-05-29 08:49:29 +12:00
b3520a4ae7
Merge branch 'MDL-33359' of git://github.com/danpoltawski/moodle
2012-05-28 21:25:01 +02:00
540f89d7d4
MDL-33212 Course page: Eye icon should override other conditions
2012-05-28 16:17:39 +01:00
c1d09c6fa3
MDL-33042: Assign: get rid of email statements in messaging functions
2012-05-28 11:48:18 +01:00
77a439336f
MDL-33378 file thumbnail falls back to the default mimetype icon
...
If for some reason the thumbnail generation fails, the default core
mimetype icon for the given file is sent to the browser.
2012-05-28 12:19:05 +02:00
599f7a279c
MDL-33045: Assign: remove references to old assignment in URLs
2012-05-28 10:53:40 +01:00
f5b32abe57
MDL-33045: Assign: Make get_module_name() return something
2012-05-28 10:52:11 +01:00
140669a9dd
MDL-33026 set default author and license in drag-n-drop upload
2012-05-28 17:05:25 +08:00
2da7fbc0c2
MDL-33382 CLI install and upgrade scripts display hint on --allow-unstable in non-interactive mode
2012-05-28 10:59:22 +02:00
6bea694b6c
Revert "MDL-33212 Course page: Eye icon should override other conditions"
...
This reverts commit 5d0d373733
2012-05-28 16:57:41 +08:00
f92b65e5a6
MDL-33377 Do not allow to link to course files since reference is preferable
2012-05-28 16:27:22 +08:00
716b50dc2c
MDL-33001 improve error handling in mysql engine conversion tool and add listing of engines
2012-05-28 10:25:58 +02:00
b7c5627f5b
MDL-33089 flag test database as soon as possible in PHPUnit init
2012-05-28 10:10:32 +02:00
17b60e9d98
MDL-33089 detect more problems when initialising PHPUnit test environment
2012-05-28 10:10:32 +02:00
f18dd15d3e
Merge branch 'wip-MDL-33321-master' of git://github.com/kwiliarty/moodle
2012-05-28 16:10:16 +08:00
da5cd8cee8
Merge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle
2012-05-28 16:03:03 +08:00
995e479067
Merge branch 'wip-MDL-33338-master' of git://github.com/marinaglancy/moodle
2012-05-28 15:43:33 +08:00
830fdc8ce8
Merge branch 'wip-MDL-33356-master' of git://github.com/marinaglancy/moodle
2012-05-28 15:37:31 +08:00
ffec9bc70f
Merge branch 'MDL-31393' of git://github.com/timhunt/moodle
2012-05-28 15:23:01 +08:00
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
5ab310d5d3
Merge branch 'wip-MDL-32199-master' of git://github.com/abgreeve/moodle
2012-05-28 15:18:51 +08:00
0fe4db6dd1
Merge branch 'MDL-33194-master' of https://github.com/mackensen/moodle
2012-05-28 14:58:56 +08:00
c865e08fab
Merge branch 'MDL-32860_user_iterator' of git://github.com/andyjdavis/moodle
2012-05-28 14:56:48 +08:00
d079d6d8c1
Merge branch 'MDL-33110_master' of git://github.com/lazydaisy/moodle
2012-05-28 14:54:23 +08:00
54495fe41d
MDL-33375 course: set anchor after changing sections
...
So scrolling isn't required
2012-05-28 14:44:23 +08:00
3f1bca9d56
Merge branch 'master_MDL-27368' of git://github.com/danmarsden/moodle
...
Conflicts:
version.php
lib/db/upgrade.php
2012-05-28 14:32:16 +08:00
6adb5f1363
MDL-33356 fixed a regression after function form_filemanager_redner() was deleted
2012-05-28 13:52:32 +08:00
Dan Poltawski