moodle.git
8 years agoMerge branch 'wip-MDL-45348-master' of git://github.com/abgreeve/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

8 years agoMDL-45348 report_eventlist: Removed duplicate list link in plugins > report.
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).

8 years agoMerge branch 'MDL-45283-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 1 May 2014 02:40:14 +0000 (10:40 +0800)]
Merge branch 'MDL-45283-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-44867-m2' of git://github.com/andrewnicols/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

8 years agoMDL-44867 atto_equation: Adjust the help string describing cursor info
Andrew Nicols [Thu, 1 May 2014 02:18:03 +0000 (10:18 +0800)]
MDL-44867 atto_equation: Adjust the help string describing cursor info

8 years agoMerge branch 'w19_MDL-45262_m27_choice' of https://github.com/skodak/moodle
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

8 years agoMerge branch 'mdl44575-master' of https://github.com/tlock/moodle
Damyon Wiese [Wed, 30 Apr 2014 08:31:41 +0000 (16:31 +0800)]
Merge branch 'mdl44575-master' of https://github.com/tlock/moodle

8 years agoMerge branch 'MDL-45256-master' of git://github.com/FMCorz/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

8 years agoMerge branch 'MDL-44867-master' of git://github.com/andrewnicols/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

8 years agoMDL-45256 portfolio: Adding missing global in testcase
Frederic Massart [Wed, 30 Apr 2014 07:32:23 +0000 (15:32 +0800)]
MDL-45256 portfolio: Adding missing global in testcase

8 years agoMDL-45262 remove set_page_detail() leftover from choice report
Petr Skoda [Wed, 30 Apr 2014 07:24:24 +0000 (15:24 +0800)]
MDL-45262 remove set_page_detail() leftover from choice report

8 years agoMerge branch 'MDL-45321' of git://github.com/timhunt/moodle
Damyon Wiese [Wed, 30 Apr 2014 07:25:22 +0000 (15:25 +0800)]
Merge branch 'MDL-45321' of git://github.com/timhunt/moodle

8 years agoMerge branch 'w19_MDL-43557_m27_cleanup' of git://github.com/skodak/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

8 years agoMerge branch 'MDL-43557_master' of git://github.com/markn86/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

8 years agoMDL-43557 add missing description to \mod_quiz\event\attempt_becameoverdue
Petr Skoda [Wed, 30 Apr 2014 07:00:03 +0000 (15:00 +0800)]
MDL-43557 add missing description to \mod_quiz\event\attempt_becameoverdue

8 years agoMDL-43557 fix BC issue in \core\event\course_completed and incorrect description
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

8 years agoMerge branch 'MDL-45256-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 30 Apr 2014 06:58:56 +0000 (14:58 +0800)]
Merge branch 'MDL-45256-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-45298-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

8 years agoMerge branch 'MDL-45239-master' of git://github.com/andrewnicols/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

8 years agoMDL-45283 restore: Prevent failure when user course grade exists
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.

8 years agoMDL-43557 fix assertion for course section event description
Petr Skoda [Wed, 30 Apr 2014 03:44:56 +0000 (11:44 +0800)]
MDL-43557 fix assertion for course section event description

8 years agoMerge branch 'MDL-44780_mathjax_default' of https://github.com/andyjdavis/moodle
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

8 years agoMDL-44867 atto_equation: Switch to the Downarrow for cursor position
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.

8 years agoMDL-43557 fix relateduserid in \mod_workshop\event\submission_assessed
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.

8 years agoMDL-43557 events: fixed minor issues in existing events
Mark Nelson [Thu, 24 Apr 2014 00:41:12 +0000 (17:41 -0700)]
MDL-43557 events: fixed minor issues in existing events

8 years agoMDL-43557 mod_lesson: removed incorrect usage of snapshots
Mark Nelson [Thu, 24 Apr 2014 00:13:14 +0000 (17:13 -0700)]
MDL-43557 mod_lesson: removed incorrect usage of snapshots

8 years agoMDL-43557 events: renamed event class names
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'.

8 years agoMDL-43557 events: removed underscores from event string keys
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

8 years agoMerge branch 'MDL-45257-master-2nd' of git://github.com/FMCorz/moodle
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

8 years agoMerge branch 'MDL-27459-master' of git://github.com/sammarshallou/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

8 years agoMerge branch 'MDL-45315-master' of git://github.com/danpoltawski/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

8 years agoMDL-42635 lesson: Fixed error message
Krister Viirsaar [Fri, 22 Nov 2013 11:14:28 +0000 (13:14 +0200)]
MDL-42635 lesson: Fixed error message

8 years agoMDL-44780 filter_mathjaxloader: mathjax is now at the top of the filter list
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

8 years agoMDL-44780 filter_mathjaxloader: switched mathjax filter on by default
Andrew Davis [Fri, 4 Apr 2014 01:59:48 +0000 (09:59 +0800)]
MDL-44780 filter_mathjaxloader: switched mathjax filter on by default

8 years agoMDL-45221 Allow unit tests to pass under any OS
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.

8 years agoon-demand release 2.7beta+
Eloy Lafuente (stronk7) [Tue, 29 Apr 2014 13:14:22 +0000 (15:14 +0200)]
on-demand release 2.7beta+

8 years agoNOBUG: Fixed file access permissions
Eloy Lafuente (stronk7) [Tue, 29 Apr 2014 13:14:21 +0000 (15:14 +0200)]
NOBUG: Fixed file access permissions

8 years agoMDL-45321 quiz upgrade: make it more tolerant to old bad data.
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.

8 years agoMDL-45256 portfolio: Do not require strict XML when parsing content
Frederic Massart [Tue, 29 Apr 2014 07:15:58 +0000 (15:15 +0800)]
MDL-45256 portfolio: Do not require strict XML when parsing content

8 years agoMDL-45256 portfolio: Unit tests for rewrite pluginfile urls
Frederic Massart [Tue, 29 Apr 2014 07:01:08 +0000 (15:01 +0800)]
MDL-45256 portfolio: Unit tests for rewrite pluginfile urls

8 years agoMDL-27459 Completion: When ratings off, disallow grade completion
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.

8 years agoMerge branch 'MDL-45229-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 29 Apr 2014 09:27:56 +0000 (17:27 +0800)]
Merge branch 'MDL-45229-master' of git://github.com/FMCorz/moodle

8 years agoMDL-45229 event: Adding information about stricter validation
Frederic Massart [Tue, 29 Apr 2014 09:12:39 +0000 (17:12 +0800)]
MDL-45229 event: Adding information about stricter validation

8 years agoMDL-45315 block_news_items: Add missing depedency
Dan Poltawski [Tue, 29 Apr 2014 02:27:37 +0000 (10:27 +0800)]
MDL-45315 block_news_items: Add missing depedency

8 years agoMerge branch 'MDL-44614_master-missing-upload' of git://github.com/dmonllao/moodle
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

8 years agoMerge branch 'MDL-45289-master' of git://github.com/danpoltawski/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

8 years agoMDL-44614 behat: Added missing @_file_upload
David Monllao [Tue, 29 Apr 2014 02:53:18 +0000 (09:53 +0700)]
MDL-44614 behat: Added missing @_file_upload

8 years agoMerge branch 'MDL-44916-master' of git://github.com/phalacee/moodle
Damyon Wiese [Tue, 29 Apr 2014 02:21:25 +0000 (10:21 +0800)]
Merge branch 'MDL-44916-master' of git://github.com/phalacee/moodle

8 years agoMDL-45289 block_course_summary: Add behat tests
Dan Poltawski [Mon, 28 Apr 2014 06:18:35 +0000 (14:18 +0800)]
MDL-45289 block_course_summary: Add behat tests

8 years agoMerge branch 'MDL-45312' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 28 Apr 2014 22:24:20 +0000 (10:24 +1200)]
Merge branch 'MDL-45312' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-45221-master' of git://github.com/andrewnicols/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

8 years agoMDL-45312 qtype_missingtype or qbehaviour_missing cannot be uninstalled.
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.

8 years agoMerge branch 'MDL-45229-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 28 Apr 2014 20:40:16 +0000 (08:40 +1200)]
Merge branch 'MDL-45229-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'w18_MDL-45287_m27_dbreset' of git://github.com/skodak/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

8 years agoMerge branch 'wip-mdl-45293' of git://github.com/rajeshtaneja/moodle
Marina Glancy [Mon, 28 Apr 2014 10:01:27 +0000 (18:01 +0800)]
Merge branch 'wip-mdl-45293' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-45156_master' of git://github.com/dmonllao/moodle
Marina Glancy [Mon, 28 Apr 2014 10:01:15 +0000 (18:01 +0800)]
Merge branch 'MDL-45156_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-45266-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Mon, 28 Apr 2014 10:00:57 +0000 (18:00 +0800)]
Merge branch 'MDL-45266-master' of git://github.com/danpoltawski/moodle

8 years agoMDL-45287 fix behat database reset between scenarios
Petr Skoda [Mon, 28 Apr 2014 09:02:58 +0000 (17:02 +0800)]
MDL-45287 fix behat database reset between scenarios

We cannot find out if DB received any writes because behat
web access runs in different request.

This was affecting only scenarios without generators.

8 years agoMDL-45298 theme: More permissive usage of retired themes settings
Frederic Massart [Mon, 28 Apr 2014 08:27:33 +0000 (16:27 +0800)]
MDL-45298 theme: More permissive usage of retired themes settings

8 years agoMerge branch 'MDL-45079_master' of https://github.com/totara/openbadges
Damyon Wiese [Mon, 28 Apr 2014 08:15:54 +0000 (16:15 +0800)]
Merge branch 'MDL-45079_master' of https://github.com/totara/openbadges

8 years agoMDL-45257 mod_assign: Removing wonky feedback_updated event
Frederic Massart [Mon, 28 Apr 2014 07:13:55 +0000 (15:13 +0800)]
MDL-45257 mod_assign: Removing wonky feedback_updated event

8 years agoMDL-45293 report_participation: ensure only web and ws logs are shown
Rajesh Taneja [Mon, 28 Apr 2014 05:50:47 +0000 (13:50 +0800)]
MDL-45293 report_participation: ensure only web and ws logs are shown

8 years agoMerge branch 'w17_MDL-45128_m27_stats' of git://github.com/skodak/moodle
Marina Glancy [Mon, 28 Apr 2014 05:48:18 +0000 (13:48 +0800)]
Merge branch 'w17_MDL-45128_m27_stats' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-45288_master' of git://github.com/dmonllao/moodle
Marina Glancy [Mon, 28 Apr 2014 05:48:09 +0000 (13:48 +0800)]
Merge branch 'MDL-45288_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-44614_master' of git://github.com/dmonllao/moodle
Marina Glancy [Mon, 28 Apr 2014 05:03:39 +0000 (13:03 +0800)]
Merge branch 'MDL-44614_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-44627-master' of git://github.com/lameze/moodle
Marina Glancy [Mon, 28 Apr 2014 04:43:37 +0000 (12:43 +0800)]
Merge branch 'MDL-44627-master' of git://github.com/lameze/moodle

8 years agoMDL-45221 admin: configexecutable admin settings should only accept files
Andrew Nicols [Tue, 22 Apr 2014 14:45:33 +0000 (22:45 +0800)]
MDL-45221 admin: configexecutable admin settings should only accept files

8 years agoMDL-44627 events: Triggering event course module updated actions.
Simey Lameze [Mon, 31 Mar 2014 02:13:44 +0000 (10:13 +0800)]
MDL-44627 events: Triggering event course module updated actions.

8 years agoMDL-44916 Question: Fixing alignment in bootstrap themes
Jason Fowler [Mon, 14 Apr 2014 02:48:11 +0000 (10:48 +0800)]
MDL-44916 Question: Fixing alignment in bootstrap themes

8 years agoMDL-45128 include only education related events from real users in statistics processing
Petr Skoda [Mon, 28 Apr 2014 03:28:07 +0000 (11:28 +0800)]
MDL-45128 include only education related events from real users in statistics processing

8 years agoMDL-45229 event: Trigger event when section visibility changes
Frederic Massart [Thu, 24 Apr 2014 07:02:26 +0000 (15:02 +0800)]
MDL-45229 event: Trigger event when section visibility changes

8 years agoMDL-45229 event: Validate sectionnum in course_section_updated
Frederic Massart [Thu, 24 Apr 2014 07:01:08 +0000 (15:01 +0800)]
MDL-45229 event: Validate sectionnum in course_section_updated

8 years agoMDL-45288 behat: Restricting click to .logininfo
David Monllao [Mon, 28 Apr 2014 03:20:34 +0000 (10:20 +0700)]
MDL-45288 behat: Restricting click to .logininfo

8 years agoMerge branch 'MDL-44004-master' of git://github.com/FMCorz/moodle
Marina Glancy [Mon, 28 Apr 2014 03:16:45 +0000 (11:16 +0800)]
Merge branch 'MDL-44004-master' of git://github.com/FMCorz/moodle

8 years agoMDL-44614 behat: Automate MDLQA-61
David Monllao [Thu, 17 Apr 2014 06:40:18 +0000 (13:40 +0700)]
MDL-44614 behat: Automate MDLQA-61

In an Offline activity assignment, a teacher can
grade and give comments on an assignment completed
offline.

8 years agoMDL-44614 behat: Automate MDLQA-60
David Monllao [Thu, 17 Apr 2014 06:21:02 +0000 (13:21 +0700)]
MDL-44614 behat: Automate MDLQA-60

A teacher can provide feedback
comments and files for an assignment.

8 years agoMerge branch 'MDL-45268-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Mon, 28 Apr 2014 02:50:04 +0000 (10:50 +0800)]
Merge branch 'MDL-45268-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'master_MDL-45210' of git://github.com/totara/moodle
Marina Glancy [Mon, 28 Apr 2014 02:46:04 +0000 (10:46 +0800)]
Merge branch 'master_MDL-45210' of git://github.com/totara/moodle

8 years agoMerge branch 'MDL-45052-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Mon, 28 Apr 2014 02:44:36 +0000 (10:44 +0800)]
Merge branch 'MDL-45052-master' of git://github.com/ankitagarwal/moodle

8 years agoMDL-45052 events: Cleanup db/events.php
Ankit Agarwal [Fri, 11 Apr 2014 06:28:18 +0000 (14:28 +0800)]
MDL-45052 events: Cleanup db/events.php

8 years agoMDL-45266 behat: tests for login block
Dan Poltawski [Fri, 25 Apr 2014 04:08:01 +0000 (12:08 +0800)]
MDL-45266 behat: tests for login block

8 years agoMerge branch 'mdl45232' of https://github.com/tlevi/moodle
Sam Hemelryk [Mon, 28 Apr 2014 02:23:33 +0000 (14:23 +1200)]
Merge branch 'mdl45232' of https://github.com/tlevi/moodle

8 years agoMerge branch '45248-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 28 Apr 2014 02:17:16 +0000 (10:17 +0800)]
Merge branch '45248-27' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'MDL-45164_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Mon, 28 Apr 2014 02:09:27 +0000 (14:09 +1200)]
Merge branch 'MDL-45164_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-45284_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Mon, 28 Apr 2014 02:09:18 +0000 (14:09 +1200)]
Merge branch 'MDL-45284_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'w17_MDL-45250_m27_ripaddtolog' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 28 Apr 2014 01:40:41 +0000 (09:40 +0800)]
Merge branch 'w17_MDL-45250_m27_ripaddtolog' of https://github.com/skodak/moodle

8 years agoMerge branch 'wip-MDL-45280-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 28 Apr 2014 00:22:44 +0000 (12:22 +1200)]
Merge branch 'wip-MDL-45280-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-45286' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 28 Apr 2014 00:15:38 +0000 (12:15 +1200)]
Merge branch 'MDL-45286' of git://github.com/stronk7/moodle

8 years agoMDL-45286 timezones: updated to 2014b
Eloy Lafuente (stronk7) [Sun, 27 Apr 2014 23:01:04 +0000 (01:01 +0200)]
MDL-45286 timezones: updated to 2014b

8 years agoMDL-45079 badges: Remove user email address from badge page
Yuliya Bozhko [Sun, 27 Apr 2014 22:01:05 +0000 (10:01 +1200)]
MDL-45079 badges: Remove user email address from badge page

Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
8 years agoMDL-45248 course: fixed assumptions when logging a course view
Sam Hemelryk [Wed, 23 Apr 2014 21:30:14 +0000 (09:30 +1200)]
MDL-45248 course: fixed assumptions when logging a course view

8 years agoMDL-45156 behat: Changing html_writer::empty_tag for start_tag
David Monllao [Sun, 27 Apr 2014 09:05:20 +0000 (16:05 +0700)]
MDL-45156 behat: Changing html_writer::empty_tag for start_tag

Also reducing the heading size.

Credits to Daniele Cordella.

8 years agoMDL-45284 behat: Replace wrongly triggered not found exception
David Monllao [Sun, 27 Apr 2014 01:20:48 +0000 (08:20 +0700)]
MDL-45284 behat: Replace wrongly triggered not found exception

8 years agoMDL-45164 behat: Add a wait to avoid random failures
David Monllao [Sun, 27 Apr 2014 00:44:15 +0000 (07:44 +0700)]
MDL-45164 behat: Add a wait to avoid random failures

It may fail in fast systems as the JS animation
to remove the delete comment may be slower than
the following steps where we check that the element
is not there anymore.

8 years agoMDL-45280 wrtie default value for admin_setting_configstoredfile
Marina Glancy [Sat, 26 Apr 2014 02:37:37 +0000 (10:37 +0800)]
MDL-45280 wrtie default value for admin_setting_configstoredfile

this fixes regression from MDL-45134

8 years agoMDL-45268 behat: tests for participants block
Dan Poltawski [Fri, 25 Apr 2014 07:03:59 +0000 (15:03 +0800)]
MDL-45268 behat: tests for participants block

8 years agoMDL-45250 add debugging message to deprecated add_to_log()
Petr Skoda [Thu, 24 Apr 2014 02:29:05 +0000 (10:29 +0800)]
MDL-45250 add debugging message to deprecated add_to_log()

8 years agoMerge branch 'MDL-42869' of https://github.com/danielneis/moodle
Dan Poltawski [Fri, 25 Apr 2014 06:04:38 +0000 (14:04 +0800)]
Merge branch 'MDL-42869' of https://github.com/danielneis/moodle

8 years agoMerge branch 'w17_MDL-45080_m27_questioncreate' of https://github.com/skodak/moodle
Dan Poltawski [Fri, 25 Apr 2014 05:31:47 +0000 (13:31 +0800)]
Merge branch 'w17_MDL-45080_m27_questioncreate' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-44730_install' of https://github.com/andyjdavis/moodle
Dan Poltawski [Fri, 25 Apr 2014 05:26:49 +0000 (13:26 +0800)]
Merge branch 'MDL-44730_install' of https://github.com/andyjdavis/moodle