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
Dan Poltawski
c17ec774d7
MDL-33552 - portfolio api E_STRICT fixes
...
admin_config_form and admin_config_validation are now static
2012-06-12 22:56:42 +08:00
Eloy Lafuente (stronk7)
e47275fa0d
Merge branch 'w24_MDL-33636_m23_yuislash' of git://github.com/skodak/moodle
2012-06-12 12:31:27 +02:00
Dan Poltawski
93de786561
Merge branch 'MDL-33292-master-3' of git://git.luns.net.uk/moodle
2012-06-12 17:18:18 +08:00
Dan Poltawski
ac961e292a
Merge branch 'MDL-33588-master-1' of git://git.luns.net.uk/moodle
2012-06-12 17:16:40 +08:00
Petr Skoda
b71d0b43fc
MDL-33635 add collatorlib::ksort() support
2012-06-12 10:57:24 +02:00
Petr Skoda
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
Petr Skoda
7953149e01
MDL-33204 disable yui_combo slasharguments by default for now
2012-06-12 10:13:17 +02: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
Sam Hemelryk
b305d623a5
MDL-33596 css_optimiser: Added an option for themes to disable the CSS optimiser
2012-06-12 14:23:15 +12:00
Sam Hemelryk
5c1f0d1ff6
MDL-33592 navigation: Added support for local_ prefix on navigation callback
2012-06-12 14:23:09 +12:00
Sam Hemelryk
d2830cdd93
MDL-33468 css_optimiser: pre-integration clean up
2012-06-12 14:22:56 +12:00
Sam Hemelryk
f791122195
MDL-33468 css_optimiser: Fixed validation of individual background styles
2012-06-12 14:22:56 +12:00
Sam Hemelryk
ecad5058a0
MDL-33504 css_optimiser: Added support for common media-queiries
2012-06-12 14:22:56 +12:00
Sam Hemelryk
3daafb9295
MDL-33468 css_optimiser: Fixed handling of !important in shorthand notations
2012-06-12 14:22:56 +12:00
Sam Hemelryk
e3036985b2
MDL-33468 css_optimiser: Added support for multiple values for a single attribute
2012-06-12 14:22:55 +12:00
Sam Hemelryk
6a519fdcf1
MDL-33468 css_optimiser: Improved consolidation of background styles and fixed ordering issue
2012-06-12 14:22:55 +12:00
Sam Hemelryk
0663b5353c
MDL-33468 css_optimiser: Added support for prioritising reset rules
2012-06-12 14:22:55 +12:00
Sam Hemelryk
1121f79b91
MDL-33468 css_optimiser: Added support for @keyframes to the CSS optimiser
2012-06-12 14:22:55 +12:00
Sam Hemelryk
f2e8d3798c
MDL-33468 css_optimiser: Numerous fixes to the CSS optimiser and its tests
2012-06-12 14:22:55 +12:00
Eloy Lafuente (stronk7)
daf28d868b
MDL-32117 equella: make it core plugin
2012-06-12 02:37:04 +02:00