Andrew Robert Nicols
8635302e54
MDL-33675 Add updated help texts for modules to appear in activity chooser
2012-06-12 13:38:17 +01:00
Dan Poltawski
19774b885d
Merge branch 'MDL-33676' of git://github.com/danpoltawski/moodle
2012-06-12 18:36:08 +08:00
Eloy Lafuente (stronk7)
2903a92b29
Merge branch 'MDL-33123-master' of git://github.com/ankitagarwal/moodle
2012-06-12 12:33:54 +02: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
Barbara Ramiro
59e807e800
MDL-33676 Activity chooser dialogue background set to transparent for IE
2012-06-12 18:30:22 +08:00
Tim Hunt
7ead73c106
MDL-33611 quiz: improve help string
...
Thanks to Helen and Michelle. Who would have thought that 124 words
would require such a team effort!
2012-06-12 10:38:47 +01:00
Dan Poltawski
8409bd51f4
Merge branch 'MDL-33612' of git://github.com/timhunt/moodle
2012-06-12 17:38:25 +08: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
Dan Poltawski
ee6b360431
Merge branch 'w24_MDL-33182_m23_mnetstrict' of git://github.com/skodak/moodle
2012-06-12 17:10:54 +08:00
Petr Skoda
2e297453b8
MDL-33182 fix mnet enrol E_STRICT issue
2012-06-12 11:08:33 +02:00
Petr Skoda
6498b6190a
MDL-33553 fix mod_data E_STRICT issue
2012-06-12 11:05:02 +02:00
Dan Poltawski
203d255116
Merge branch 'MDL-33393' of git://github.com/timhunt/moodle
...
Conflicts:
mod/quiz/lang/en/quiz.php
2012-06-12 17:00:09 +08:00
Petr Skoda
f327b9c3f3
MDL-33204 use natural filename sorting when importing books form html
2012-06-12 10:59:58 +02: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
Petr Skoda
84e1e04418
MDL-33636 add more yui caching goodness
2012-06-12 10:13:01 +02:00
Ankit Agarwal
b0b30cb648
MDL-33123 book: Fixing numbering issue with hidden sub-chapters
2012-06-12 16:03:40 +08:00
Dan Poltawski
82fc6ae6e3
Merge branch 'MDL-33598-master-integration' of git://github.com/FMCorz/moodle
2012-06-12 15:57:58 +08:00
Dan Poltawski
071d8ea75b
Merge branch 'wip-MDL-33156-master' of https://github.com/barbararamiro/moodle
2012-06-12 15:55:26 +08:00
Dan Poltawski
f3e526b859
Merge branch 'wip-MDL-33005-master' of https://github.com/barbararamiro/moodle
2012-06-12 13:54:10 +08:00
Dan Poltawski
760c063bc0
Merge branch 'wip-MDL-33446-master' of git://github.com/marinaglancy/moodle
2012-06-12 13:45:10 +08:00
Dan Poltawski
502be9a069
MDL-33572 - assign: fixed syntax probblem found immediately after integration
...
Grr. shouldn't have escaped our review.
2012-06-12 13:41:54 +08:00
Dan Poltawski
08f5648de3
Merge branch 'MDL-33572' of git://github.com/netspotau/moodle-mod_assign
2012-06-12 13:38:34 +08:00
Dan Poltawski
14507142a1
Merge branch 'w23_MDL-33543_m23_datastrict' of git://github.com/skodak/moodle
2012-06-12 13:36:15 +08:00
Dan Poltawski
8550d72d85
MDL-32937 - scorm: switch commenting style to //
2012-06-12 13:18:51 +08:00
Dan Poltawski
d87debaa3e
MDL-32767 - course: Add a summary of activities
...
When in single-page summary mode
2012-06-12 13:13:52 +08:00
Frederic Massart
db48ed64c7
MDL-33598 Messaging: students can change their assignment notification preferences
2012-06-12 13:10:43 +08:00
Dan Poltawski
91f0dd438a
Merge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle
2012-06-12 13:05:47 +08:00
Dan Poltawski
555099c666
Merge branch 'MDL-33400' of git://github.com/nebgor/moodle
2012-06-12 13:03:42 +08:00
Aparup Banerjee
7d22edb6b1
Merge branch 'master_MDL-33515' of git://github.com/danmarsden/moodle
2012-06-12 11:25:17 +08:00
Aparup Banerjee
575776c1bd
Merge branch 'MDL-31863' of git://github.com/mouneyrac/moodle
2012-06-12 11:09:51 +08:00
Marina Glancy
c0e8f211d3
MDL-33452 It must not possible to create an alias to another alias
...
- if the downloaded file is an alias we pretend that we operate with its source
2012-06-12 11:03:54 +08: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
8f856cd041
MDL-33597 css_optimiser: Moved the Enable CSS optimiser setting from advanced to experimental settings
2012-06-12 14:23:20 +12: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)
f8dfdb524b
on-demand release 2.3dev
2012-06-12 03:01:04 +02:00
Eloy Lafuente (stronk7)
92b0d9820e
Merge branch 'install_master' of git://github.com/amosbot/moodle
2012-06-12 02:55:03 +02:00
Eloy Lafuente (stronk7)
daf28d868b
MDL-32117 equella: make it core plugin
2012-06-12 02:37:04 +02:00