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
b305d623a5
MDL-33596 css_optimiser: Added an option for themes to disable the CSS optimiser
2012-06-12 14:23:15 +12:00
5c1f0d1ff6
MDL-33592 navigation: Added support for local_ prefix on navigation callback
2012-06-12 14:23:09 +12:00
d2830cdd93
MDL-33468 css_optimiser: pre-integration clean up
2012-06-12 14:22:56 +12:00
f791122195
MDL-33468 css_optimiser: Fixed validation of individual background styles
2012-06-12 14:22:56 +12:00
ecad5058a0
MDL-33504 css_optimiser: Added support for common media-queiries
2012-06-12 14:22:56 +12:00
3daafb9295
MDL-33468 css_optimiser: Fixed handling of !important in shorthand notations
2012-06-12 14:22:56 +12:00
e3036985b2
MDL-33468 css_optimiser: Added support for multiple values for a single attribute
2012-06-12 14:22:55 +12:00
6a519fdcf1
MDL-33468 css_optimiser: Improved consolidation of background styles and fixed ordering issue
2012-06-12 14:22:55 +12:00
0663b5353c
MDL-33468 css_optimiser: Added support for prioritising reset rules
2012-06-12 14:22:55 +12:00
1121f79b91
MDL-33468 css_optimiser: Added support for @keyframes to the CSS optimiser
2012-06-12 14:22:55 +12:00
f2e8d3798c
MDL-33468 css_optimiser: Numerous fixes to the CSS optimiser and its tests
2012-06-12 14:22:55 +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
984ec46e03
MDL-33292 Consume the new ability to move dialogues in chooser dialogues
2012-06-07 14:58:54 +01:00
371409f41e
MDL-33588 Ensure that a drop target is defined before checking a drop group
2012-06-07 14:46:36 +01:00
7f5f384477
MDL-33532 quiz editing: let uses enter locale floats.
...
So, for example, Croatian users can set the maximum grade to 65,5.
2012-06-07 12:55:53 +01:00
620ecd38d2
Merge branch 'wip-MDL-33482-master' of git://github.com/danpoltawski/moodle
2012-06-07 18:11:10 +08:00
255dd8d1e2
MDL-33482 Replaced modchooser with chooserdialogue
2012-06-07 18:09:14 +08:00
d9d59e3911
MDL-33551 googleapi: allow multiple uploads in one session
...
We need to clear state between multiple uploads
2012-06-07 16:38:10 +08:00
98984c09a2
MDL-33565 setuplib: better error if you pass an object as $debuginfo
...
This changes makes sure the error is triggerd when the exception is
thrown, so that the problem code is in the stack-trace. Before, the
error happend in the exception hander, so you could not see the code
that caused the problem.
2012-06-06 20:33:16 +01:00
54c2756ca2
MDL-32985 cron: Fixing related problem with setting of lastnotifyfailure
...
Because of a flaw in the logic, lastnotifyfailure was not set unless
there was a failure. This means that after 1 hour of no failures, the
function would execute every cron cycle, which has a pretty high cost
on large sites.
2012-06-06 12:04:03 -04:00
5f9ba165de
MDL-33557 fix path in PHPUnit init hint
...
This resolves problem when execution phpunit in subdirectory.
2012-06-06 12:29:20 +02:00
4a5be0e949
MDL-33330 /lib/db/upgrade.php: fix stray semicolon
...
Breaking Oracle upgrade
2012-06-06 16:25:20 +08:00
79c2b50980
Merge branch 'MDL-33330-files-reference' of git://github.com/mudrd8mz/moodle
...
Conflicts:
version.php
lib/db/upgrade.php
2012-06-06 16:18:30 +08:00
55e168e3a3
MDL-32581 Web services : should force type of external_format_value structure
2012-06-06 14:29:45 +08:00
dcba513f4b
Merge branch 'w23_MDL-32632_m23_windate' of git://github.com/skodak/moodle
2012-06-06 12:27:10 +08:00
0cc24b8425
MDL-30506 navigation: Hook for local plugins to extend the settings_navigation tree
2012-06-06 10:38:03 +10:00
4744851197
Merge branch 'MDL-30837-master' of https://github.com/FMCorz/moodle
2012-06-06 11:00:20 +12:00
238858e362
MDL-26277: Fixed whitespace post integration
2012-06-06 09:15:18 +12:00
Dan Poltawski