Dan Poltawski [Fri, 2 May 2014 09:41:54 +0000 (17:41 +0800)]
Moodle release 2.7rc1
Dan Poltawski [Fri, 2 May 2014 09:41:51 +0000 (17:41 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Fri, 2 May 2014 06:59:25 +0000 (14:59 +0800)]
Merge branch 'MDL-45054-master' of https://github.com/sammarshallou/moodle
Andrew Davis [Fri, 2 May 2014 02:47:27 +0000 (10:47 +0800)]
MDL-45314 core_grade: a JS fix for the grader report
Marina Glancy [Fri, 2 May 2014 03:13:06 +0000 (11:13 +0800)]
Merge branch 'MDL-45237-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Fri, 2 May 2014 02:59:29 +0000 (10:59 +0800)]
Merge branch 'MDL-45362-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Fri, 2 May 2014 01:44:49 +0000 (09:44 +0800)]
Merge branch '44729-27' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Thu, 10 Apr 2014 22:20:09 +0000 (10:20 +1200)]
MDL-44729 theme_bootstrapbase: override the maintenance renderer
This patch overrides the maintenance renderer in the bootstrapbase
theme in order to override the notification method in the same way
we override the core renderer notification method.
This ensures now that clean is standard that notifications during
maintenance tasks (install, upgrade etc) look pretty.
AMOS bot [Fri, 2 May 2014 00:39:03 +0000 (00:39 +0000)]
Automatically generated installer lang files
Marina Glancy [Thu, 1 May 2014 13:17:01 +0000 (21:17 +0800)]
Merge branch 'MDL-45273' of git://github.com/timhunt/moodle
Marina Glancy [Thu, 1 May 2014 13:16:47 +0000 (21:16 +0800)]
Merge branch 'wip-MDL-43557-master' of https://github.com/abgreeve/moodle
sam marshall [Wed, 30 Apr 2014 14:28:03 +0000 (15:28 +0100)]
MDL-45054 Conditional availability: HTML structure improvements
1. Changed the 'delete' and 'eye' buttons to use an <a> link
tag so that it works without custom tabindex and shows a correct
mouse cursor. This also reduces the code slightly.
2. Changed the Cancel button on the dialog to use the mdl-align
class which is used in Atto dialogs. This results in the button
being centered, consistent with those dialogs.
sam marshall [Thu, 1 May 2014 10:18:06 +0000 (11:18 +0100)]
MDL-45362 Availability: Behat test fails on first of month
Tim Hunt [Thu, 1 May 2014 10:09:05 +0000 (11:09 +0100)]
MDL-45273 quiz fixup settings initialisation.
Adrian Greeve [Thu, 1 May 2014 10:00:39 +0000 (18:00 +0800)]
MDL-43557 events: Update of webservice function called string.
Dan Poltawski [Thu, 1 May 2014 08:34:21 +0000 (16:34 +0800)]
Merge branch 'MDL-36836-master' of git://github.com/jethac/moodle
Damyon Wiese [Thu, 1 May 2014 08:22:41 +0000 (16:22 +0800)]
Revert "MDL-45239 editor_atto: The editor cannot be active if it is not the active element"
This reverts commit
05a7f9e749ac31a0a0c9e59a1e0ddab065ddc2f7.
Jetha Chan [Wed, 30 Apr 2014 04:46:25 +0000 (12:46 +0800)]
MDL-36836 filepicker: alfresco select box fix
Adjusted position of alfresco select box; amended border/background application in base.
Dan Poltawski [Thu, 1 May 2014 06:52:02 +0000 (14:52 +0800)]
Merge branch 'MDL-45365-master' of git://github.com/damyon/moodle
Dan Poltawski [Thu, 1 May 2014 06:43:22 +0000 (14:43 +0800)]
Merge branch 'MDL-43570' of https://github.com/KristerV/moodle
Conflicts:
version.php
Dan Poltawski [Thu, 1 May 2014 06:16:56 +0000 (14:16 +0800)]
MDL-45237 report_loglive: prevent debug warnings
The use of $PAGE necessitates the $PAGE params to be set. Really
the url shouldn't be necessary for this scenario as its enforced for
things like redirects. But this is the quick fix to keep our logs
clean.
Marina Glancy [Thu, 1 May 2014 06:21:39 +0000 (14:21 +0800)]
Merge branch 'MDL-44398-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Thu, 1 May 2014 06:00:40 +0000 (14:00 +0800)]
MDL-45365 Courselib unit tests: cmid -> instanceid confusion
Yet again an instanceid is being passed instead of a cmid.
Damyon Wiese [Thu, 1 May 2014 04:29:55 +0000 (12:29 +0800)]
Merge branch 'MDL-45329-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Thu, 1 May 2014 04:19:49 +0000 (12:19 +0800)]
MDL-45273 quiz: whitespace fix
Marina Glancy [Thu, 1 May 2014 04:16:48 +0000 (12:16 +0800)]
Merge branch 'MDL-45273' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 1 May 2014 04:06:32 +0000 (12:06 +0800)]
Merge branch 'MDL-44815-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Thu, 1 May 2014 04:04:11 +0000 (12:04 +0800)]
Merge branch 'MDL-45314_resize' of git://github.com/andyjdavis/moodle
Andrew Davis [Tue, 29 Apr 2014 03:43:13 +0000 (11:43 +0800)]
MDL-45314 core_grade: keep the two grader report scrollbars the same when the table changes width
Andrew Nicols [Thu, 1 May 2014 01:53:37 +0000 (09:53 +0800)]
MDL-44815 theme: Make chooser icons the standard 16px
The only exception to this rule is the activity chooser which is allowed
24px.
Andrew Nicols [Thu, 1 May 2014 01:50:41 +0000 (09:50 +0800)]
MDL-44815 core: Add chooser type to boundingbox class
Dan Poltawski [Thu, 1 May 2014 03:53:28 +0000 (11:53 +0800)]
Merge branch 'MDL-45254-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-min.js
Marina Glancy [Thu, 1 May 2014 03:48:00 +0000 (11:48 +0800)]
Merge branch 'MDL-45292-master' of git://github.com/jethac/moodle
Marina Glancy [Thu, 1 May 2014 03:47:51 +0000 (11:47 +0800)]
Merge branch 'wip-MDL-45360-master' of git://github.com/abgreeve/moodle
Marina Glancy [Thu, 1 May 2014 03:47:40 +0000 (11:47 +0800)]
Merge branch 'MDL-45343-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Thu, 1 May 2014 03:47:27 +0000 (11:47 +0800)]
Merge branch 'MDL-45258-master' of git://github.com/ankitagarwal/moodle
Andrew Nicols [Wed, 30 Apr 2014 02:45:37 +0000 (10:45 +0800)]
MDL-45329 admin_task: Allow scheduled task change prevention
Some hosting providers have a requirement to prevent users making
modifications to the configuration of scheduled tasks as doing so may have
a negative impact not only on their own site, but also on the performance
of other sites (depending on host configuration). For example, if the
statistics or automated backup tasks were run every minute, this could have
a negative impact for other users).
Dan Poltawski [Thu, 1 May 2014 03:37:13 +0000 (11:37 +0800)]
Merge branch 'MDL-45167-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Thu, 1 May 2014 03:22:54 +0000 (11:22 +0800)]
Merge branch 'wip-MDL-45348-master' of git://github.com/abgreeve/moodle
Adrian Greeve [Thu, 1 May 2014 01:27:10 +0000 (09:27 +0800)]
MDL-45348 report_eventlist: Removed duplicate list link in plugins > report.
I also fixed up a spelling mistake in the language pack (relatedobservers).
Andrew Nicols [Wed, 30 Apr 2014 07:21:41 +0000 (15:21 +0800)]
MDL-45167 install: Improve styling of installation process
Dan Poltawski [Thu, 1 May 2014 02:40:14 +0000 (10:40 +0800)]
Merge branch 'MDL-45283-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Thu, 1 May 2014 02:29:42 +0000 (10:29 +0800)]
Merge branch 'MDL-44867-m2' of git://github.com/andrewnicols/moodle
Andrew Nicols [Thu, 1 May 2014 02:18:03 +0000 (10:18 +0800)]
MDL-44867 atto_equation: Adjust the help string describing cursor info
Adrian Greeve [Thu, 1 May 2014 02:01:55 +0000 (10:01 +0800)]
MDL-45360 report_eventlist: Fixed up css for the Events list detail page.
When the screen size is reduced the details are moved underneath the headings
prematurely.
Krister Viirsaar [Wed, 30 Apr 2014 07:05:49 +0000 (10:05 +0300)]
MDL-43570 filetypes: Added new filetypes - ddoc, bdoc, cdoc
Ankit Agarwal [Wed, 30 Apr 2014 08:48:40 +0000 (16:48 +0800)]
MDL-45343 report_log: Fix missing enddate clause when using date filter
Damyon Wiese [Wed, 30 Apr 2014 08:37:53 +0000 (16:37 +0800)]
Merge branch 'w19_MDL-45262_m27_choice' of https://github.com/skodak/moodle
Damyon Wiese [Wed, 30 Apr 2014 08:31:41 +0000 (16:31 +0800)]
Merge branch 'mdl44575-master' of https://github.com/tlock/moodle
Dan Poltawski [Wed, 30 Apr 2014 07:48:17 +0000 (15:48 +0800)]
Merge branch 'MDL-45256-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Wed, 30 Apr 2014 07:40:36 +0000 (15:40 +0800)]
Merge branch 'MDL-44867-master' of git://github.com/andrewnicols/moodle
Frederic Massart [Wed, 30 Apr 2014 07:32:23 +0000 (15:32 +0800)]
MDL-45256 portfolio: Adding missing global in testcase
Petr Skoda [Wed, 30 Apr 2014 07:24:24 +0000 (15:24 +0800)]
MDL-45262 remove set_page_detail() leftover from choice report
Damyon Wiese [Wed, 30 Apr 2014 07:25:22 +0000 (15:25 +0800)]
Merge branch 'MDL-45321' of git://github.com/timhunt/moodle
Marina Glancy [Wed, 30 Apr 2014 07:12:56 +0000 (15:12 +0800)]
Merge branch 'w19_MDL-43557_m27_cleanup' of git://github.com/skodak/moodle
Marina Glancy [Wed, 30 Apr 2014 07:12:31 +0000 (15:12 +0800)]
Merge branch 'MDL-43557_master' of git://github.com/markn86/moodle
Petr Skoda [Wed, 30 Apr 2014 07:00:03 +0000 (15:00 +0800)]
MDL-43557 add missing description to \mod_quiz\event\attempt_becameoverdue
Petr Skoda [Wed, 30 Apr 2014 05:47:38 +0000 (13:47 +0800)]
MDL-43557 fix BC issue in \core\event\course_completed and incorrect description
Dan Poltawski [Wed, 30 Apr 2014 06:58:56 +0000 (14:58 +0800)]
Merge branch 'MDL-45256-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 30 Apr 2014 06:15:40 +0000 (14:15 +0800)]
Merge branch 'MDL-45298-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Wed, 30 Apr 2014 04:13:49 +0000 (12:13 +0800)]
Merge branch 'MDL-45239-master' of git://github.com/andrewnicols/moodle
Frederic Massart [Wed, 30 Apr 2014 04:09:13 +0000 (12:09 +0800)]
MDL-45283 restore: Prevent failure when user course grade exists
When we restore a course, the grade that a user has for the
grade item of the course cannot be created twice. If we try
to create it when it already exists, a database exception is
raised because of index duplication.
The safest way to proceed is certainly to ignore the grade
information from the backup, otherwise we could potentially
overwrite existing information. Though, this only applies
to restore as merge, and it does not affect the update of
the course grade.
Petr Skoda [Wed, 30 Apr 2014 03:44:56 +0000 (11:44 +0800)]
MDL-43557 fix assertion for course section event description
Dan Poltawski [Wed, 30 Apr 2014 03:25:02 +0000 (11:25 +0800)]
Merge branch 'MDL-44780_mathjax_default' of https://github.com/andyjdavis/moodle
Andrew Nicols [Wed, 30 Apr 2014 03:14:34 +0000 (11:14 +0800)]
MDL-44867 atto_equation: Switch to the Downarrow for cursor position
The \square macro is not available in standard MimeTeX.
Petr Skoda [Wed, 30 Apr 2014 02:58:16 +0000 (10:58 +0800)]
MDL-43557 fix relateduserid in \mod_workshop\event\submission_assessed
The assessment is related to the original author of submission.
Mark Nelson [Thu, 24 Apr 2014 00:41:12 +0000 (17:41 -0700)]
MDL-43557 events: fixed minor issues in existing events
Mark Nelson [Thu, 24 Apr 2014 00:13:14 +0000 (17:13 -0700)]
MDL-43557 mod_lesson: removed incorrect usage of snapshots
Mark Nelson [Thu, 17 Apr 2014 22:52:34 +0000 (15:52 -0700)]
MDL-43557 events: renamed event class names
1) The core 'item_tagged' class was renamed to 'tag_added'.
2) The core 'item_untagged' class was renamed to 'tag_removed'.
3) The core 'message_read' class was renamed to 'message_viewed'.
4) The mod_forum 'userreport_viewed' class was renamed to 'user_report_viewed'.
5) The report_outline 'activity_viewed' was renamed to 'activity_report_viewed'.
6) The report_outline 'outline_viewed' was renamed to 'report_viewed'.
Mark Nelson [Thu, 17 Apr 2014 01:29:18 +0000 (18:29 -0700)]
MDL-43557 events: removed underscores from event string keys
AMOS START
MOV [event_legacy_logged, logstore_legacy],[eventlegacylogged,logstore_legacy]
MOV [event_cohort_created,cohort],[eventcohortcreated,cohort]
MOV [event_cohort_deleted,cohort],[eventcohortdeleted,cohort]
MOV [event_cohort_member_added,cohort],[eventcohortmemberadded,cohort]
MOV [event_cohort_member_removed,cohort],[eventcohortmemberremoved,cohort]
MOV [event_cohort_updated,cohort],[eventcohortupdated,cohort]
MOV [event_group_created,group],[eventgroupcreated,group]
MOV [event_group_deleted,group],[eventgroupdeleted,group]
MOV [event_group_member_added,group],[eventgroupmemberadded,group]
MOV [event_group_member_removed,group],[eventgroupmemberremoved,group]
MOV [event_group_updated,group],[eventgroupupdated,group]
MOV [event_grouping_created,group],[eventgroupingcreated,group]
MOV [event_grouping_deleted,group],[eventgroupingdeleted,group]
MOV [event_grouping_updated,group],[eventgroupingupdated,group]
MOV [event_webservice_function_called,webservice],[eventwebservicefunctioncalled,webservice]
MOV [event_webservice_login_failed,webservice],[eventwebserviceloginfailed,webservice]
MOV [event_webservice_service_created,webservice],[eventwebserviceservicecreated,webservice]
MOV [event_webservice_service_deleted,webservice],[eventwebserviceservicedeleted,webservice]
MOV [event_webservice_service_updated,webservice],[eventwebserviceserviceupdated,webservice]
MOV [event_webservice_service_user_added,webservice],[eventwebserviceserviceuseradded,webservice]
MOV [event_webservice_service_user_removed,webservice],[eventwebserviceserviceuserremoved,webservice]
MOV [event_webservice_token_created,webservice],[eventwebservicetokencreated,webservice]
MOV [event_webservice_token_sent,webservice],[eventwebservicetokensent,webservice]
MOV [event_user_loggedin,auth],[eventuserloggedin,auth]
MOV [event_assessable_uploaded,assignsubmission_file],[eventassessableuploaded,assignsubmission_file]
MOV [event_assessable_uploaded,assignsubmission_onlinetext],[eventassessableuploaded,assignsubmission_onlinetext]
MOV [event_chapter_created,mod_book],[eventchaptercreated,mod_book]
MOV [event_chapter_deleted,mod_book],[eventchapterdeleted,mod_book]
MOV [event_chapter_updated,mod_book],[eventchapterupdated,mod_book]
MOV [event_chapter_viewed,mod_book],[eventchapterviewed,mod_book]
MOV [event_book_exported,booktool_exportimscp],[eventbookexported,booktool_exportimscp]
MOV [event_book_printed,booktool_print],[eventbookprinted,booktool_print]
MOV [event_chapter_printed,booktool_print],[eventchapterprinted,booktool_print]
MOV [event_message_sent,mod_chat],[eventmessagesent,mod_chat]
MOV [event_sessions_viewed,mod_chat],[eventsessionsviewed,mod_chat]
MOV [event_answer_created,mod_choice],[eventanswercreated,mod_choice]
MOV [event_answer_updated,mod_choice],[eventanswerupdated,mod_choice]
MOV [event_report_viewed,mod_choice],[eventreportviewed,mod_choice]
MOV [event_assessable_uploaded,mod_forum],[eventassessableuploaded,mod_forum]
MOV [event_assessable_uploaded,mod_workshop],[eventassessableuploaded,mod_workshop]
AMOS END
Marina Glancy [Wed, 30 Apr 2014 02:05:11 +0000 (10:05 +0800)]
Merge branch 'MDL-45257-master-2nd' of git://github.com/FMCorz/moodle
Marina Glancy [Wed, 30 Apr 2014 01:55:25 +0000 (09:55 +0800)]
Merge branch 'MDL-27459-master' of git://github.com/sammarshallou/moodle
Marina Glancy [Wed, 30 Apr 2014 01:55:10 +0000 (09:55 +0800)]
Merge branch 'MDL-45315-master' of git://github.com/danpoltawski/moodle
Krister Viirsaar [Fri, 22 Nov 2013 11:14:28 +0000 (13:14 +0200)]
MDL-42635 lesson: Fixed error message
Andrew Davis [Wed, 23 Apr 2014 08:56:08 +0000 (16:56 +0800)]
MDL-44780 filter_mathjaxloader: mathjax is now at the top of the filter list
Andrew Davis [Fri, 4 Apr 2014 01:59:48 +0000 (09:59 +0800)]
MDL-44780 filter_mathjaxloader: switched mathjax filter on by default
Eloy Lafuente (stronk7) [Tue, 29 Apr 2014 17:22:54 +0000 (19:22 +0200)]
MDL-45221 Allow unit tests to pass under any OS
This commit gets rid of the old lib/tests/other/executable.php
file completely because it was only executable under unix OSs
and moves the check to be performed against some mimetex binaries
that are known to be executable and bundled with every installation.
Note this was discovered because the weekly rolling process changed
the execution permissions of the "fixture" file and, at the end
we decided to get rid of it completely, folowing the plan above.
Eloy Lafuente (stronk7) [Tue, 29 Apr 2014 13:14:22 +0000 (15:14 +0200)]
on-demand release 2.7beta+
Eloy Lafuente (stronk7) [Tue, 29 Apr 2014 13:14:21 +0000 (15:14 +0200)]
NOBUG: Fixed file access permissions
Tim Hunt [Tue, 29 Apr 2014 10:56:30 +0000 (11:56 +0100)]
MDL-45273 quiz: Fix codechecker issues.
Tim Hunt [Tue, 29 Apr 2014 10:41:16 +0000 (11:41 +0100)]
MDL-45321 quiz upgrade: make it more tolerant to old bad data.
Tim Hunt [Fri, 25 Apr 2014 17:51:03 +0000 (18:51 +0100)]
MDL-45273 only create the quiz settings if necessary.
Tim Hunt [Fri, 25 Apr 2014 17:48:05 +0000 (18:48 +0100)]
MDL-45273 remove the need for quiz settings.php to include locallib.php.
Tim Hunt [Fri, 25 Apr 2014 17:02:47 +0000 (18:02 +0100)]
MDL-45273 quiz: move admin settings into classes folder.
Frederic Massart [Tue, 29 Apr 2014 07:15:58 +0000 (15:15 +0800)]
MDL-45256 portfolio: Do not require strict XML when parsing content
Frederic Massart [Tue, 29 Apr 2014 07:01:08 +0000 (15:01 +0800)]
MDL-45256 portfolio: Unit tests for rewrite pluginfile urls
sam marshall [Tue, 8 Apr 2014 10:55:46 +0000 (11:55 +0100)]
MDL-27459 Completion: When ratings off, disallow grade completion
For activities that use ratings, there is no grade unless ratings
are enabled. The completion system still lets you select 'complete
when user gets a grade', which leads to later errors.
This change simply disables the 'completion on grade' field if
ratings are enabled for the activity, but not turned on in the form.
Marina Glancy [Tue, 29 Apr 2014 09:27:56 +0000 (17:27 +0800)]
Merge branch 'MDL-45229-master' of git://github.com/FMCorz/moodle
Frederic Massart [Tue, 29 Apr 2014 09:12:39 +0000 (17:12 +0800)]
MDL-45229 event: Adding information about stricter validation
Dan Poltawski [Tue, 29 Apr 2014 02:27:37 +0000 (10:27 +0800)]
MDL-45315 block_news_items: Add missing depedency
Marina Glancy [Tue, 29 Apr 2014 05:02:41 +0000 (13:02 +0800)]
Merge branch 'MDL-44614_master-missing-upload' of git://github.com/dmonllao/moodle
Marina Glancy [Tue, 29 Apr 2014 04:49:30 +0000 (12:49 +0800)]
Merge branch 'MDL-45289-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 29 Apr 2014 02:53:18 +0000 (09:53 +0700)]
MDL-44614 behat: Added missing @_file_upload
Damyon Wiese [Tue, 29 Apr 2014 02:21:25 +0000 (10:21 +0800)]
Merge branch 'MDL-44916-master' of git://github.com/phalacee/moodle
Dan Poltawski [Mon, 28 Apr 2014 06:18:35 +0000 (14:18 +0800)]
MDL-45289 block_course_summary: Add behat tests
Sam Hemelryk [Mon, 28 Apr 2014 22:24:20 +0000 (10:24 +1200)]
Merge branch 'MDL-45312' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 28 Apr 2014 21:10:05 +0000 (09:10 +1200)]
Merge branch 'MDL-45221-master' of git://github.com/andrewnicols/moodle
Tim Hunt [Mon, 28 Apr 2014 20:25:51 +0000 (21:25 +0100)]
MDL-45312 qtype_missingtype or qbehaviour_missing cannot be uninstalled.
They are required by the system.
Sam Hemelryk [Mon, 28 Apr 2014 20:40:16 +0000 (08:40 +1200)]
Merge branch 'MDL-45229-master' of git://github.com/FMCorz/moodle
Marina Glancy [Mon, 28 Apr 2014 12:17:57 +0000 (20:17 +0800)]
Merge branch 'w18_MDL-45287_m27_dbreset' of git://github.com/skodak/moodle