Marina Glancy [Tue, 24 Jun 2014 05:32:13 +0000 (13:32 +0800)]
Merge branch 'MDL-46061-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 24 Jun 2014 05:28:51 +0000 (13:28 +0800)]
Merge branch 'MDL-45044-master' of git://github.com/dthies/moodle
Damyon Wiese [Tue, 24 Jun 2014 05:10:32 +0000 (13:10 +0800)]
Merge branch 'wip-MDL-46038-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 24 Jun 2014 05:07:57 +0000 (13:07 +0800)]
Merge branch 'MDL-46035_survey' of https://github.com/andyjdavis/moodle
Marina Glancy [Tue, 24 Jun 2014 05:04:49 +0000 (13:04 +0800)]
MDL-42716 assign: whitespace fix
Michael Hughes [Wed, 16 Apr 2014 13:18:33 +0000 (14:18 +0100)]
MDL-42716 Assign: Implemented capability based viewing of blind details (squashed)
Andrew Nicols [Fri, 6 Jun 2014 17:05:52 +0000 (01:05 +0800)]
MDL-1626 mod_forum: Update discussion subscriptions when moving discussions
Andrew Nicols [Thu, 5 Jun 2014 14:27:52 +0000 (22:27 +0800)]
MDL-1626 mod_forum: Update user interface to reflect per-discussion subscriptions
AMOS BEGIN
MOV [forcessubscribe,mod_forum],[forcesubscribed,mod_forum]
AMOS END
Barbara Ramiro [Thu, 19 Jun 2014 04:27:49 +0000 (12:27 +0800)]
MDL-1626 mod_forum: Add icons for subscription status
Andrew Nicols [Thu, 5 Jun 2014 05:50:53 +0000 (13:50 +0800)]
MDL-1626 mod_forum: Make cron handle discussion subscriptions
Andrew Nicols [Thu, 5 Jun 2014 13:27:51 +0000 (21:27 +0800)]
MDL-1626 mod_forum: Add functions to change user discussion subscription state
Andrew Nicols [Thu, 12 Jun 2014 06:29:04 +0000 (14:29 +0800)]
MDL-1626 mod_forum: Move subscription management to a separate class
Andrew Nicols [Thu, 5 Jun 2014 04:01:23 +0000 (12:01 +0800)]
MDL-1626 mod_forum: Create new discussion subscription tracking table
Andrew Nicols [Fri, 13 Jun 2014 08:19:16 +0000 (16:19 +0800)]
MDL-1626 mod_forum: Add behat tests for existing functionality
Andrew Nicols [Thu, 5 Jun 2014 12:59:18 +0000 (20:59 +0800)]
MDL-1626 mod_forum: Add unit tests for forum cron mail behaviour
Damyon Wiese [Tue, 24 Jun 2014 03:44:42 +0000 (11:44 +0800)]
Merge branch 'MDL-46046-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 24 Jun 2014 03:34:23 +0000 (11:34 +0800)]
Merge branch 'MDL-46056-master' of git://github.com/mudrd8mz/moodle
Damyon Wiese [Tue, 24 Jun 2014 03:23:21 +0000 (11:23 +0800)]
Merge branch 'wip-MDL-36003-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Tue, 24 Jun 2014 02:38:48 +0000 (10:38 +0800)]
Merge branch 'MDL-44512-master' of git://github.com/jethac/moodle
Damyon Wiese [Tue, 24 Jun 2014 02:08:28 +0000 (10:08 +0800)]
Merge branch 'MDL-44773-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 23 Jun 2014 22:56:31 +0000 (00:56 +0200)]
Merge branch 'MDL-45721_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Mon, 23 Jun 2014 22:46:36 +0000 (00:46 +0200)]
Merge branch 'MDL-39883-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Mon, 23 Jun 2014 22:17:27 +0000 (00:17 +0200)]
Merge branch 'MDL-45958-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Mon, 23 Jun 2014 22:01:51 +0000 (00:01 +0200)]
Merge branch 'MDL-45764_generalTool' of https://github.com/moodlerooms/moodle
Damyon Wiese [Mon, 23 Jun 2014 07:17:45 +0000 (15:17 +0800)]
Merge branch 'MDL-45580-master' of git://github.com/FMCorz/moodle
Frederic Massart [Mon, 23 Jun 2014 06:46:18 +0000 (14:46 +0800)]
MDL-45580 assignfeedback_editpdf: Save readonly version in backup
Damyon Wiese [Mon, 23 Jun 2014 06:31:46 +0000 (14:31 +0800)]
Merge branch '37145-28' of git://github.com/samhemelryk/moodle
Frederic Massart [Fri, 13 Jun 2014 02:41:45 +0000 (10:41 +0800)]
MDL-45580 assignfeedback_editpdf: Delete draft content on new submission
Frederic Massart [Wed, 11 Jun 2014 10:11:01 +0000 (18:11 +0800)]
MDL-45580 assignfeedback_editpdf: Store a readonly version of the PDF
Damyon Wiese [Mon, 23 Jun 2014 06:11:30 +0000 (14:11 +0800)]
Merge branch 'MDL-38693-master' of git://github.com/jethac/moodle
Damyon Wiese [Fri, 16 May 2014 09:07:14 +0000 (17:07 +0800)]
MDL-41746 External api: Allow multiple calls to validate_context at different levels
(Only from webservices)
Damyon Wiese [Mon, 23 Jun 2014 04:29:36 +0000 (12:29 +0800)]
Merge branch 'MDL-35453' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 23 Jun 2014 04:26:00 +0000 (12:26 +0800)]
Merge branch 'MDL-46086' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 23 Jun 2014 04:20:04 +0000 (12:20 +0800)]
Merge branch 'MDL-43835' of https://github.com/mr-russ/moodle
Adrian Greeve [Fri, 13 Jun 2014 08:03:54 +0000 (16:03 +0800)]
MDL-36003 events: Added events for viewing grade reports.
Marina Glancy [Mon, 23 Jun 2014 03:34:27 +0000 (11:34 +0800)]
Merge branch 'MDL-46013_uninstall_theme' of git://github.com/moodlerooms/moodle
Marina Glancy [Mon, 23 Jun 2014 03:33:50 +0000 (11:33 +0800)]
Merge branch 'MDL-44124-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Sun, 22 Jun 2014 22:57:12 +0000 (10:57 +1200)]
MDL-37145 caching: noted recommendation for dedicated memcache servers
Several reports have been made about the unexpected purging of entire
memcached servers when MUC is configured to use Memcache and caches
get purged.
This is expected and occurs because the memcache extenions don't
provide isolated containers. Moodle data is stored along side any other
data in the cache and when caches get purged all data gets removed
whether it belongs to Moodle or not.
The docs cover this point and here I've added notes about this to both
config-dist.php and cache/README.md
Tim Hunt [Fri, 20 Jun 2014 21:25:21 +0000 (22:25 +0100)]
MDL-46086 quiz: fix unit test on Oracle
Tim Hunt [Wed, 12 Feb 2014 17:26:30 +0000 (17:26 +0000)]
MDL-35453 quiz reports: don't order by id.
We were using ORDER BY id even though there was a perfectly good
attempt column to order the attempts by one user at one quiz.
Also, Oracle was complaining:
Debug info: ORA-01799: a column may not be outer-joined to a subquery
Daniel Thies [Fri, 2 May 2014 17:08:16 +0000 (02:08 +0900)]
MDL-45044 filter_tex: properly escape excutable pathnames for Windows
Andrew Davis [Thu, 19 Jun 2014 03:32:37 +0000 (11:32 +0800)]
MDL-46035 mod_survey: a string change to make an error message always correct
Frederic Massart [Thu, 19 Jun 2014 05:32:24 +0000 (13:32 +0800)]
MDL-46061 atto_image: Improved tests to cover sizing feature
Frederic Massart [Thu, 19 Jun 2014 05:31:36 +0000 (13:31 +0800)]
MDL-46061 atto_image: Prevent error when image does not have a size
Jetha Chan [Wed, 18 Jun 2014 07:52:07 +0000 (15:52 +0800)]
MDL-44512 themes: fix for custom menu submenu arrows on RTL languages
Damyon Wiese [Thu, 19 Jun 2014 06:12:07 +0000 (14:12 +0800)]
weekly release 2.8dev
Damyon Wiese [Thu, 19 Jun 2014 06:11:39 +0000 (14:11 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Frederic Massart [Thu, 19 Jun 2014 05:38:12 +0000 (13:38 +0800)]
MDL-44773 atto_accessibilitychecker: Improved image test coverage
AMOS bot [Thu, 19 Jun 2014 00:42:45 +0000 (00:42 +0000)]
Automatically generated installer lang files
David Mudrák [Wed, 18 Jun 2014 22:33:24 +0000 (00:33 +0200)]
MDL-46056 Remove invalid string definition from the workshop module
The correct version of the string is defined above.
Frederic Massart [Wed, 18 Jun 2014 08:52:06 +0000 (16:52 +0800)]
MDL-46046 atto_accessibilityhelper: Remove dead code from the plugin
Frederic Massart [Wed, 18 Jun 2014 08:33:55 +0000 (16:33 +0800)]
MDL-44773 atto_accessibilitychecker: Set focus on clicked warnings
Marina Glancy [Wed, 18 Jun 2014 08:37:27 +0000 (16:37 +0800)]
MDL-45941 messaging: submit all necessary user fields to message_send
Ankit Agarwal [Wed, 18 Jun 2014 07:40:31 +0000 (15:40 +0800)]
MDL-39883 events: Trigger a module created event when duplicating a module
Ankit Agarwal [Wed, 18 Jun 2014 07:39:02 +0000 (15:39 +0800)]
MDL-39883 events: Create a new api create_from_cm for module create event
Ankit Agarwal [Mon, 16 Jun 2014 07:39:10 +0000 (15:39 +0800)]
MDL-44124 libraries: Allow rrules with only one part during rrule validation checks
Marina Glancy [Wed, 18 Jun 2014 05:37:24 +0000 (13:37 +0800)]
MDL-46038 repositories: added forgotten global
Damyon Wiese [Wed, 18 Jun 2014 03:12:42 +0000 (11:12 +0800)]
MDL-45884: Version bump for new setting.
Mark Nelson [Mon, 9 Jun 2014 04:49:53 +0000 (21:49 -0700)]
MDL-45721 core_backup: only trigger the course_restored event when restoring a course
AMOS bot [Wed, 18 Jun 2014 00:42:21 +0000 (00:42 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Tue, 17 Jun 2014 09:54:33 +0000 (11:54 +0200)]
Merge branch 'MDL-45978_master' of git://github.com/grabs/moodle
Russell Smith [Sun, 16 Feb 2014 02:11:27 +0000 (13:11 +1100)]
MDL-43835 phpunit: Correct unit tests.
When different ID's are set for each sequence a number
of unit test failures appear. They have been corrected
to allow unit tests to pass with the new generator in place.
Eloy Lafuente (stronk7) [Tue, 17 Jun 2014 09:04:11 +0000 (11:04 +0200)]
Merge branch 'MDL-44929-master' of git://github.com/andrewnicols/moodle
Ankit Agarwal [Fri, 13 Jun 2014 05:40:50 +0000 (13:40 +0800)]
MDL-45958 courselib: Refactor module duplication code to remove duplication
Marina Glancy [Tue, 17 Jun 2014 05:08:14 +0000 (13:08 +0800)]
Merge branch 'wip_MDL-45941_m28_message' of git://github.com/skodak/moodle
Andreas Grabs [Tue, 17 Jun 2014 05:05:05 +0000 (07:05 +0200)]
MDL-45978 logging - added missing parameter id
Petr Skoda [Tue, 10 Jun 2014 05:21:40 +0000 (17:21 +1200)]
MDL-45941 implement support for message sending from DB transactions and fix other problems
This patch includes following fixes:
- messages may be now sent when database transactions active
- consistent return status on failure from message_send(), false is
returned only when message not created in message(_read)? table,
processor failure results in debugging message only and messages
are not marked as read
- message_sent is triggered always with id from message table
- logic for marking messages as viewed was standardised
- message_viewed event is triggered consistently
- improved performance when fetching user preferences
- full unit tests coverage for send_message() function
- fixed multiple other smaller issues discovered by unit tests
Damyon Wiese [Tue, 17 Jun 2014 02:27:19 +0000 (10:27 +0800)]
MDL-45582 EditPDF: whitespace fix
Damyon Wiese [Tue, 17 Jun 2014 02:19:55 +0000 (10:19 +0800)]
MDL-45582 Editpdf: Prevent debugging when there is no pdf
Damyon Wiese [Tue, 17 Jun 2014 02:20:39 +0000 (10:20 +0800)]
Merge branch 'master_MDL-45582' of git://github.com/greg-or/moodle-mod_assign
Eloy Lafuente (stronk7) [Mon, 16 Jun 2014 23:15:21 +0000 (01:15 +0200)]
Merge branch 'MDL-45970' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 16 Jun 2014 23:11:25 +0000 (01:11 +0200)]
Merge branch 'MDL-45611-master' of git://github.com/phalacee/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Eloy Lafuente (stronk7) [Mon, 16 Jun 2014 22:58:50 +0000 (00:58 +0200)]
Merge branch 'wip-mdl-45719-master' of https://github.com/deraadt/moodle
Eloy Lafuente (stronk7) [Mon, 16 Jun 2014 22:51:26 +0000 (00:51 +0200)]
Merge branch 'MDL-45870-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 16 Jun 2014 22:18:15 +0000 (00:18 +0200)]
Merge branch 'MDL-45936_master' of https://github.com/markn86/moodle
Mark Nielsen [Mon, 16 Jun 2014 22:10:30 +0000 (15:10 -0700)]
MDL-46013 theme: Uninstall theme unconditionally unsets configs
Eloy Lafuente (stronk7) [Mon, 16 Jun 2014 22:09:50 +0000 (00:09 +0200)]
Merge branch '45884-28' of https://github.com/samhemelryk/moodle
Marina Glancy [Mon, 16 Jun 2014 09:28:15 +0000 (17:28 +0800)]
Merge branch 'MDL-45940-master' of git://github.com/damyon/moodle
Marina Glancy [Mon, 16 Jun 2014 09:27:20 +0000 (17:27 +0800)]
Merge branch 'MDL-45901_Quiz_master' of git://github.com/nadavkav/moodle
Rajneel Totaram [Thu, 12 Jun 2014 00:02:26 +0000 (12:02 +1200)]
MDL-45967 admin lang: Fix typo
Marina Glancy [Mon, 16 Jun 2014 09:23:53 +0000 (17:23 +0800)]
Merge branch 'MDL-43274-master' of git://github.com/xow/moodle
Gregory Faller [Mon, 16 Jun 2014 08:39:21 +0000 (18:09 +0930)]
MDL-45582: Apply grades and feedback to entire group does not work with Annotate PDF feature
Damyon Wiese [Mon, 16 Jun 2014 08:26:06 +0000 (16:26 +0800)]
Merge branch 'MDL-42531-alt' of https://github.com/jonof/moodle
John Okely [Mon, 16 Jun 2014 08:25:27 +0000 (16:25 +0800)]
MDL-43274 Course: Remove message about course logs from upgrade.txt
Damyon Wiese [Tue, 10 Jun 2014 03:55:54 +0000 (11:55 +0800)]
MDL-45940 Assign: Improved access check
Call can_edit() instead of repeating a (slightly wrong) access check.
Damyon Wiese [Mon, 16 Jun 2014 08:14:43 +0000 (16:14 +0800)]
MDL-31409 Grading form webservice: Whitespace fixes
Damyon Wiese [Mon, 16 Jun 2014 08:13:38 +0000 (16:13 +0800)]
Merge branch 'MDL-31861' of https://github.com/Lightwork-Marking/moodle
Marina Glancy [Mon, 16 Jun 2014 06:02:38 +0000 (14:02 +0800)]
Merge branch 'MDL-35648' of git://github.com/danielneis/moodle
Marina Glancy [Mon, 16 Jun 2014 06:02:17 +0000 (14:02 +0800)]
Merge branch 'MDL-45935-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 16 Jun 2014 04:04:02 +0000 (12:04 +0800)]
Merge branch 'MDL-31998_master' of git://github.com/grabs/moodle
Damyon Wiese [Mon, 16 Jun 2014 03:24:29 +0000 (11:24 +0800)]
Merge branch 'wip-mdl-46001' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Mon, 16 Jun 2014 02:34:08 +0000 (10:34 +0800)]
MDL-46001 atto_clear: modfied behat test to work on xvfb
Damyon Wiese [Mon, 16 Jun 2014 03:00:26 +0000 (11:00 +0800)]
Merge branch 'MDL-45803_master' of https://github.com/markn86/moodle
Damyon Wiese [Mon, 16 Jun 2014 02:07:00 +0000 (10:07 +0800)]
Merge branch 'wip-MDL-45395-master' of git://github.com/abgreeve/moodle
John Okely [Tue, 10 Jun 2014 05:48:34 +0000 (13:48 +0800)]
MDL-43274 Course: Remove ability to delete logs on a course during reset
AMOS bot [Sun, 15 Jun 2014 00:42:34 +0000 (00:42 +0000)]
Automatically generated installer lang files
Mark Nelson [Thu, 12 Jun 2014 01:39:57 +0000 (18:39 -0700)]
MDL-45936 auth_db: use core functions when creating/updating a user
Russell Smith [Thu, 23 Jan 2014 23:21:52 +0000 (10:21 +1100)]
MDL-43835 phpunit: Create unique starting id's for sequences.
When all starting autoincrement ids are the same, it's difficult to detect coding and testing
errors that use the incorrect id in test calls. The classic case is cmid vs instance id.
To reduce the chance of the coding error we start sequences at different values where possible.
OUBlog installation is the case that highlighted this as it inserts a sitewide course module
at install time and cmid <> instance id in most cases.
Nadav Kavalerchik [Fri, 13 Jun 2014 09:20:23 +0000 (12:20 +0300)]
MDL-45901 - Quiz - Display random questions (from category) on RTL mode.
Paul Charsley [Fri, 13 Jun 2014 03:36:25 +0000 (15:36 +1200)]
MDL-31861 add web service function save_definitions