Commit graph

54381 commits

Author SHA1 Message Date
Marina Glancy
be920f9acf MDL-33420 Enable references in Server files repository 2012-06-13 09:03:41 +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
Damyon Wiese
e7ade405eb MDL-33576: If grade set to "No grade" in mod_assign hide inputs for quickgrading 2012-06-13 08:55:02 +08:00
Eloy Lafuente (stronk7)
0961ca7998 MDL-33682 backup: keep old behavior, aka, use section number on empty section name. 2012-06-13 00:54:21 +02:00
Eloy Lafuente (stronk7)
1df09d3af2 Merge branch 'MDL-33682' of git://github.com/timhunt/moodle 2012-06-13 00:37:42 +02:00
Eloy Lafuente (stronk7)
dbe4bcc959 Merge branch 'MDL-33681' of git://github.com/timhunt/moodle 2012-06-13 00:06:26 +02:00
Dan Marsden
cb6782d4a5 MDL-32937 SCORM: better lang for dnd interface 2012-06-13 09:59:11 +12:00
Aparup Banerjee
039e110509 Merge branch 'MDL-33610' of git://github.com/danpoltawski/moodle 2012-06-13 01:59:33 +08:00
Aparup Banerjee
fa4ae5ac9f Merge branch 'MDL-33593' of git://github.com/danpoltawski/moodle 2012-06-13 01:46:17 +08:00
Tim Hunt
ff5d6f8872 MDL-33682 backup: cope with sections called '0'
It was not previously possible to have a section called 0 because of
bugs in the standard course formats, but we hit this with the OU course
format. You got an exception because backup settings tested to see if
their lable was empty, which means a section name of '0' was fatal.
Should work now.
2012-06-12 17:46:47 +01:00
Tim Hunt
bb410a1ecc MDL-33681 course: cannot have a section called '0'.
No reason to prevent this. It is just a matter of doing a proper test,
rather than the sloppy PHP !empty().
2012-06-12 17:45:40 +01:00
Dan Poltawski
4a126f1725 MDL-32573 - repository: make instance_config_form static 2012-06-12 22:17:29 +08:00
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