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
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
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
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
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
Eloy Lafuente (stronk7) [Mon, 15 Dec 2014 16:53:27 +0000 (17:53 +0100)]
Merge branch 'MDL-48556-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 15 Dec 2014 16:10:15 +0000 (16:10 +0000)]
Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle
Dan Poltawski [Mon, 15 Dec 2014 14:59:34 +0000 (14:59 +0000)]
Merge branch 'MDL-45324' of git://github.com/jonof/moodle
Dan Poltawski [Mon, 15 Dec 2014 14:05:54 +0000 (14:05 +0000)]
Merge branch 'MDL-47176_master' of https://github.com/crazyserver/moodle
Dan Poltawski [Mon, 15 Dec 2014 12:32:13 +0000 (12:32 +0000)]
Merge branch 'MDL-48169-master' of git://github.com/jethac/moodle
Dan Poltawski [Mon, 15 Dec 2014 12:20:41 +0000 (12:20 +0000)]
Merge branch 'MDL-47475-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 15 Dec 2014 11:54:06 +0000 (11:54 +0000)]
Merge branch 'MDL-36673' of git://github.com/jmvedrine/moodle
David Monllao [Mon, 15 Dec 2014 09:30:40 +0000 (17:30 +0800)]
Merge branch 'MDL-48235-assign-reopen-until-pass' of git://github.com/mpetrowi/moodle
John Okely [Mon, 15 Dec 2014 01:42:19 +0000 (09:42 +0800)]
MDL-48587 core: Fix error in getremoteaddr for unsupported php versions
Simey Lameze [Thu, 11 Dec 2014 05:58:07 +0000 (13:58 +0800)]
MDL-42501 course: add help icon on delete gradebook options
David Monllao [Mon, 15 Dec 2014 05:44:01 +0000 (13:44 +0800)]
Merge branch 'wip-MDL-48347-master' of git://github.com/abgreeve/moodle
Andrew Nicols [Mon, 24 Nov 2014 23:58:48 +0000 (07:58 +0800)]
MDL-47475 mod_assign: Copy files to other group members for editpdf
Pau Ferrer Ocaña [Thu, 11 Dec 2014 11:38:36 +0000 (12:38 +0100)]
MDL-47176 qtype_match: Avoid sql_compare to solve problems with Oracle
David Monllao [Wed, 3 Dec 2014 06:58:03 +0000 (14:58 +0800)]
MDL-38128 mod_assign: Counts and groups unit tests
David Monllao [Mon, 8 Dec 2014 05:02:38 +0000 (13:02 +0800)]
MDL-46472 theme: Removing standard as an uninstallable theme
David Monllao [Mon, 1 Dec 2014 08:33:50 +0000 (16:33 +0800)]
MDL-38128 mod_assign: Fixing count teams and submissions with status
We should restrict the groups to the activity active group. Also
improving performance caching get_submission_group() results.
David Monllao [Wed, 19 Nov 2014 06:37:12 +0000 (14:37 +0800)]
MDL-38128 mod_assign: Adding group selector to grading summary page
Thanks to Pau Ferrer Ocaña and Avi Levy for
their work on this issue.
Marina Glancy [Fri, 12 Dec 2014 02:19:13 +0000 (10:19 +0800)]
MDL-48569 profile: behat test for user full profile access
Marina Glancy [Thu, 11 Dec 2014 03:34:42 +0000 (11:34 +0800)]
MDL-48569 profile: show link to full profile if anybody can see it
Sam Hemelryk [Fri, 12 Dec 2014 00:17:48 +0000 (13:17 +1300)]
MDL-38663 login: forgot password login links removed
Sam Hemelryk [Fri, 12 Dec 2014 00:08:33 +0000 (13:08 +1300)]
MDL-34041 navigation: removed deprecated local code
Joshua Johnston [Mon, 11 Aug 2014 21:16:30 +0000 (17:16 -0400)]
MDL-46651 Backup: Handle duplicate course completions during restore
Cron can cause duplicate completion records if triggered during a long
running restore process. If this is the case, replace the new record
with the record from the backup file
Jean-Michel Vedrine [Thu, 11 Dec 2014 20:39:34 +0000 (21:39 +0100)]
MDL-48473 mod_lesson: test fill in the blank question
Jean-Michel Vedrine [Wed, 3 Dec 2014 09:37:05 +0000 (10:37 +0100)]
MDL-48473 mod_lesson: fill in the blank shortanswer option
Gilles-Philippe Leblanc [Wed, 10 Dec 2014 16:15:08 +0000 (11:15 -0500)]
MDL-48539 filepicker: Missing file view_icon_selected in the file picker
Dan Poltawski [Thu, 11 Dec 2014 09:55:09 +0000 (09:55 +0000)]
weekly release 2.9dev
Dan Poltawski [Thu, 11 Dec 2014 09:55:07 +0000 (09:55 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Fri, 28 Nov 2014 03:36:24 +0000 (11:36 +0800)]
MDL-46491 course: Correct activity visibility on section show
Brian Barnes [Thu, 11 Dec 2014 02:10:39 +0000 (15:10 +1300)]
MDL-48567 core_badges: fixed display of badge created date
Avi Levy [Tue, 18 Nov 2014 12:01:27 +0000 (14:01 +0200)]
MDL-47037 grader_gradereport: Enable sort in other language then English
Frederic Massart [Fri, 5 Dec 2014 07:33:17 +0000 (15:33 +0800)]
MDL-48496 block_rss_client: Deleting unused string errorloadingfeed
Frederic Massart [Fri, 5 Dec 2014 07:31:42 +0000 (15:31 +0800)]
MDL-48496 block_rss_client: Do not display curl error messages
Eloy Lafuente (stronk7) [Wed, 10 Dec 2014 23:19:14 +0000 (00:19 +0100)]
Revert "MDL-46814 calendar: Export calendar uses moodle forms"
This reverts commit
a008de2a58cae82121bf88826bbeade33f550fa7.
Eloy Lafuente (stronk7) [Wed, 10 Dec 2014 23:18:16 +0000 (00:18 +0100)]
Revert "MDL-46814 calendar export: Minor coding tweaks"
This reverts commit
0b956a64d85a0f9e7c43efa4cd7e51f28216ebf0.
AMOS bot [Wed, 10 Dec 2014 16:03:59 +0000 (00:03 +0800)]
Automatically generated installer lang files
Jonathon Fowler [Fri, 5 Dec 2014 09:44:49 +0000 (19:44 +1000)]
MDL-45324 assign: notify when workflow is Off, or if state is Released
When marking workflow is enabled, students will be notified only when
the workflow state transitions to 'Released'. Until that happens,
sending of messages will be held and the 'Notify students' grading
form option will be locked.
Additionally, the batch set marking workflow state facility gains
the 'Notify students' option.
Credit to Steve Upton and David Balch for the basis of this patch.
Sam Hemelryk [Tue, 9 Dec 2014 20:58:16 +0000 (09:58 +1300)]
MDL-48430 customment: improved exception handling
Sam Hemelryk [Wed, 10 Dec 2014 02:29:06 +0000 (15:29 +1300)]
Merge branch 'MDL-48430_master' of https://github.com/crazyserver/moodle
Ankit Agarwal [Wed, 10 Dec 2014 08:57:15 +0000 (14:27 +0530)]
MDL-48556 backup: Use correct conditions before checking dir permissions
Ankit Agarwal [Wed, 10 Dec 2014 07:42:46 +0000 (13:12 +0530)]
MDL-34550 libraries: Final deprecation - get_context_instance_by_id()
Ankit Agarwal [Wed, 10 Dec 2014 05:18:01 +0000 (10:48 +0530)]
MDL-44985 libraries: Final deprecation of conditional apis in modinfo
Ankit Agarwal [Wed, 10 Dec 2014 04:53:31 +0000 (10:23 +0530)]
MDL-44985 libraries: Final deprecation of conditional classes and apis
Ankit Agarwal [Tue, 9 Dec 2014 08:00:29 +0000 (13:30 +0530)]
MDL-42862 behat: Final deprecation of various steps
Brian Barnes [Mon, 30 Jun 2014 22:55:08 +0000 (10:55 +1200)]
MDL-45955 forms: replaced labels in static text elements
Dan Poltawski [Tue, 9 Dec 2014 23:08:10 +0000 (23:08 +0000)]
MDL-48547 thirdparty: remove incorrect entry
Dan Poltawski [Tue, 9 Dec 2014 22:29:37 +0000 (22:29 +0000)]
Merge branch 'MDL-47323-enrol-plugin-backup' of https://github.com/mpetrowi/moodle
Dan Poltawski [Tue, 9 Dec 2014 21:22:03 +0000 (21:22 +0000)]
Merge branch 'MDL-45430-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 9 Dec 2014 20:27:18 +0000 (09:27 +1300)]
Merge branch 'm29_MDL-48389' of https://github.com/totara/moodle
Eloy Lafuente (stronk7) [Tue, 9 Dec 2014 15:05:56 +0000 (16:05 +0100)]
Merge branch 'MDL-31822_master' of https://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Dec 2014 12:36:25 +0000 (13:36 +0100)]
MDL-46814 calendar export: Minor coding tweaks
Brian Barnes [Tue, 28 Oct 2014 00:24:31 +0000 (13:24 +1300)]
MDL-46814 calendar: Export calendar uses moodle forms
Dan Poltawski [Tue, 9 Dec 2014 12:29:15 +0000 (12:29 +0000)]
MDL-45679 mod_lesson: do not overqualify styles
Dan Poltawski [Tue, 9 Dec 2014 12:05:29 +0000 (12:05 +0000)]
Merge branch 'MDL-45679' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 9 Dec 2014 10:53:41 +0000 (10:53 +0000)]
Merge branch 'MDL-48394-master' of git://github.com/jethac/moodle
