Commit graph

13953 commits

Author SHA1 Message Date
Petr Skoda
a6d9d4efc2 MDL-32003 fix PHP4-isms in core xmldb code 2012-06-17 22:56:29 +02:00
Petr Skoda
ef7c3f108a MDL-32003 protect xmldb class internals
Use getters and setters instead!
2012-06-17 22:56:29 +02:00
Petr Skoda
01be2287c7 MDL-32003 drop unused statement constants
These were last used in 2.2 upgrade, not allowed any more.
2012-06-17 22:56:29 +02:00
Petr Skoda
94417438b3 MDL-32003 fix phpdocs in xmldb abstraction 2012-06-17 22:56:28 +02:00
Petr Skoda
5a070f0477 MDL-32003 fix phpdocs in DDL layer 2012-06-17 22:56:28 +02:00
Petr Skoda
00902cd974 MDL-32003 fix phpdocs and use __DIR__ for includes in dml layer
DML layer is not supposed to use $CFG,
it is better to rely on __DIR__ in self-contained libs…
2012-06-17 22:56:28 +02:00
Eloy Lafuente (stronk7)
a4b9f21e45 MDL-27156 maxfilesize: Comment out new cap use + return -1 as temp fix
With the capability check and the return -1 commented
it has been checked here that it's possible to upload
and pick from filesystem repository files normally, so
I'm introducing this temp commit to allow people to
use those repos "normallly" until a proper fix arrives
supporting the new cap.
2012-06-15 20:05:46 +02:00
Eloy Lafuente (stronk7)
b9647509d4 MDL-32279 filters: filters: setup() before filter() is better. 2012-06-15 10:12:53 +02:00
Dongsheng Cai
d6453211b6 MDL-33513: Make files->source field consistent 2012-06-15 14:51:07 +08:00
Marina Glancy
52474d7497 MDL-33136 upload dnd files one after another 2012-06-15 14:48:02 +08:00
Dan Poltawski
ed2ed3f97e MDL-33468 - fix illegal whitespace 2012-06-15 12:17:40 +08:00
Dan Poltawski
74ef0474fc Merge branch 'wip-MDL-33468-m23' of git://github.com/samhemelryk/moodle 2012-06-15 12:14:49 +08:00
Dan Poltawski
b44022782b MDL-32279 filter: fix undefined variable 2012-06-15 11:58:03 +08:00
Dan Poltawski
ccd4972636 Merge branch 'MDL-33758-master-integration' of git://github.com/FMCorz/moodle 2012-06-15 11:30:33 +08:00
Dan Poltawski
66d9586070 Merge branch 'MDL-32279' of git://github.com/stronk7/moodle 2012-06-15 11:02:47 +08:00
Frederic Massart
e7ae9c2600 MDL-33758 Filepicker: using iframe instead of popup windows for download 2012-06-15 10:12:57 +08:00
Eloy Lafuente (stronk7)
6c5dbbb36b MDL-32279 filters: add support for setup() methods in filters. 2012-06-14 20:02:20 +02:00
Andrew Robert Nicols
605f92ca1d MDL-33729 Ensure that the cancel_popup event is correctly called when using the [x] button on a chooser 2012-06-14 14:46:24 +01:00
Aparup Banerjee
6971dcf7ec Merge branch 'wip-MDL-33596-m23' of git://github.com/samhemelryk/moodle 2012-06-14 21:09:55 +08:00
Andrew Robert Nicols
7db27680f8 MDL-33728 Ensure that chooser dialogues are centred vertically 2012-06-14 10:55:16 +01:00
Aparup Banerjee
60d3ff94db Merge branch 'MDL-31499-master-iframe' of git://github.com/FMCorz/moodle 2012-06-14 17:08:18 +08:00
Dan Poltawski
4585e6ac98 Merge branch 'wip-MDL-33550-master' of git://github.com/marinaglancy/moodle 2012-06-14 16:23:08 +08:00
Marina Glancy
6fd1cf05b0 MDL-33550 reset repository static cache between unit tests 2012-06-14 16:21:04 +08:00
Frederic Massart
247804bcc2 MDL-33582 Filepicker: set main file button disabled when not required 2012-06-14 15:14:57 +08:00
Marina Glancy
cfc4db405c MDL-33550 Set default status for file =0 and correct setting user in phpunit test 2012-06-14 14:52:31 +08:00
Dan Poltawski
414ce30812 Revert MDL-33513
This reverts commit b2cf2b807f.
This reverts commit 24b96f0170.
This reverts commit 39c60294a6.
This reverts commit 8a288971e2.
2012-06-14 13:57:45 +08:00
Sam Hemelryk
1875b6fb89 MDL-33468 css_optimiser: Coding style clean up and renamed cssslib_test => csslib_test 2012-06-14 17:28:26 +12:00
Sam Hemelryk
de3a460e17 MDL-33468 css_optimiser: Fixed aggressive optimisation so that it only combines siblings and doesn't reorder 2012-06-14 17:25:19 +12:00
Dan Poltawski
bc1f298b2a MDL-33175 - filemanager: make dndupload icon clickable 2012-06-14 13:25:05 +08:00
Dan Poltawski
745b178e42 Merge branch 'wip-MDL-33592-m23' of git://github.com/samhemelryk/moodle 2012-06-14 12:22:39 +08:00
Dan Poltawski
54588ca214 Merge branch 'MDL-27156_file_cap' of git://github.com/andyjdavis/moodle 2012-06-14 12:00:18 +08:00
Dan Poltawski
cd925ac79b Merge branch 'dev_MDL-33513_files_source' of git://github.com/danpoltawski/moodle 2012-06-14 11:12:21 +08:00
Aparup Banerjee
38d488cea1 MDL-33400 Lib : fixed character miscount 2012-06-14 10:56:40 +08:00
Dan Poltawski
b2cf2b807f MDL-33513 repositories - fix misleading phpdocs 2012-06-14 10:55:30 +08:00
Dan Poltawski
813f6964ca MDL-33400 questionlib - minor whitespace/equality imporvement 2012-06-14 10:28:34 +08:00
Dan Poltawski
e46dfeb7fc Merge branch 'MDL-33400' of git://github.com/nebgor/moodle 2012-06-14 10:27:23 +08:00
Andrew Davis
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
Andrew Davis
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
Andrew Davis
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
Sam Hemelryk
043a53fb25 Merge branch 'MDL-33541' of git://github.com/danpoltawski/moodle 2012-06-14 11:27:37 +12:00
Aparup Banerjee
0dd0f96373 MDL-33400 Libraries : added callback to *_question_pluginfile without 'mod_' prefix 2012-06-14 01:30:52 +08:00
Eloy Lafuente (stronk7)
f7b3e092e9 Merge branch 'w24_MDL-33635_m23_sort' of git://github.com/skodak/moodle 2012-06-13 16:40:07 +02:00
Petr Skoda
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
sam marshall
a098f340fe MDL-33466: Group restriction should hide activity even with 'show availability' option
This is a modified version of fix by Luke Tucker at NetSpot - thanks.
2012-06-13 13:08:30 +01:00
Andrew Robert Nicols
b95b05085c MDL-33649 Hide page scrollbars when a chooser is open
This has the effect of preventing page scrolling which makes the chooser
difficult to use when there are many options or the page is too small.
2012-06-13 10:51:31 +01:00
Dan Poltawski
dff798fd4a Merge branch 'wip-MDL-33590-master' of git://github.com/marinaglancy/moodle 2012-06-13 16:33:50 +08:00
Nadav Kavalerchik
7dd65ae2f2 MDL-32802 - RTL CSS fixes for Moodle 2 (lib/editor/tinymce)
Right align theme Clearlooks2
/lib/editor/tinymce/tiny_mce/3.4.9/plugins/inlinepopups/skins/clearlooks2/window.css
2012-06-13 13:55:17 +08:00
Dan Poltawski
837eef2e64 MDL-33541 - remove cookies from filepicker 2012-06-13 12:17:52 +08:00
Marina Glancy
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
Marina Glancy
ff32444a7c MDL-33590 Correctly determine that file is an archive to enable unzip in filemanager 2012-06-13 08:57:10 +08:00