David Mudrák [Thu, 22 Jan 2015 09:02:01 +0000 (10:02 +0100)]
MDL-48493 admin: Fix PHP warning thrown if unable to detect component
The method detect_plugin_component() returns false or string. The
normalize_component() expects strings only. Passing false to it
(typically when the plugin does not declare its component) caused the
PHP warning.
Credit goes to Ankit Agarwal for spotting this during testing.
David Mudrák [Fri, 12 Dec 2014 15:46:26 +0000 (16:46 +0100)]
MDL-48493 admin: Move the acknowledgement to the plugin validation page
Previously, the acknowledgement was required only when installing
plugins from the ZIP file. It is valid when installing plugins from the
Plugins directory, too. So we display it at the validator page now to
make sure it is displayed in both cases.
There is no need to require the admin to check the acknowledgement box
now. We do not do that anywhere in admin UI (and there are more
dangerous operations than installing a plugin). Admins still can deploy
plugins manually without this tool anyway. And at the end, they are
admins. They should know what they are doing. Simply displaying the
acknowledgement message before they click the install button is enough.
David Mudrák [Fri, 12 Dec 2014 15:25:06 +0000 (16:25 +0100)]
MDL-48493 admin: Add icon to repeat permission check in plugin installer
David Mudrák [Fri, 12 Dec 2014 12:32:50 +0000 (13:32 +0100)]
MDL-48493 admin: Do not require selected plugin type on installation
Now we allow the plugin type left unselected and we attempt to
auto-detect it. Only when the auto-detection fails, the admin has to
manually select the type of the plugin.
David Mudrák [Fri, 12 Dec 2014 10:19:30 +0000 (11:19 +0100)]
MDL-48493 admin: Make plugin installer able to detect plugin component
On contrary to deeper heuristic (read: guessing) we perform in the
Plugins directory (such as looking at the names of the language files),
here we simply rely on the plugin component being correctly defined in
the version.php file.
The validator class has more robust processing, to make sure the
component declaration is not provided in a commented area of the
version.php etc. However, as it is fully acceptable that the
auto-detection fails if the version.php uses non-standard syntax, this
easier approach is valid here.
Andrew Nicols [Thu, 15 Jan 2015 06:19:36 +0000 (14:19 +0800)]
weekly release 2.9dev
Andrew Nicols [Thu, 15 Jan 2015 06:19:22 +0000 (14:19 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Tue, 13 Jan 2015 23:34:08 +0000 (00:34 +0100)]
Merge branch 'MDL-41674' of git://github.com/mr-russ/moodle
Andrew Nicols [Wed, 14 Jan 2015 00:07:32 +0000 (08:07 +0800)]
Merge branch 'master_MDL-48418' of https://github.com/greg-or/moodle-mod_assign
Eloy Lafuente (stronk7) [Tue, 13 Jan 2015 23:26:45 +0000 (00:26 +0100)]
Merge branch 'MDL-47761-master' of git://github.com/xow/moodle
Eloy Lafuente (stronk7) [Tue, 13 Jan 2015 22:45:20 +0000 (23:45 +0100)]
Merge branch 'MDL-48574_workflow_state_updated_batch_single' of https://github.com/Dave-B/moodle
Eloy Lafuente (stronk7) [Tue, 13 Jan 2015 22:22:15 +0000 (23:22 +0100)]
Merge branch 'MDL-41166-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 13 Jan 2015 14:32:22 +0000 (15:32 +0100)]
Merge branch 'MDL-48753_master' of git://github.com/markn86/moodle
Dan Poltawski [Tue, 13 Jan 2015 14:08:05 +0000 (14:08 +0000)]
Merge branch 'MDL-48675' of git://github.com/jmvedrine/moodle
Conflicts:
mod/lesson/upgrade.txt
Dan Poltawski [Tue, 13 Jan 2015 13:14:50 +0000 (13:14 +0000)]
Merge branch 'MDL-36824_m29' of https://github.com/sbourget/moodle
Dan Poltawski [Tue, 13 Jan 2015 12:49:50 +0000 (12:49 +0000)]
Merge branch 'MDL-39103-master' of git://github.com/xow/moodle
Conflicts:
mod/lesson/lib.php
Dan Poltawski [Tue, 13 Jan 2015 12:43:05 +0000 (12:43 +0000)]
Merge branch 'MDL-45784-master' of git://github.com/xow/moodle
Dan Poltawski [Tue, 13 Jan 2015 12:31:22 +0000 (12:31 +0000)]
Merge branch 'MDL-47931' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 13 Jan 2015 11:53:37 +0000 (11:53 +0000)]
Merge branch 'MDL-48474' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 13 Jan 2015 10:58:29 +0000 (10:58 +0000)]
Merge branch 'MDL-48750_m29' of https://github.com/sbourget/moodle
Dan Poltawski [Tue, 13 Jan 2015 10:26:21 +0000 (10:26 +0000)]
Merge branch 'MDL-48729_legacy_log_error' of https://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 13 Jan 2015 10:08:18 +0000 (10:08 +0000)]
Merge branch 'MDL-40326' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 13 Jan 2015 09:59:37 +0000 (09:59 +0000)]
Merge branch 'MDL-14730' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 13 Jan 2015 08:53:13 +0000 (08:53 +0000)]
Merge branch 'MDL-45848-master' of git://github.com/gurgus/moodle
Dan Poltawski [Tue, 13 Jan 2015 08:29:07 +0000 (08:29 +0000)]
Merge branch 'MDL-48510-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Thu, 25 Dec 2014 08:26:19 +0000 (13:56 +0530)]
MDL-48510 inbound: use 0 expiration for private files handler
Ankit Agarwal [Thu, 25 Dec 2014 06:17:19 +0000 (11:47 +0530)]
MDL-48510 inbound: Support disabling of expiration changes in UI
Ankit Agarwal [Thu, 25 Dec 2014 06:16:43 +0000 (11:46 +0530)]
MDL-48510 inbound: Use correct value of expiration
Andrew Nicols [Tue, 13 Jan 2015 03:43:43 +0000 (11:43 +0800)]
Merge branch 'MDL-47232_master' of https://github.com/dmonllao/moodle
Andrew Nicols [Tue, 13 Jan 2015 02:27:43 +0000 (10:27 +0800)]
Merge branch 'MDL-43898-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 12 Jan 2015 17:17:36 +0000 (18:17 +0100)]
MDL-35155 database: better sql_substr() impl. for mssql/sqlsrv + unit tests
MSSQL's substring() implementation is somehow silly/strict and unable to
perform implicit casts to integer both for the start and length parameters.
This hits Moodle badly because of another problems (MDL-23997) we decided
to cast to string all bound placeholders long ago.
So this commit just enforces the cast of the start and length parameters to
integer. And includes unit tests for using placeholders on all positions in
the sql_substr() method.
Eloy Lafuente (stronk7) [Mon, 12 Jan 2015 15:21:33 +0000 (16:21 +0100)]
Merge branch 'MDL-35155-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Mon, 12 Jan 2015 14:37:49 +0000 (14:37 +0000)]
Merge branch 'MDL-31774' of git://github.com/jmvedrine/moodle
Dan Poltawski [Mon, 12 Jan 2015 12:54:23 +0000 (12:54 +0000)]
Merge branch 'MDL-47935-master' of git://github.com/gurgus/moodle
AMOS bot [Wed, 14 Jan 2015 16:04:00 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dave Cooper [Tue, 25 Nov 2014 01:26:45 +0000 (09:26 +0800)]
MDL-45848 grading: Added ability to unset grades with advanced grading
Thanks to Mohamed Alsharaf for assistance on this patch
AMOS bot [Mon, 12 Jan 2015 16:03:57 +0000 (00:03 +0800)]
Automatically generated installer lang files
Dan Poltawski [Mon, 12 Jan 2015 11:28:12 +0000 (11:28 +0000)]
Merge branch 'MDL-44907-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Mon, 12 Jan 2015 05:56:19 +0000 (13:56 +0800)]
Merge branch 'MDL-46671-29' of https://github.com/pjking07/moodle
Sam Hemelryk [Tue, 6 Jan 2015 02:02:25 +0000 (15:02 +1300)]
MDL-48753 badges: converted func to named params
Converted the SQL params within badges_get_user_badges to
named params.
Unit tests added for this function at the same time.
UI covered by behat already.
Andrew Nicols [Mon, 12 Jan 2015 03:55:34 +0000 (11:55 +0800)]
Merge branch 'MDL-38142-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Mon, 12 Jan 2015 02:05:39 +0000 (10:05 +0800)]
Merge branch 'MDL-47692_master' of git://github.com/markn86/moodle
Gregory Faller [Wed, 17 Dec 2014 00:25:57 +0000 (10:55 +1030)]
MDL-48418 mod/assign: Fix text in 'late submission' row
Russell Smith [Sun, 8 Dec 2013 09:13:59 +0000 (20:13 +1100)]
MDL-41674 backup: Use a trie for grouped path detection.
Stephen Bourget [Sat, 10 Jan 2015 22:13:17 +0000 (17:13 -0500)]
MDL-48750 Lesson: Behat test for lesson attempt info
behat test provided by Jean-Michel Vedrine
Jean-Michel Vedrine [Thu, 1 Jan 2015 10:55:39 +0000 (11:55 +0100)]
MDL-40326 mod_lesson: progress bar is not reset by course reset
Jean-Michel Vedrine [Mon, 22 Dec 2014 20:22:21 +0000 (21:22 +0100)]
MDL-31774 mod_lesson: Wrong jumps in lessons with mutiple clusters
AMOS bot [Sat, 10 Jan 2015 16:04:03 +0000 (00:04 +0800)]
Automatically generated installer lang files
Stephen Bourget [Fri, 9 Jan 2015 23:15:27 +0000 (18:15 -0500)]
MDL-36824 Lesson: Media File should be displayed as a block
David Balch [Wed, 7 Jan 2015 18:18:21 +0000 (18:18 +0000)]
MDL-48574 assign: Test workflow_state_updated fired on batch and single.
Stephen Bourget [Fri, 9 Jan 2015 14:10:11 +0000 (09:10 -0500)]
MDL-48750 Lesson: Fix attempt info displayed by course overview block
Jean-Michel Vedrine [Wed, 31 Dec 2014 12:23:09 +0000 (13:23 +0100)]
MDL-14730 mod_lesson: allow linking to pages inside a lesson
Dave Cooper [Thu, 8 Jan 2015 08:41:20 +0000 (16:41 +0800)]
MDL-47935 Atto: Moved atto notification message position
Frederic Massart [Fri, 9 Jan 2015 03:34:24 +0000 (11:34 +0800)]
MDL-38142 mod_forum: Allow viewing of student posts in hidden courses
Jean-Michel Vedrine [Sun, 4 Jan 2015 16:40:45 +0000 (17:40 +0100)]
MDL-47931 mod_lesson: remove the useless grade_item_delete function
Jean-Michel Vedrine [Thu, 8 Jan 2015 19:59:59 +0000 (20:59 +0100)]
MDL-48675 mod_lesson: behat tests for pages edition
Jean-Michel Vedrine [Sat, 20 Dec 2014 12:35:59 +0000 (13:35 +0100)]
MDL-48675 mod_lesson: Error displayed while editing content page jumps
This change also fix MDL-32343 and MDL-31778 related to problems
when editing cluster pages.
Tim Hunt [Thu, 8 Jan 2015 17:41:51 +0000 (17:41 +0000)]
MDL-48474 qtype_shortanswer: answers were not being trimmed.
This fix is based on Oleg Sychev's suggestion. Thanks.
AMOS bot [Thu, 8 Jan 2015 16:04:05 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Thu, 8 Jan 2015 10:00:19 +0000 (10:00 +0000)]
weekly release 2.9dev
Dan Poltawski [Thu, 8 Jan 2015 10:00:17 +0000 (10:00 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Monllao [Thu, 8 Jan 2015 07:41:02 +0000 (15:41 +0800)]
MDL-47232 completion: Adding completion upgrade.txt
Ray Morris [Thu, 9 Oct 2014 15:16:27 +0000 (10:16 -0500)]
MDL-47232 completion: Completed and failed activities count as completed
Frederic Massart [Thu, 8 Jan 2015 06:14:37 +0000 (14:14 +0800)]
MDL-44907 admin: Better styling of admin settings validation errors
John Okely [Tue, 6 Jan 2015 07:24:36 +0000 (15:24 +0800)]
MDL-45784 lesson: Remove preview link for students viewing lesson
Credit to Pete Jones for the fix.
Eloy Lafuente (stronk7) [Thu, 8 Jan 2015 00:30:53 +0000 (01:30 +0100)]
Merge branch 'MDL-43242-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/upgrade.txt
Andrew Nicols [Mon, 8 Dec 2014 01:12:03 +0000 (09:12 +0800)]
MDL-43242 ajax: Final deprecation of core JS functions
Eloy Lafuente (stronk7) [Wed, 7 Jan 2015 23:45:09 +0000 (00:45 +0100)]
Merge branch 'MDL-37584-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Wed, 7 Jan 2015 23:40:00 +0000 (00:40 +0100)]
Merge branch '37680-29' of git://github.com/samhemelryk/moodle
Zachary Durber [Wed, 7 Jan 2015 07:41:22 +0000 (15:41 +0800)]
MDL-48546 filters: Split on all tags for multimedia filter check.
Eloy Lafuente (stronk7) [Wed, 7 Jan 2015 16:15:52 +0000 (17:15 +0100)]
Merge branch 'MDL-48748-master-enfix' of git://github.com/mudrd8mz/moodle
AMOS bot [Wed, 7 Jan 2015 16:03:57 +0000 (00:03 +0800)]
Automatically generated installer lang files
David Balch [Thu, 11 Dec 2014 12:21:50 +0000 (12:21 +0000)]
MDL-48574 assign: Fire workflow_state_updated event on batch and single.
This change adds the workflow_state_updated event when changing workflow
state using the single grading page and the quick grading mechanisms.
Previously, it only fired for batch updates using
process_set_batch_marking_workflow_state().
Andrew Davis [Wed, 31 Dec 2014 08:50:48 +0000 (09:50 +0100)]
MDL-48729 logs: prevent fatal error is legacy log data retrieval fails
David Monllao [Wed, 7 Jan 2015 05:43:54 +0000 (13:43 +0800)]
Merge branch 'MDL-48688-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Wed, 7 Jan 2015 05:05:15 +0000 (10:35 +0530)]
MDL-48688: inbound: remove spaces from exception
David Monllao [Wed, 7 Jan 2015 05:29:05 +0000 (13:29 +0800)]
Merge branch 'MDL-46498_master-fix' of git://github.com/markn86/moodle
Mark Nelson [Wed, 7 Jan 2015 04:48:35 +0000 (20:48 -0800)]
MDL-46498 mod_assign: fixed failing behat test due to GS
Zachary Durber [Mon, 5 Jan 2015 02:43:40 +0000 (10:43 +0800)]
MDL-48546 filters: ReDoS protection for multimedia links.
Andrew Nicols [Wed, 7 Jan 2015 04:05:01 +0000 (12:05 +0800)]
Merge branch 'MDL-45930-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Wed, 7 Jan 2015 03:07:22 +0000 (11:07 +0800)]
Merge branch 'wip_MDL-48665_m29_pwrot' of https://github.com/skodak/moodle
Andrew Nicols [Wed, 7 Jan 2015 02:52:04 +0000 (10:52 +0800)]
Merge branch 'MDL-48080_master' of https://github.com/crazyserver/moodle
Andrew Nicols [Wed, 7 Jan 2015 02:23:57 +0000 (10:23 +0800)]
Merge branch 'master_MDL-48428' of https://github.com/greg-or/moodle-mod_assign
David Monllao [Wed, 7 Jan 2015 01:37:35 +0000 (09:37 +0800)]
Merge branch 'MDL-48549_master' of git://github.com/markn86/moodle
David Monllao [Wed, 7 Jan 2015 01:11:24 +0000 (09:11 +0800)]
Merge branch 'wip-MDL-48523-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Wed, 7 Jan 2015 01:11:41 +0000 (02:11 +0100)]
Merge branch 'MDL-32088-master' of git://github.com/danpoltawski/moodle
David Monllao [Wed, 7 Jan 2015 01:05:51 +0000 (09:05 +0800)]
Merge branch 'MDL-48697-master' of git://github.com/ankitagarwal/moodle
David Monllao [Wed, 7 Jan 2015 00:47:37 +0000 (08:47 +0800)]
Merge branch 'MDL-48688-master' of git://github.com/ankitagarwal/moodle
Helen Foster [Tue, 6 Jan 2015 19:42:09 +0000 (20:42 +0100)]
MDL-48748 lang: Merge English strings from the en_fix language pack
Jean-Michel Vedrine [Sun, 4 Jan 2015 15:57:35 +0000 (16:57 +0100)]
MDL-48034 mod_lesson: grade capability missing RISK_XSS
Dan Poltawski [Tue, 6 Jan 2015 12:21:01 +0000 (12:21 +0000)]
Merge branch 'MDL-44393-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 6 Jan 2015 11:57:58 +0000 (11:57 +0000)]
Merge branch 'MDL-46015' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 6 Jan 2015 11:45:23 +0000 (11:45 +0000)]
Merge branch 'm28_MDL-46814' of https://github.com/totara/moodle
Dan Poltawski [Tue, 6 Jan 2015 11:26:41 +0000 (11:26 +0000)]
Merge branch 'MDL-47070' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 6 Jan 2015 11:22:45 +0000 (11:22 +0000)]
Merge branch 'MDL-48372-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 6 Jan 2015 11:19:20 +0000 (11:19 +0000)]
Merge branch 'MDL-48442-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 6 Jan 2015 11:11:42 +0000 (11:11 +0000)]
Merge branch 'MDL-48534_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 6 Jan 2015 11:09:41 +0000 (11:09 +0000)]
Merge branch 'MDL-48655-master' of git://github.com/merrill-oakland/moodle
Simey Lameze [Tue, 11 Nov 2014 01:33:35 +0000 (09:33 +0800)]
MDL-47964 auth_shibboleth: Fix DOS on the shibboleth logout
Andrew Nicols [Tue, 6 Jan 2015 07:51:12 +0000 (15:51 +0800)]
Merge branch 'MDL-48640-duplicated-code' of https://github.com/rougeth/moodle
