Commit graph

54494 commits

Author SHA1 Message Date
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
Eloy Lafuente (stronk7)
74ea1b95f4 MDL-32117 equella: add missing MOODLE_INTERNAL + phpdocs tidy 2012-06-12 02:23:14 +02:00
Eloy Lafuente (stronk7)
37b8257de5 Merge branch 'equella' of git://github.com/danpoltawski/moodle 2012-06-12 02:22:26 +02:00
Andrew Robert Nicols
0080872fc4 MDL-33608 Correct modulename_link for the label module 2012-06-11 12:41:25 +01:00
Barbara Ramiro
d76dfe97dd MDL-33005 Replaced drag and drop arrow with animated gif 2012-06-11 19:37:33 +08:00
Barbara Ramiro
398c04dc59 MDL-33156 Customized 16px icons and generic image icons 2012-06-11 16:28:54 +08:00
Dongsheng Cai
39c60294a6 MDL-33513 box.net repository should have filename in source field 2012-06-11 17:41:32 +10:00
Dan Poltawski
2365213fdb MDL-33623 - course: remove incorrect logic for marker moving 2012-06-11 15:11:10 +08:00
Frederic Massart
4988b54667 MDL-33317 Theme: added jQuery noConflict to myMobile 2012-06-11 14:54:54 +08:00
Jerome Mouneyrac
ecd1bdf420 MDL-31863 fix responseerror when no files are found 2012-06-11 14:12:00 +08:00
Aparup Banerjee
fef6b15ad9 MDL-31863 Web Service : get_files() optional $modified timestamp returns files changed after given time. 2012-06-11 14:06:56 +08:00
Yang Yang
8f3039576a MDL-31863 Web service : added modified to parameters and modifiedtime to description 2012-06-11 14:06:46 +08:00
Aparup Banerjee
42fd396171 Merge branch 'MDL-33548' of git://github.com/timhunt/moodle 2012-06-11 13:55:20 +08:00
Aparup Banerjee
6b8b0b2e68 MDL-34400 Libraries : maintained naming rule by removing stray mod_ function and class prefixes from activity modules.
This rule @ http://docs.moodle.org/dev/Activity_modules still stands for now.
2012-06-11 13:34:47 +08:00
Tim Hunt
33d7737711 MDL-33610 theme - increase activity icon spacing 2012-06-11 12:21:13 +08:00
Dan Poltawski
3d8fe4820a MDL-33623 - course: add unit tests for section moving
Including tracking of the course marker updates
2012-06-11 11:46:22 +08:00
Eloy Lafuente (stronk7)
3ea1330949 MDL-33455 restore: process grade_grades only if user matches.
Note this has been applied both to individual activities grade_grades
and to general ones.
2012-06-11 11:30:20 +08:00
Dan Poltawski
d66e5720a1 MDL-32117 - equella: prevent errors when no username 2012-06-11 10:08:16 +08:00
Christopher Tombleson
01b5936cd0 MDL-32937 Add drag and drop support to SCORM 2012-06-11 12:18:32 +12:00
Petr Skoda
8d475fe4fe MDL-33543 fix mod_data E_STRICT issue when adding fields with file size limits 2012-06-10 10:05:59 +02:00
Dongsheng Cai
8a288971e2 MDL-33513: Make files->source field consistent 2012-06-10 17:47:00 +10:00
Eloy Lafuente (stronk7)
f0852f474b MDL-33630 backup: invalidate ids cache on temptable drop. 2012-06-10 04:57:40 +02:00
AMOS bot
73da957671 Automatically generated installer lang files 2012-06-09 00:31:15 +00:00
Eloy Lafuente (stronk7)
fcbf68fd05 Merge branch 'w23_MDL-33595_m23_phpunitinit' of git://github.com/skodak/moodle 2012-06-08 19:32:26 +02:00
Eloy Lafuente (stronk7)
997c7e2744 Merge branch 'MDL-33471' of git://github.com/timhunt/moodle 2012-06-08 17:08:18 +02:00
Tim Hunt
815fcecc40 MDL-33471 quiz cron: better mtrace output for overdue handling 2012-06-08 16:02:01 +01:00
Tim Hunt
4c7f377d9b MDL-33612 quiz: Improve page title 'Editing quiz'
Include the quiz name in the title. Also, add two missing format_string
calls around $quiz->name.
2012-06-08 11:47:03 +01:00
Petr Skoda
7cb76d1645 MDL-33595 fix recent initial PHPUnit init regression 2012-06-08 11:50:03 +02:00
Eloy Lafuente (stronk7)
78117cb1a4 MDL-33465 fix incorrect merge conflict resolution 2012-06-08 10:55:39 +02:00