Dan Poltawski [Mon, 22 Dec 2014 15:38:49 +0000 (15:38 +0000)]
Merge branch 'MDL-42166-master' of git://github.com/xow/moodle
Dan Poltawski [Mon, 22 Dec 2014 15:25:25 +0000 (15:25 +0000)]
Merge branch 'MDL-48638-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Mon, 22 Dec 2014 15:22:37 +0000 (15:22 +0000)]
Merge branch 'MDL-48643-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Mon, 22 Dec 2014 15:13:41 +0000 (15:13 +0000)]
MDL-43004 blog: fix upgrade.txt typo
Dan Poltawski [Mon, 22 Dec 2014 15:09:53 +0000 (15:09 +0000)]
Merge branch 'MDL-43004-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 22 Dec 2014 15:07:59 +0000 (15:07 +0000)]
MDL-44260 uplodate: move deprecated functions to deprecatedlib
Dan Poltawski [Mon, 22 Dec 2014 14:57:30 +0000 (14:57 +0000)]
Merge branch 'MDL-44260-master' of git://github.com/lameze/moodle
Dan Poltawski [Mon, 22 Dec 2014 14:36:46 +0000 (14:36 +0000)]
Merge branch 'MDL-48062-master' of https://github.com/dthies/moodle
Dan Poltawski [Mon, 22 Dec 2014 14:15:09 +0000 (14:15 +0000)]
Merge branch 'm29_MDL-48423' of https://github.com/totara/moodle
Dan Poltawski [Mon, 22 Dec 2014 14:04:05 +0000 (14:04 +0000)]
Merge branch 'MDL-48224-master' of git://github.com/xow/moodle
Dan Poltawski [Mon, 22 Dec 2014 13:56:19 +0000 (13:56 +0000)]
Merge branch 'MDL-48445-master' of https://github.com/jmarshall-netspot/moodle
Dan Poltawski [Mon, 22 Dec 2014 13:52:36 +0000 (13:52 +0000)]
Merge branch 'MDL-48534_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 22 Dec 2014 13:43:51 +0000 (13:43 +0000)]
Merge branch 'm29_MDL-48483' of https://github.com/totara/moodle
Dan Poltawski [Mon, 22 Dec 2014 13:41:11 +0000 (13:41 +0000)]
Merge branch 'MDL-48580-master' of git://github.com/lameze/moodle
Dan Poltawski [Mon, 22 Dec 2014 13:37:52 +0000 (13:37 +0000)]
Merge branch 'patch-1' of https://github.com/jrchamp/moodle
Dan Poltawski [Mon, 22 Dec 2014 13:12:48 +0000 (13:12 +0000)]
MDL-48653 behat: fix incorrect phpdoc
Dan Poltawski [Mon, 22 Dec 2014 13:10:44 +0000 (13:10 +0000)]
Merge branch 'MDL-48653' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 22 Dec 2014 13:05:51 +0000 (13:05 +0000)]
Merge branch 'MDL-48088-master' of git://github.com/jethac/moodle
Dan Poltawski [Mon, 22 Dec 2014 12:13:31 +0000 (12:13 +0000)]
Merge branch 'MDL-42616-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 22 Dec 2014 11:53:15 +0000 (11:53 +0000)]
Merge branch 'MDL-48666' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 22 Dec 2014 11:16:41 +0000 (11:16 +0000)]
Merge branch 'MDL-48244' of git://github.com/jmvedrine/moodle
Eric Merrill [Wed, 17 Dec 2014 20:20:34 +0000 (15:20 -0500)]
MDL-48643 Javascript: Create modals hidden, then show, to prevent scroll
Modal dialogs need to be created with visible: false and then call
.show() on it to make it visible. This prevents the page from jumping to
the top.
Jean-Michel Vedrine [Sat, 22 Nov 2014 14:46:04 +0000 (15:46 +0100)]
MDL-48244 Lesson: add custom end of lesson reached completion rule
sam marshall [Thu, 27 Nov 2014 18:33:39 +0000 (18:33 +0000)]
MDL-42616 filelib: New user interface to edit and add file types (2/2)
New admin tool tool_filetypes which uses the new API to add and
modify file type definitions.
sam marshall [Mon, 15 Dec 2014 10:41:47 +0000 (10:41 +0000)]
MDL-42616 filelib: Use config value for custom MIME types (1/2)
Uses a new optional config variable to define custom MIME types
in JSON format. Includes new API for accessing and modifying
this data.
Tim Hunt [Fri, 19 Dec 2014 14:34:23 +0000 (14:34 +0000)]
MDL-48666 quiz: let JS to get a Qs slot number on the summary page
Brian Barnes [Fri, 19 Dec 2014 01:26:18 +0000 (14:26 +1300)]
MDL-48483 admin: attached color label to input control
Daniel Thies [Thu, 13 Nov 2014 02:41:28 +0000 (20:41 -0600)]
MDL-48062 atto_image: Add image select on single click
Tim Hunt [Thu, 18 Dec 2014 19:29:29 +0000 (19:29 +0000)]
MDL-48653 behat: Steps to click and dismiss a dialogue.
We already had the corresponding
I click on "Home" "link" confirming the dialogue
but I needed the opposite
I click on "Home" "link" dismissing the dialogue
Eric Merrill [Thu, 18 Dec 2014 18:31:36 +0000 (13:31 -0500)]
MDL-48638 database SQL: Fix typo in exception constructor
jrchamp [Fri, 12 Dec 2014 22:48:31 +0000 (17:48 -0500)]
MDL-48591 calendar: Mini Cal Display DST Events
Dan Poltawski [Thu, 18 Dec 2014 11:24:59 +0000 (11:24 +0000)]
weekly release 2.9dev
Dan Poltawski [Thu, 18 Dec 2014 11:24:57 +0000 (11:24 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Thu, 18 Dec 2014 06:45:30 +0000 (14:45 +0800)]
Merge branch 'MDL-43902-master-fixup' of https://github.com/FMCorz/moodle
Frederic Massart [Thu, 18 Dec 2014 06:34:57 +0000 (14:34 +0800)]
MDL-43902 cohort: Fix behat failure because attribute does not exist
Andrew Nicols [Thu, 18 Dec 2014 06:07:46 +0000 (14:07 +0800)]
Merge branch 'MDL-45324_master' of https://github.com/markn86/moodle
David Monllao [Thu, 18 Dec 2014 04:35:55 +0000 (12:35 +0800)]
Merge branch 'MDL-48235-master-fixes' of git://github.com/xow/moodle
Zachary Durber [Thu, 18 Dec 2014 04:10:01 +0000 (12:10 +0800)]
MDL-47442 mod_assign: Notify student when quick-grading grade
Andrew Nicols [Thu, 18 Dec 2014 00:40:57 +0000 (08:40 +0800)]
MDL-38663 login: Remove login info from forgot password page
Since this is checked in several locations, I have introduced a new
protected function to check whether the current page is a login page.
This could potentially be exposed as a public function, but Sam's original
comment suggests that this is undesirable.
Marina Glancy [Thu, 18 Dec 2014 02:01:30 +0000 (10:01 +0800)]
MDL-48452 Completion: js correction to behat test
John Okely [Thu, 18 Dec 2014 01:52:34 +0000 (09:52 +0800)]
MDL-48235 mod_assign: Fix grade of 0 not showing on feedback page in oracle
Brian Barnes [Mon, 1 Dec 2014 01:14:25 +0000 (14:14 +1300)]
MDL-48423 messages: improved accessibility of contacts list
Dan Poltawski [Wed, 17 Dec 2014 10:11:40 +0000 (10:11 +0000)]
Merge branch 'MDL-44829_MOODLE_MASTER' of git://github.com/BenKelada/moodle
Frederic Massart [Wed, 17 Dec 2014 02:51:16 +0000 (10:51 +0800)]
MDL-43004 blog: Deprecation of parameter $action in add_association/s()
Eloy Lafuente (stronk7) [Wed, 17 Dec 2014 09:12:34 +0000 (10:12 +0100)]
Merge branch 'MDL-46122-master' of git://github.com/FMCorz/moodle
Mark Nelson [Wed, 17 Dec 2014 07:52:22 +0000 (23:52 -0800)]
MDL-48534 mod_assign: display correct workflow state and marker
Mark Nelson [Wed, 17 Dec 2014 07:41:00 +0000 (23:41 -0800)]
MDL-45324 mod_assign: always notify students when requested
Simey Lameze [Wed, 17 Dec 2014 07:10:33 +0000 (15:10 +0800)]
MDL-44260 core_deprecated: final deprecation of clam related methods
Simey Lameze [Wed, 17 Dec 2014 07:10:13 +0000 (15:10 +0800)]
MDL-44260 core_file: final deprecation of upload_manager class and clam functions
BKelada [Thu, 27 Mar 2014 06:30:05 +0000 (17:30 +1100)]
MDL-44829 libraries: Update android user agent detection
David Monllao [Wed, 17 Dec 2014 03:48:42 +0000 (11:48 +0800)]
Merge branch 'MDL-48243_master' of git://github.com/lazydaisy/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Frederic Massart [Mon, 8 Dec 2014 08:14:32 +0000 (16:14 +0800)]
MDL-46122 libraries: Final deprecation of file lib/pluginlib.php
David Monllao [Wed, 17 Dec 2014 00:54:46 +0000 (08:54 +0800)]
MDL-48482 core_admin: version change to add new lang strings
David Monllao [Wed, 17 Dec 2014 00:52:58 +0000 (08:52 +0800)]
Merge branch 'm29_MDL-48482' of git://github.com/totara/moodle
Brian Barnes [Thu, 4 Dec 2014 00:42:35 +0000 (13:42 +1300)]
MDL-48482 core_admin: Added additional label for durations
Dan Poltawski [Tue, 16 Dec 2014 19:20:22 +0000 (19:20 +0000)]
Merge branch 'MDL-43462_landscape_pdf' of git://github.com/davosmith/moodle
Dan Poltawski [Tue, 16 Dec 2014 19:17:57 +0000 (19:17 +0000)]
Merge branch 'MDL-42501-master' of git://github.com/lameze/moodle
Dan Poltawski [Tue, 16 Dec 2014 18:52:40 +0000 (18:52 +0000)]
Merge branch 'MDL-43902-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 16 Dec 2014 18:45:33 +0000 (18:45 +0000)]
Merge branch '38663-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 16 Dec 2014 18:21:40 +0000 (19:21 +0100)]
Merge branch 'MDL-48452-master' of https://github.com/sammarshallou/moodle
sam marshall [Tue, 9 Dec 2014 12:42:14 +0000 (12:42 +0000)]
MDL-48452 Completion: Expected date doesn't save when form is locked
The completion fields are locked when a user has already completed the
task, to prevent you accidentally causing it to recalculate the data.
This lock doesn't apply to the expected date field, as this doesn't
affect user completion. However, changes to the field in this
situation were incorrectly not saved.
Dan Poltawski [Tue, 16 Dec 2014 17:05:03 +0000 (17:05 +0000)]
Merge branch 'MDL-48587-master' of git://github.com/xow/moodle
Eloy Lafuente (stronk7) [Tue, 16 Dec 2014 15:35:47 +0000 (16:35 +0100)]
Merge branch '34041-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 16 Dec 2014 14:47:06 +0000 (15:47 +0100)]
Merge branch 'm29_MDL-48532' of https://github.com/totara/moodle
Dan Poltawski [Tue, 16 Dec 2014 13:52:52 +0000 (13:52 +0000)]
Merge branch 'MDL-46442-master' of git://github.com/zbdd/moodle
Dan Poltawski [Tue, 16 Dec 2014 12:59:45 +0000 (12:59 +0000)]
Merge branch 'MDL-47610-master' of git://github.com/zbdd/moodle
Dan Poltawski [Tue, 16 Dec 2014 12:44:22 +0000 (12:44 +0000)]
Merge branch 'MDL-44985-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Tue, 16 Dec 2014 12:35:52 +0000 (13:35 +0100)]
Merge branch 'MDL-34550-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 16 Dec 2014 12:22:37 +0000 (12:22 +0000)]
Merge branch 'MDL-42862-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 16 Dec 2014 11:58:53 +0000 (11:58 +0000)]
Merge branch 'MDL-46651-master-restore-course-completion-duplicate-key' of https://github.com/Trii/moodle
Dan Poltawski [Tue, 16 Dec 2014 11:20:29 +0000 (11:20 +0000)]
Merge branch 'MDL-44088-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 16 Dec 2014 11:20:04 +0000 (11:20 +0000)]
Merge branch 'MDL-44918-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 16 Dec 2014 10:49:53 +0000 (10:49 +0000)]
MDL-45295 blocks: added a bit more info to upgrade.txt
Dan Poltawski [Tue, 16 Dec 2014 10:48:33 +0000 (10:48 +0000)]
Merge branch 'MDL-45295-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 16 Dec 2014 10:44:16 +0000 (10:44 +0000)]
Merge branch 'm28_MDL-45955a' of https://github.com/totara/moodle
Eloy Lafuente (stronk7) [Tue, 16 Dec 2014 10:18:08 +0000 (11:18 +0100)]
Merge branch 'MDL-47694-master' of git://github.com/zbdd/moodle
Frederic Massart [Fri, 5 Dec 2014 10:24:41 +0000 (18:24 +0800)]
MDL-48495 curl: Limit usage of curl to HTTP and HTTPS protocols
John Okely [Thu, 11 Dec 2014 08:31:46 +0000 (16:31 +0800)]
MDL-42166 repositories: Finalise deprecation of repository sync methods
David Monllao [Tue, 16 Dec 2014 07:01:31 +0000 (15:01 +0800)]
Merge branch 'MDL-48539_master' of git://github.com/StudiUM/moodle
Zachary Durber [Tue, 2 Dec 2014 01:42:13 +0000 (09:42 +0800)]
MDL-46442 mod_assign: Notify users when grades are changed
David Monllao [Tue, 16 Dec 2014 06:14:24 +0000 (14:14 +0800)]
Merge branch 'MDL-48547-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 16 Dec 2014 05:33:54 +0000 (13:33 +0800)]
Merge branch 'm29_MDL-48567' of git://github.com/totara/moodle
Brian Barnes [Tue, 16 Dec 2014 04:04:34 +0000 (17:04 +1300)]
MDL-48286 core_files: Improved accessibility of file management
Simey Lameze [Tue, 16 Dec 2014 04:37:28 +0000 (12:37 +0800)]
MDL-48580 report_log: fix site errors dropdown
Thanks Renaat Debleu for pointing this bug and share a solution.
David Monllao [Tue, 16 Dec 2014 04:25:44 +0000 (12:25 +0800)]
Merge branch 'wip-MDL-48569-master' of git://github.com/marinaglancy/moodle
David Monllao [Tue, 16 Dec 2014 04:02:29 +0000 (12:02 +0800)]
Merge branch 'MDL-48164-master' of git://github.com/andrewnicols/moodle
Josh Marshall [Tue, 16 Dec 2014 03:59:31 +0000 (14:29 +1030)]
MDL-48445 report_loguser: Include logstore parameter for pagination
David Monllao [Tue, 16 Dec 2014 03:43:21 +0000 (11:43 +0800)]
Merge branch 'MDL-44642-master-fixes' of git://github.com/andrewnicols/moodle
Andrew Nicols [Tue, 16 Dec 2014 02:35:48 +0000 (10:35 +0800)]
Merge branch 'MDL-46472_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Tue, 16 Dec 2014 02:18:21 +0000 (10:18 +0800)]
MDL-44642 session: Remove 403 from require_sesskey()
This should not have been added in core at this time (needs a separate
issue).
Andrew Nicols [Tue, 9 Dec 2014 04:46:28 +0000 (12:46 +0800)]
MDL-48164 messageinbound: Attempt to detect autoreplies
Any message which includes:
* Precedence: bulk
* X-Autoreply: !no
* X-Autoresponse: !no
* Auto-Submitted: !no
Will not be detected as a bulk message and therefore ignored.
Andrew Nicols [Tue, 9 Dec 2014 04:04:10 +0000 (12:04 +0800)]
MDL-48164 mod_forum: Add additional headers to prevent OOF replies
This adds the X-Auto-Response-Suppress header to outbound messages.
Zachary Durber [Tue, 9 Dec 2014 02:34:07 +0000 (10:34 +0800)]
MDL-47610 gradebook: Show extra credit icon in grades column
Eloy Lafuente (stronk7) [Tue, 16 Dec 2014 00:57:58 +0000 (01:57 +0100)]
Merge branch 'MDL-44642-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Tue, 2 Dec 2014 03:25:16 +0000 (11:25 +0800)]
MDL-44642 grading: Add session keepalive during advanced grading setup
Andrew Nicols [Tue, 2 Dec 2014 03:21:25 +0000 (11:21 +0800)]
MDL-44642 session: Add a client-side session keepalive system
For pages where there will be significant user interaction in which the
server is not updated, it may be necessary to poll the server periodically
to touch the session.
This makes use of the existing checknet script which was designed for
checking network connectivity but fits into this use-case reasonably well.
Eloy Lafuente (stronk7) [Tue, 16 Dec 2014 00:23:16 +0000 (01:23 +0100)]
Merge branch 'MDL-47037-master' of git://github.com/jethac/moodle
Eloy Lafuente (stronk7) [Tue, 16 Dec 2014 00:12:56 +0000 (01:12 +0100)]
Merge branch 'MDL-48473' of git://github.com/jmvedrine/moodle
Eloy Lafuente (stronk7) [Mon, 15 Dec 2014 23:35:46 +0000 (00:35 +0100)]
Merge branch 'MDL-46491-master' of git://github.com/andrewnicols/moodle
Davo Smith [Mon, 15 Dec 2014 22:00:37 +0000 (22:00 +0000)]
MDL-43462 assignfeedback_editpdf: fix display of landscape PDFs
The size of the drawing canvas is now set from the size of the generated page image, with automatic
scrolling if it is too wide to display
Absolutely-positioned nodes (comments + stamps) are repositioned as the drawing canvas is scrolled