moodle.git
9 years agoMerge branch 'w18_MDL-32589_m23_proxytest' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 30 Apr 2012 09:00:23 +0000 (17:00 +0800)]
Merge branch 'w18_MDL-32589_m23_proxytest' of git://github.com/skodak/moodle

9 years agoMDL-32589 remove bogus webproxy whitelisting
Petr Skoda [Mon, 30 Apr 2012 06:35:16 +0000 (08:35 +0200)]
MDL-32589 remove bogus webproxy whitelisting

Thanks Dan Poltawski!

9 years agoMerge branch 'MDL-32357' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 30 Apr 2012 06:29:40 +0000 (14:29 +0800)]
Merge branch 'MDL-32357' of git://github.com/timhunt/moodle

9 years agoMerge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 30 Apr 2012 04:54:22 +0000 (12:54 +0800)]
Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle

9 years agoMDL-3030 mod_quiz: fix training whitespace
Dan Poltawski [Mon, 30 Apr 2012 02:24:02 +0000 (10:24 +0800)]
MDL-3030 mod_quiz: fix training whitespace

9 years agoMerge branch 'MDL-3030' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 30 Apr 2012 03:05:19 +0000 (11:05 +0800)]
Merge branch 'MDL-3030' of git://github.com/timhunt/moodle

9 years agoMerge branch 'w18_MDL-32627_m23_userajax' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 30 Apr 2012 01:50:04 +0000 (09:50 +0800)]
Merge branch 'w18_MDL-32627_m23_userajax' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-32613' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 30 Apr 2012 01:30:24 +0000 (09:30 +0800)]
Merge branch 'MDL-32613' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-32638-workshop-files' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Mon, 30 Apr 2012 01:26:38 +0000 (13:26 +1200)]
Merge branch 'MDL-32638-workshop-files' of git://github.com/mudrd8mz/moodle

9 years agoMerge branch 'master_MDL-32597' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 30 Apr 2012 01:21:54 +0000 (13:21 +1200)]
Merge branch 'master_MDL-32597' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'MDL-28735-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 30 Apr 2012 01:19:56 +0000 (13:19 +1200)]
Merge branch 'MDL-28735-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'w18_MDL-32651_m23_phpunit6' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 30 Apr 2012 01:16:24 +0000 (09:16 +0800)]
Merge branch 'w18_MDL-32651_m23_phpunit6' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-29044-master-3' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 30 Apr 2012 00:50:38 +0000 (12:50 +1200)]
Merge branch 'MDL-29044-master-3' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-26523_grader' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 30 Apr 2012 00:46:48 +0000 (12:46 +1200)]
Merge branch 'MDL-26523_grader' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-31429_paypal_messages' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 30 Apr 2012 00:33:05 +0000 (12:33 +1200)]
Merge branch 'MDL-31429_paypal_messages' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'w18_MDL-32676_m23_yuibootstrap' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 30 Apr 2012 00:26:07 +0000 (12:26 +1200)]
Merge branch 'w18_MDL-32676_m23_yuibootstrap' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-19391-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 30 Apr 2012 00:16:35 +0000 (12:16 +1200)]
Merge branch 'MDL-19391-master-1' of git://git.luns.net.uk/moodle

9 years agoMDL-31510 grader report: Fixed whitespace
Sam Hemelryk [Mon, 30 Apr 2012 00:13:00 +0000 (12:13 +1200)]
MDL-31510 grader report: Fixed whitespace

9 years agoMerge branch 'MDL-31510_group_activities' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 30 Apr 2012 00:11:23 +0000 (12:11 +1200)]
Merge branch 'MDL-31510_group_activities' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-32238-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 30 Apr 2012 00:03:01 +0000 (12:03 +1200)]
Merge branch 'MDL-32238-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-32624_master_wip' of git://github.com/grabs/moodle
Sam Hemelryk [Sun, 29 Apr 2012 23:57:40 +0000 (11:57 +1200)]
Merge branch 'MDL-32624_master_wip' of git://github.com/grabs/moodle

9 years agoMDL-31731 - new grading form - Marking Guide
Dan Marsden [Thu, 19 Apr 2012 04:31:03 +0000 (16:31 +1200)]
MDL-31731 - new grading form - Marking Guide

9 years agoMDL-32676 improve YUI init performance via combo loader caching
Petr Skoda [Sun, 29 Apr 2012 17:00:51 +0000 (19:00 +0200)]
MDL-32676 improve YUI init performance via combo loader caching

9 years agoMDL-32357 Try to fix unread post notification for blog-style forums.
Tim Hunt [Fri, 6 Apr 2012 08:27:34 +0000 (09:27 +0100)]
MDL-32357 Try to fix unread post notification for blog-style forums.

I know that showing unread posts is not 100% blog-style, but I think
it is useful functionality, therefore, I chose to fix it, rather than,
say, disable it completely.

I think this fix will only affect blog-style forums since
forum_print_latest_discussions is only called with mode 'plain' in
three places:
1. Blog-style forums - the case we want to fix,
2. Site news forum, and
3. Social course format.

In all cases, having read tracking work properly seems like the
right thing to do.

9 years agoMDL-32673 ajax: remove legacy debugging info
Dan Poltawski [Sat, 28 Apr 2012 07:00:37 +0000 (15:00 +0800)]
MDL-32673 ajax: remove legacy debugging info

9 years agoMDL-32613 qbank: improve print_choose_qtype_to_add_form for contrib modules.
Tim Hunt [Tue, 24 Apr 2012 11:04:06 +0000 (12:04 +0100)]
MDL-32613 qbank: improve print_choose_qtype_to_add_form for contrib modules.

9 years agoMDL-3030 quiz overdue handling: allow access to summary during grace period
Tim Hunt [Thu, 26 Apr 2012 18:02:43 +0000 (19:02 +0100)]
MDL-3030 quiz overdue handling: allow access to summary during grace period

9 years agoMDL-3030 quiz statistics: fix stict syntax problem.
Tim Hunt [Thu, 26 Apr 2012 09:12:16 +0000 (10:12 +0100)]
MDL-3030 quiz statistics: fix stict syntax problem.

9 years agoMDL-3030 quiz overdue handling: cron to update overdue attempts.
Tim Hunt [Wed, 25 Apr 2012 11:25:06 +0000 (12:25 +0100)]
MDL-3030 quiz overdue handling: cron to update overdue attempts.

9 years agoMDL-3030 quiz overdue handling: test state, not timefinish where applicable.
Tim Hunt [Tue, 24 Apr 2012 14:01:12 +0000 (15:01 +0100)]
MDL-3030 quiz overdue handling: test state, not timefinish where applicable.

9 years agoMDL-3030 quiz overdue handling: ignore responses received much too late.
Tim Hunt [Fri, 20 Apr 2012 15:55:52 +0000 (16:55 +0100)]
MDL-3030 quiz overdue handling: ignore responses received much too late.

9 years agoMDL-3030 quiz overdue handling: catch the overdue event and send message.
Tim Hunt [Fri, 20 Apr 2012 15:24:33 +0000 (16:24 +0100)]
MDL-3030 quiz overdue handling: catch the overdue event and send message.

9 years agoMDL-3030 quiz overdue handling: back-end code for the new transitions
Tim Hunt [Fri, 20 Apr 2012 13:51:15 +0000 (14:51 +0100)]
MDL-3030 quiz overdue handling: back-end code for the new transitions

9 years agoMDL-3030 quiz overdue handling: trigger automatic state transitions.
Tim Hunt [Wed, 18 Apr 2012 18:18:55 +0000 (19:18 +0100)]
MDL-3030 quiz overdue handling: trigger automatic state transitions.

Here, we catch all the places where a student might be accessing their
own attempts, and make sure any automatic state transitions that
should happen, do happen, before the student sees the attempt.

The places where we need to check this are view.php, startattempt.php
and processattempt.php.

We do not really need to check attempt.php or summary.php, because if
the student is on one of those pages, the JavaScript timer will
auto-submit when time expires, taking them to processattempt.php,
which will do the acutal work.

We intentionally do not trigger state transition when a teacher is
looking at a student's quiz attemp. We will trigger state transitions
on cron, but that is still to do.

Also, the body of the process_... methods still needs to be written.

9 years agoMDL-3030 quiz overdue handling: show the attempt state in the reports.
Tim Hunt [Wed, 18 Apr 2012 13:38:00 +0000 (14:38 +0100)]
MDL-3030 quiz overdue handling: show the attempt state in the reports.

9 years agoMDL-3030 quiz overdue handling: only finished attempts in stats.
Tim Hunt [Wed, 16 Nov 2011 16:48:51 +0000 (16:48 +0000)]
MDL-3030 quiz overdue handling: only finished attempts in stats.

9 years agoMDL-3030 quiz overdue handling: show attempt state in the reports.
Tim Hunt [Wed, 16 Nov 2011 16:42:38 +0000 (16:42 +0000)]
MDL-3030 quiz overdue handling: show attempt state in the reports.

9 years agoMDL-3030 quiz overdue handling: show attempt state on the review page.
Tim Hunt [Wed, 16 Nov 2011 16:37:14 +0000 (16:37 +0000)]
MDL-3030 quiz overdue handling: show attempt state on the review page.

9 years agoMDL-3030 quiz overdue handling: display message on the summary page.
Tim Hunt [Tue, 15 Nov 2011 17:25:26 +0000 (17:25 +0000)]
MDL-3030 quiz overdue handling: display message on the summary page.

This change also includes a clean-up of how we display and initialise the countdown timer.

9 years agoMDL-3030 quiz overdue handling: show attempt state on the view page
Tim Hunt [Mon, 14 Nov 2011 15:35:46 +0000 (15:35 +0000)]
MDL-3030 quiz overdue handling: show attempt state on the view page

9 years agoMDL-3030 quiz overdue handling: backup and restore new settings.
Tim Hunt [Thu, 10 Nov 2011 18:39:33 +0000 (18:39 +0000)]
MDL-3030 quiz overdue handling: backup and restore new settings.

9 years agoMDL-3030 quiz overdue handling: new capability
Tim Hunt [Thu, 10 Nov 2011 18:32:34 +0000 (18:32 +0000)]
MDL-3030 quiz overdue handling: new capability

9 years agoMDL-3030 quiz overdue handling: new settings on quiz form and admin.
Tim Hunt [Thu, 10 Nov 2011 18:27:31 +0000 (18:27 +0000)]
MDL-3030 quiz overdue handling: new settings on quiz form and admin.

9 years agoMDL-3030 quiz settings: reorganise form before adding new fields.
Tim Hunt [Thu, 10 Nov 2011 17:25:49 +0000 (17:25 +0000)]
MDL-3030 quiz settings: reorganise form before adding new fields.

9 years agoMDL-3030 quiz db: add comments to many colums, and reorder more logically.
Tim Hunt [Thu, 10 Nov 2011 17:15:18 +0000 (17:15 +0000)]
MDL-3030 quiz db: add comments to many colums, and reorder more logically.

9 years agoMDL-3030 quiz overdue handling: new DB columns.
Tim Hunt [Thu, 10 Nov 2011 16:37:18 +0000 (16:37 +0000)]
MDL-3030 quiz overdue handling: new DB columns.

9 years agoMDL-32638 workshop_pluginfile() checks for access rights to get the submission files
David Mudrak [Thu, 26 Apr 2012 13:51:34 +0000 (15:51 +0200)]
MDL-32638 workshop_pluginfile() checks for access rights to get the submission files

9 years agoMDL-32638 fixed capability checks for instructauthors and instructreviewers
David Mudrak [Thu, 26 Apr 2012 13:23:55 +0000 (15:23 +0200)]
MDL-32638 fixed capability checks for instructauthors and instructreviewers

The workshop_pluginfile() can't be more restrictive than the code that
actually displays the text with the embedded images. To view both
instructions fields in view.php, the capability to view the workshop is
enough. So the same level of access control is applied here by
require_login() at the top of the function.

9 years agoMDL-32638 improved file browser access to submission_content and submission_attachmen...
David Mudrak [Thu, 26 Apr 2012 12:50:57 +0000 (14:50 +0200)]
MDL-32638 improved file browser access to submission_content and submission_attachment areas

The user has to have viewallsubmissions capability to be able to see the
submission files in the browser. Additionally, in the separate groups
mode, the user has to have accessallgroups or share at least one group
with the submission author to view their files.

9 years agoMDL-32638 fixed workshop file info library comments
David Mudrak [Thu, 26 Apr 2012 10:00:22 +0000 (12:00 +0200)]
MDL-32638 fixed workshop file info library comments

9 years agoMDL-32651 increase memory limit to 2G when running phpunit tests
Petr Skoda [Thu, 26 Apr 2012 18:36:37 +0000 (20:36 +0200)]
MDL-32651 increase memory limit to 2G when running phpunit tests

This should help when running tests with coverage reports.

9 years agoMDL-32627 enable ajax by default in new user form
Petr Skoda [Thu, 26 Apr 2012 17:10:19 +0000 (19:10 +0200)]
MDL-32627 enable ajax by default in new user form

This change makes the new user form consistent with install.xml default. I do not think we should discourage ajax any more.

9 years agoMDL-32589 phpunit: allow proxy server specification via config.php
Petr Skoda [Thu, 26 Apr 2012 18:31:19 +0000 (20:31 +0200)]
MDL-32589 phpunit: allow proxy server specification via config.php

9 years agoweekly release 2.3dev
Eloy Lafuente (stronk7) [Fri, 27 Apr 2012 10:46:57 +0000 (12:46 +0200)]
weekly release 2.3dev

9 years agoFix permissions
Eloy Lafuente (stronk7) [Fri, 27 Apr 2012 10:45:22 +0000 (12:45 +0200)]
Fix permissions

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Fri, 27 Apr 2012 10:38:28 +0000 (12:38 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoRevert "MDL-32249 completion: Round course grades and remove hardcoded string"
Eloy Lafuente (stronk7) [Fri, 27 Apr 2012 10:03:26 +0000 (12:03 +0200)]
Revert "MDL-32249 completion: Round course grades and remove hardcoded string"

This reverts commit 412cecc32bd33b108008791090f420b6892b4cac.

9 years agoMDL-26523 grade: fixed a called to addHelpButton() that was asking for a non-existent...
Andrew Davis [Thu, 12 Apr 2012 05:34:14 +0000 (12:34 +0700)]
MDL-26523 grade: fixed a called to addHelpButton() that was asking for a non-existent string

9 years agoMerge branch 'wip-MDL-26014-master' of git://github.com/phalacee/moodle
Eloy Lafuente (stronk7) [Fri, 27 Apr 2012 01:15:51 +0000 (03:15 +0200)]
Merge branch 'wip-MDL-26014-master' of git://github.com/phalacee/moodle

9 years agoAutomatically generated installer lang files
AMOS bot [Fri, 27 Apr 2012 00:31:39 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMDL-31096 Handle addition/removal of mod-indent-huge to match non-ajax display
Andrew Robert Nicols [Thu, 26 Apr 2012 10:02:39 +0000 (11:02 +0100)]
MDL-31096 Handle addition/removal of mod-indent-huge to match non-ajax display

9 years agoMDL-31096 Add hiding of activity descriptions
Andrew Robert Nicols [Thu, 26 Apr 2012 09:39:47 +0000 (10:39 +0100)]
MDL-31096 Add hiding of activity descriptions

9 years agoMDL-31510 grade: made the user report observe $cm->uservisible so that activities...
Andrew Davis [Sun, 8 Apr 2012 04:10:44 +0000 (11:10 +0700)]
MDL-31510 grade: made the user report observe $cm->uservisible so that activities not available to a student because of groups do not appear on their user report

9 years agoRevert MDL-31215 Add the ability to change activity titles using AJAX calls
Andrew Robert Nicols [Thu, 26 Apr 2012 08:56:41 +0000 (09:56 +0100)]
Revert MDL-31215 Add the ability to change activity titles using AJAX calls

This *partially* reverts commit 6a14c4ffdd01d6b2069e8c27bb2b7df26dcdbd6a.

Note however parts of that commit were unrelated and haven't been
reverted.

9 years agoMDL-26014 - blog - improving the label for the URL of an external blog feed
Jason Fowler [Mon, 16 Apr 2012 02:07:44 +0000 (10:07 +0800)]
MDL-26014 - blog - improving the label for the URL of an external blog feed

9 years agoMDL-31263 lib/ajax/blocks.php fix nonsensical url
Dan Poltawski [Thu, 26 Apr 2012 03:03:05 +0000 (11:03 +0800)]
MDL-31263 lib/ajax/blocks.php fix nonsensical url

9 years agoMerge branch 'MDL-31052-js-rewrite' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Thu, 26 Apr 2012 01:32:08 +0000 (03:32 +0200)]
Merge branch 'MDL-31052-js-rewrite' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-19263-master' of https://github.com/mackensen/moodle
Eloy Lafuente (stronk7) [Thu, 26 Apr 2012 00:46:21 +0000 (02:46 +0200)]
Merge branch 'MDL-19263-master' of https://github.com/mackensen/moodle

9 years agoMerge branch 'MDL-32630-workshop-calendar' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Thu, 26 Apr 2012 00:17:00 +0000 (02:17 +0200)]
Merge branch 'MDL-32630-workshop-calendar' of git://github.com/mudrd8mz/moodle

9 years agoMDL-32630 workshop_calendar_update() does not check for calendar permissions
David Mudrak [Wed, 25 Apr 2012 13:35:59 +0000 (15:35 +0200)]
MDL-32630 workshop_calendar_update() does not check for calendar permissions

As discussed in MDL-32631, calendar_event::update() should not do
capability checks at all. Until that issue is fixed, we just explicitly
declare that no capability checks should be done.

The function workshop_calendar_update() is executed when adding or
updating a workshop instance (where permissions to modify the instance
were already checked and are sufficient) and in the upgrade code (where
no check should be performed anyway).

9 years agoMerge branch 'MDL-32471-thumbnails' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 25 Apr 2012 13:14:27 +0000 (15:14 +0200)]
Merge branch 'MDL-32471-thumbnails' of git://github.com/mudrd8mz/moodle

9 years agoMDL-32471 fixed strict standards in the declaration of send_file() in assignment...
David Mudrak [Wed, 25 Apr 2012 11:48:12 +0000 (13:48 +0200)]
MDL-32471 fixed strict standards in the declaration of send_file() in assignment types

All subtypes declaration should be compatible with that of assignment_base::send_file()

9 years agoMDL-32471 improved SQL to prevent potential full table scans
David Mudrak [Wed, 25 Apr 2012 11:44:36 +0000 (13:44 +0200)]
MDL-32471 improved SQL to prevent potential full table scans

9 years agoMerge branch 'MDL-32192_rename_string' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Wed, 25 Apr 2012 11:07:48 +0000 (13:07 +0200)]
Merge branch 'MDL-32192_rename_string' of git://github.com/andyjdavis/moodle

9 years agoMDL-32471 just a trivial change to prevent eventual issues with various preview modes
David Mudrak [Wed, 25 Apr 2012 09:53:57 +0000 (11:53 +0200)]
MDL-32471 just a trivial change to prevent eventual issues with various preview modes

9 years agoMDL-32471 adding preview generation unit tests
David Mudrak [Wed, 25 Apr 2012 09:25:56 +0000 (11:25 +0200)]
MDL-32471 adding preview generation unit tests

The test image is a public domain file from
http://commons.wikimedia.org/wiki/File:Easter_eggs_-_onion_decoration.jpg

9 years agoMerge branch 'wip-MDL-32417-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 25 Apr 2012 01:40:53 +0000 (03:40 +0200)]
Merge branch 'wip-MDL-32417-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'wip-MDL-26959-master' of git://github.com/phalacee/moodle
Eloy Lafuente (stronk7) [Wed, 25 Apr 2012 01:20:23 +0000 (03:20 +0200)]
Merge branch 'wip-MDL-26959-master' of git://github.com/phalacee/moodle

9 years agoMDL-32322 tests: apply changes in simpletests (now deleted) to phpunit ones.
Eloy Lafuente (stronk7) [Wed, 25 Apr 2012 01:09:42 +0000 (03:09 +0200)]
MDL-32322 tests: apply changes in simpletests (now deleted) to phpunit ones.

9 years agoMerge branch 'MDL-32322' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 25 Apr 2012 01:02:14 +0000 (03:02 +0200)]
Merge branch 'MDL-32322' of git://github.com/timhunt/moodle

Conflicts:
mod/quiz/report/simpletest/testreportlib.php
mod/quiz/report/statistics/simpletest/test_qstats.php

9 years agoMDL-32490 Offline assignment: phpdocs and whitespace fixes
Eloy Lafuente (stronk7) [Wed, 25 Apr 2012 00:40:35 +0000 (02:40 +0200)]
MDL-32490 Offline assignment: phpdocs and whitespace fixes

9 years agoAutomatically generated installer lang files
AMOS bot [Wed, 25 Apr 2012 00:31:34 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMerge branch 'MDL-32490' of git://github.com/bostelm/moodle
Eloy Lafuente (stronk7) [Wed, 25 Apr 2012 00:28:50 +0000 (02:28 +0200)]
Merge branch 'MDL-32490' of git://github.com/bostelm/moodle

9 years agoMerge branch 'MDL-32566_master' of git://github.com/kordan/moodle
Eloy Lafuente (stronk7) [Wed, 25 Apr 2012 00:05:09 +0000 (02:05 +0200)]
Merge branch 'MDL-32566_master' of git://github.com/kordan/moodle

9 years agoMerge branch 'MDL-32082_messaging_readability' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 24 Apr 2012 23:55:24 +0000 (01:55 +0200)]
Merge branch 'MDL-32082_messaging_readability' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'wip-MDL-30478-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Tue, 24 Apr 2012 23:11:38 +0000 (01:11 +0200)]
Merge branch 'wip-MDL-30478-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'MDL-31548-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Tue, 24 Apr 2012 19:56:57 +0000 (21:56 +0200)]
Merge branch 'MDL-31548-master' of git://github.com/ankitagarwal/moodle

9 years agoMDL-32624 - initialbars disappears
Andreas Grabs [Tue, 24 Apr 2012 19:26:56 +0000 (21:26 +0200)]
MDL-32624 - initialbars disappears

9 years agoMDL-19391 Database : fixed icon size
Aparup Banerjee [Fri, 16 Sep 2011 03:44:14 +0000 (11:44 +0800)]
MDL-19391 Database : fixed icon size

9 years agoMDL-32471 using === for string comparison
David Mudrak [Tue, 24 Apr 2012 14:10:46 +0000 (16:10 +0200)]
MDL-32471 using === for string comparison

Thanks to Petr Skoda for spotting this during the peer-review.

9 years agoMDL-32471 remove orphaned preview files via cron
David Mudrak [Tue, 24 Apr 2012 13:14:09 +0000 (15:14 +0200)]
MDL-32471 remove orphaned preview files via cron

9 years agoMDL-32471 preview thumbnails support for other component types
David Mudrak [Tue, 24 Apr 2012 12:29:44 +0000 (14:29 +0200)]
MDL-32471 preview thumbnails support for other component types

This commit affects mostly qtypes. Other standard components either do
not have pluginfile handler or have been already updated to the new API.

9 years agoMDL-32471 preview thumbnails support for blocks
David Mudrak [Tue, 24 Apr 2012 12:01:53 +0000 (14:01 +0200)]
MDL-32471 preview thumbnails support for blocks

block_xxx_pluginfile() now accepts the $options parameter that is to be passed
to the send_stored_file() function.

9 years agoMDL-31914 db fix - cannot use table aliases on DELETE statements. Credit goes to...
Eloy Lafuente (stronk7) [Tue, 24 Apr 2012 11:07:11 +0000 (13:07 +0200)]
MDL-31914 db fix - cannot use table aliases on DELETE statements. Credit goes to Andrew Nicols (LUNS).

9 years agoMerge branch 'MDL-32249' of github.com:srynot4sale/moodle
Eloy Lafuente (stronk7) [Tue, 24 Apr 2012 10:56:30 +0000 (12:56 +0200)]
Merge branch 'MDL-32249' of github.com:srynot4sale/moodle

9 years agoMDL-31914 Ensure that completion criteria are deleted when removing a course module
Andrew Robert Nicols [Tue, 6 Mar 2012 14:06:04 +0000 (14:06 +0000)]
MDL-31914 Ensure that completion criteria are deleted when removing a course module

Conflicts:

lib/db/upgrade.php
version.php

9 years agoMDL-32471 preview thumbnails support for activity modules
David Mudrak [Wed, 18 Apr 2012 13:56:09 +0000 (15:56 +0200)]
MDL-32471 preview thumbnails support for activity modules

Activity module's xxx_pluginfile() now accepts the $options parameter
that is to be passed to the send_stored_file() function.

9 years agoMDL-32471 send_stored_file() now supports the preview option
David Mudrak [Tue, 17 Apr 2012 22:43:16 +0000 (00:43 +0200)]
MDL-32471 send_stored_file() now supports the preview option

If for any reason the preview image can't be generated for the given
file (eg we do not support its mimetype yet), the function will send
404 Not Found HTTP header. This will be useful for the lazy loading of
the file thumbnails as the JavaScript will simply ignore such response
and will not replace the default icon for the file.

In the future, a fallback thumbnail generator can be implemented that
would generate some sort of default preview for all files (eg using
the mimetype icon like some desktop OS do).

9 years agoMDL-32471 introducing file_storage::get_file_preview() method
David Mudrak [Tue, 17 Apr 2012 22:41:01 +0000 (00:41 +0200)]
MDL-32471 introducing file_storage::get_file_preview() method

9 years agoMDL-32471 introducing generate_image_thumbnail() function
David Mudrak [Tue, 17 Apr 2012 22:37:49 +0000 (00:37 +0200)]
MDL-32471 introducing generate_image_thumbnail() function

This helper function uses GD library to generate a thumbnail of the
given image file.