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
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
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
Marina Glancy [Mon, 28 Apr 2014 10:01:27 +0000 (18:01 +0800)]
Merge branch 'wip-mdl-45293' of git://github.com/rajeshtaneja/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
Marina Glancy [Mon, 28 Apr 2014 10:00:57 +0000 (18:00 +0800)]
Merge branch 'MDL-45266-master' of git://github.com/danpoltawski/moodle
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.
Damyon Wiese [Mon, 28 Apr 2014 08:15:54 +0000 (16:15 +0800)]
Merge branch 'MDL-45079_master' of https://github.com/totara/openbadges
Frederic Massart [Mon, 28 Apr 2014 07:13:55 +0000 (15:13 +0800)]
MDL-45257 mod_assign: Removing wonky feedback_updated event
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
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
Marina Glancy [Mon, 28 Apr 2014 05:48:09 +0000 (13:48 +0800)]
Merge branch 'MDL-45288_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
Marina Glancy [Mon, 28 Apr 2014 04:43:37 +0000 (12:43 +0800)]
Merge branch 'MDL-44627-master' of git://github.com/lameze/moodle
Andrew Nicols [Tue, 22 Apr 2014 14:45:33 +0000 (22:45 +0800)]
MDL-45221 admin: configexecutable admin settings should only accept files
Simey Lameze [Mon, 31 Mar 2014 02:13:44 +0000 (10:13 +0800)]
MDL-44627 events: Triggering event course module updated actions.
Jason Fowler [Mon, 14 Apr 2014 02:48:11 +0000 (10:48 +0800)]
MDL-44916 Question: Fixing alignment in bootstrap themes
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
Frederic Massart [Thu, 24 Apr 2014 07:02:26 +0000 (15:02 +0800)]
MDL-45229 event: Trigger event when section visibility changes
Frederic Massart [Thu, 24 Apr 2014 07:01:08 +0000 (15:01 +0800)]
MDL-45229 event: Validate sectionnum in course_section_updated
David Monllao [Mon, 28 Apr 2014 03:20:34 +0000 (10:20 +0700)]
MDL-45288 behat: Restricting click to .logininfo
Marina Glancy [Mon, 28 Apr 2014 03:16:45 +0000 (11:16 +0800)]
Merge branch 'MDL-44004-master' of git://github.com/FMCorz/moodle
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.
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.
Damyon Wiese [Mon, 28 Apr 2014 02:50:04 +0000 (10:50 +0800)]
Merge branch 'MDL-45268-master' of git://github.com/danpoltawski/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
Marina Glancy [Mon, 28 Apr 2014 02:44:36 +0000 (10:44 +0800)]
Merge branch 'MDL-45052-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Fri, 11 Apr 2014 06:28:18 +0000 (14:28 +0800)]
MDL-45052 events: Cleanup db/events.php
Dan Poltawski [Fri, 25 Apr 2014 04:08:01 +0000 (12:08 +0800)]
MDL-45266 behat: tests for login block
Sam Hemelryk [Mon, 28 Apr 2014 02:23:33 +0000 (14:23 +1200)]
Merge branch 'mdl45232' of https://github.com/tlevi/moodle
Dan Poltawski [Mon, 28 Apr 2014 02:17:16 +0000 (10:17 +0800)]
Merge branch '45248-27' of git://github.com/samhemelryk/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
Sam Hemelryk [Mon, 28 Apr 2014 02:09:18 +0000 (14:09 +1200)]
Merge branch 'MDL-45284_master' of git://github.com/dmonllao/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
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
Sam Hemelryk [Mon, 28 Apr 2014 00:15:38 +0000 (12:15 +1200)]
Merge branch 'MDL-45286' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Sun, 27 Apr 2014 23:01:04 +0000 (01:01 +0200)]
MDL-45286 timezones: updated to 2014b
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>
Sam Hemelryk [Wed, 23 Apr 2014 21:30:14 +0000 (09:30 +1200)]
MDL-45248 course: fixed assumptions when logging a course view
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.
David Monllao [Sun, 27 Apr 2014 01:20:48 +0000 (08:20 +0700)]
MDL-45284 behat: Replace wrongly triggered not found exception
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.
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
Dan Poltawski [Fri, 25 Apr 2014 07:03:59 +0000 (15:03 +0800)]
MDL-45268 behat: tests for participants block
Petr Skoda [Thu, 24 Apr 2014 02:29:05 +0000 (10:29 +0800)]
MDL-45250 add debugging message to deprecated add_to_log()
Dan Poltawski [Fri, 25 Apr 2014 06:04:38 +0000 (14:04 +0800)]
Merge branch 'MDL-42869' of https://github.com/danielneis/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
Dan Poltawski [Fri, 25 Apr 2014 05:26:49 +0000 (13:26 +0800)]
Merge branch 'MDL-44730_install' of https://github.com/andyjdavis/moodle
Andrew Davis [Thu, 24 Apr 2014 03:07:56 +0000 (11:07 +0800)]
MDL-44730 core_install: reduced the width of the buttons on the first few screens of the installer so they sit side by side
sam marshall [Thu, 24 Apr 2014 11:22:14 +0000 (12:22 +0100)]
MDL-45260 Memcache session support does not work for multiple servers
Dan Poltawski [Thu, 24 Apr 2014 09:57:16 +0000 (17:57 +0800)]
on-demand release 2.7beta+
Dan Poltawski [Thu, 24 Apr 2014 09:57:13 +0000 (17:57 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Marina Glancy [Thu, 24 Apr 2014 08:33:57 +0000 (16:33 +0800)]
Merge branch 'wip-MDL-44637-master' of git://github.com/abgreeve/moodle
Petr Skoda [Thu, 24 Apr 2014 08:31:50 +0000 (16:31 +0800)]
MDL-45090 explain event->courseid
Adrian Greeve [Fri, 4 Apr 2014 02:26:01 +0000 (10:26 +0800)]
MDL-44637 events: Update to string that was throwing off event list column ordering.
Adrian Greeve [Tue, 1 Apr 2014 08:05:00 +0000 (16:05 +0800)]
MDL-44637 report_eventlist: Behat tests for the event listing tool.
Adrian Greeve [Thu, 3 Apr 2014 01:22:29 +0000 (09:22 +0800)]
MDL-44637 report_eventlist: Created a tool for listing all events.
Frederic Massart [Thu, 24 Apr 2014 08:21:07 +0000 (16:21 +0800)]
MDL-44004 grading_rubric: Ensure that score is set before using it
Petr Skoda [Thu, 24 Apr 2014 06:28:43 +0000 (14:28 +0800)]
MDL-45080 fix question_category_created url and legacy log data
Marina Glancy [Thu, 24 Apr 2014 06:00:46 +0000 (14:00 +0800)]
Merge branch 'MDL-45207-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Thu, 24 Apr 2014 04:00:00 +0000 (12:00 +0800)]
Merge branch '45249-27' of git://github.com/samhemelryk/moodle
Marina Glancy [Thu, 24 Apr 2014 03:54:10 +0000 (11:54 +0800)]
Merge branch 'MDL-45158' of git://github.com/jleyva/moodle
Sam Hemelryk [Thu, 24 Apr 2014 00:14:34 +0000 (12:14 +1200)]
Merge branch 'MDL-45096-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Wed, 23 Apr 2014 23:37:34 +0000 (11:37 +1200)]
Merge branch 'MDL-44928-master' of git://github.com/xow/moodle
Sam Hemelryk [Wed, 23 Apr 2014 23:33:34 +0000 (11:33 +1200)]
Merge branch 'MDL-45169-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Wed, 23 Apr 2014 23:10:46 +0000 (11:10 +1200)]
Merge branch 'w17_MDL-45214_m27_idsortlog' of https://github.com/skodak/moodle
Sam Hemelryk [Wed, 23 Apr 2014 23:05:27 +0000 (11:05 +1200)]
Merge branch 'MDL-45238-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Wed, 23 Apr 2014 23:03:15 +0000 (11:03 +1200)]
Merge branch 'MDL-45124-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Wed, 23 Apr 2014 23:01:33 +0000 (11:01 +1200)]
Merge branch 'MDL-45186-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Wed, 23 Apr 2014 21:50:27 +0000 (09:50 +1200)]
MDL-45249 report_loglive: add missing @_switch_window tag to required tests
Daniel Neis Araujo [Fri, 14 Mar 2014 22:14:20 +0000 (19:14 -0300)]
MDL-42869 calendar: HTML validation check fails on add event screen
Dan Poltawski [Wed, 23 Apr 2014 08:40:22 +0000 (16:40 +0800)]
Merge branch 'MDL-45172_block' of https://github.com/andyjdavis/moodle
Frederic Massart [Wed, 23 Apr 2014 08:34:24 +0000 (16:34 +0800)]
MDL-45238 event\course_viewed: Added require for course/lib.php
Dan Poltawski [Wed, 23 Apr 2014 08:13:08 +0000 (16:13 +0800)]
Merge branch 'MDL-45075-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Wed, 23 Apr 2014 06:45:54 +0000 (14:45 +0800)]
MDL-45075 mod_forum: Add unit tests for forum subscription on forum creation
John Okely [Wed, 23 Apr 2014 02:52:23 +0000 (10:52 +0800)]
MDL-44928 mod_forum: Add unit tests for urls in mod_forum events
John Okely [Tue, 22 Apr 2014 07:12:34 +0000 (15:12 +0800)]
MDL-44928 mod_forum: Fix urls in log entries for forum events
Andrew Nicols [Wed, 23 Apr 2014 03:22:44 +0000 (11:22 +0800)]
MDL-45207 atto_equation: Handle multiple equations on the same line
Petr Skoda [Wed, 23 Apr 2014 05:54:28 +0000 (13:54 +0800)]
MDL-45214 always try to use ID sort in get_events_select()
This should make PostgreSQL behave more like MySQL
and resolve the problem when events were appearing in different
order.