7db27680f8
MDL-33728 Ensure that chooser dialogues are centred vertically
2012-06-14 10:55:16 +01:00
60d3ff94db
Merge branch 'MDL-31499-master-iframe' of git://github.com/FMCorz/moodle
2012-06-14 17:08:18 +08:00
4585e6ac98
Merge branch 'wip-MDL-33550-master' of git://github.com/marinaglancy/moodle
2012-06-14 16:23:08 +08:00
6fd1cf05b0
MDL-33550 reset repository static cache between unit tests
2012-06-14 16:21:04 +08:00
cfc4db405c
MDL-33550 Set default status for file =0 and correct setting user in phpunit test
2012-06-14 14:52:31 +08:00
414ce30812
Revert MDL-33513
...
This reverts commit b2cf2b807f24b96f017039c60294a68a288971e2
2012-06-14 13:57:45 +08:00
745b178e42
Merge branch 'wip-MDL-33592-m23' of git://github.com/samhemelryk/moodle
2012-06-14 12:22:39 +08:00
54588ca214
Merge branch 'MDL-27156_file_cap' of git://github.com/andyjdavis/moodle
2012-06-14 12:00:18 +08:00
cd925ac79b
Merge branch 'dev_MDL-33513_files_source' of git://github.com/danpoltawski/moodle
2012-06-14 11:12:21 +08:00
38d488cea1
MDL-33400 Lib : fixed character miscount
2012-06-14 10:56:40 +08:00
b2cf2b807f
MDL-33513 repositories - fix misleading phpdocs
2012-06-14 10:55:30 +08:00
813f6964ca
MDL-33400 questionlib - minor whitespace/equality imporvement
2012-06-14 10:28:34 +08:00
e46dfeb7fc
Merge branch 'MDL-33400' of git://github.com/nebgor/moodle
2012-06-14 10:27:23 +08:00
845c2ae110
MDL-27156 repositories: switched the file manager and the file picker over to using get_user_max_upload_file_size()
2012-06-14 09:19:26 +07:00
1812ea3e06
MDL-27156 repositories: switched some spots over to using get_user_max_upload_file_size() instead of get_max_upload_file_size()
2012-06-14 09:19:25 +07:00
8ac95c279c
MDL-27156 repository: Added a new capability so that select users can bypass file size restrictions
2012-06-14 09:19:25 +07:00
043a53fb25
Merge branch 'MDL-33541' of git://github.com/danpoltawski/moodle
2012-06-14 11:27:37 +12:00
0dd0f96373
MDL-33400 Libraries : added callback to *_question_pluginfile without 'mod_' prefix
2012-06-14 01:30:52 +08:00
f7b3e092e9
Merge branch 'w24_MDL-33635_m23_sort' of git://github.com/skodak/moodle
2012-06-13 16:40:07 +02:00
bc53b4e9d7
MDL-33635 improve collatorlib::ksort() coding style and perf
...
Thanks Eloy Lafuente for spotting my sloppy coding style!
2012-06-13 16:37:56 +02:00
dff798fd4a
Merge branch 'wip-MDL-33590-master' of git://github.com/marinaglancy/moodle
2012-06-13 16:33:50 +08:00
837eef2e64
MDL-33541 - remove cookies from filepicker
2012-06-13 12:17:52 +08:00
0b2bfbd1c6
MDL-33550 Correctly process situation when file reference source is missing
...
- do not die with fatal error if source file in moodle internal repository is missing;
- moved code duplication for moodle repositories into class repository (functions send_file, get_reference_details, get_file_by_reference, get_file_reference);
- update file status after repository::sync_external_file so we know that it is missing (or not missing anymore). Do not run this function more than once for file within one request;
- display readable name for Private Files and Server files with the new format;
- display broken icon in filemanager if we know that source is missing, display information (for admin) where it was located before: see repository::get_reference_details() and extending classes;
- removed unnecessary queries in stored_file::sync_external_file();
- syncronize files before displaying it's size in mod_resource, do not query directly
2012-06-13 12:11:06 +08:00
ff32444a7c
MDL-33590 Correctly determine that file is an archive to enable unzip in filemanager
2012-06-13 08:57:10 +08:00
e47275fa0d
Merge branch 'w24_MDL-33636_m23_yuislash' of git://github.com/skodak/moodle
2012-06-12 12:31:27 +02:00
93de786561
Merge branch 'MDL-33292-master-3' of git://git.luns.net.uk/moodle
2012-06-12 17:18:18 +08:00
ac961e292a
Merge branch 'MDL-33588-master-1' of git://git.luns.net.uk/moodle
2012-06-12 17:16:40 +08:00
b71d0b43fc
MDL-33635 add collatorlib::ksort() support
2012-06-12 10:57:24 +02:00
212826853b
MDL-33635 improve collatorlib
...
1/ the sort flag can not use Intl extension constants because they may not be available
2/ add sort flag to all methods
3/ use private constructor instead of abstract - more Java like API to match the textlib
4/ add natural sorting support
5/ consistent bool return type
6/ better non-intl fallback
7/ more tests
2012-06-12 10:57:24 +02:00
7953149e01
MDL-33204 disable yui_combo slasharguments by default for now
2012-06-12 10:13:17 +02:00
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
5c1f0d1ff6
MDL-33592 navigation: Added support for local_ prefix on navigation callback
2012-06-12 14:23:09 +12:00
daf28d868b
MDL-32117 equella: make it core plugin
2012-06-12 02:37:04 +02:00
39c60294a6
MDL-33513 box.net repository should have filename in source field
2012-06-11 17:41:32 +10:00
8a288971e2
MDL-33513: Make files->source field consistent
2012-06-10 17:47:00 +10:00
7cb76d1645
MDL-33595 fix recent initial PHPUnit init regression
2012-06-08 11:50:03 +02:00
4e020fe71d
Merge branch 'MDL-33465-master' of git://github.com/ankitagarwal/moodle
2012-06-08 15:51:41 +08:00
283ba570c0
MDL-33465 course: COALESCE is not cross-db compatible while using fields of different datatypes
2012-06-08 15:48:18 +08:00
98d5bad9fa
MDL-31499 Filepicker: download all function uses iframe instead of popup
2012-06-08 12:32:39 +08:00
8ac226d23c
Merge branch 'MDL-33587-delete-alias' of git://github.com/mudrd8mz/moodle
2012-06-08 11:40:56 +08:00
c224cc643b
Merge branch 'w23_MDL-33557_m23_initpath' of git://github.com/skodak/moodle
2012-06-08 11:53:43 +12:00
03a94794fc
Merge branch 'MDL-32985_integration' of git://github.com/merrill-oakland/moodle
2012-06-08 00:04:19 +02:00
a15e8b4101
MDL-30506 navigation: Fixed up reference handling issue and added docs post integration
2012-06-08 09:34:19 +12:00
a509cb29c3
Merge branch 'MDL-30506' of git://github.com/jonof/moodle
2012-06-08 09:04:46 +12:00
3b2465fee6
MDL-33587 Delete the reference properly in stored_file::delete()
2012-06-07 18:02:12 +02:00
1c0da8498f
MDL-33587 Improve stored_file::delete_reference() method
2012-06-07 17:37:25 +02:00
2fa8aea279
MDL-33587 Throw coding exception when trying to unlink a non-reference file
2012-06-07 17:36:29 +02:00
2d2c194bbe
MDL-33587 Add unit tests for stored_file::delete_reference()
...
The first unit test forces the File API to be more picky as any sane
core API should be. The second one illustrates the buggy behaviour of
the current implementation of delete_reference(). They both fail at the
moment, of course...
2012-06-07 17:36:23 +02:00
901f49097a
Merge branch 'MDL-33532' of git://github.com/timhunt/moodle
2012-06-07 22:23:38 +08:00
9c1fe3356f
Merge branch 'MDL-33565' of git://github.com/timhunt/moodle
2012-06-07 22:14:28 +08:00
Andrew Robert Nicols