Dan Poltawski [Tue, 20 May 2014 02:15:11 +0000 (10:15 +0800)]
Merge branch '44711-28' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Tue, 20 May 2014 01:59:23 +0000 (13:59 +1200)]
Merge branch 'MDL-45603-master' of https://github.com/merrill-oakland/moodle
Marina Glancy [Tue, 20 May 2014 01:52:25 +0000 (09:52 +0800)]
Merge branch 'MDL-45469-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 20 May 2014 01:50:43 +0000 (09:50 +0800)]
Merge branch 'MDL-44449' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 20 May 2014 01:30:19 +0000 (09:30 +0800)]
Merge branch 'MDL-45550-master' of https://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 20 May 2014 01:09:34 +0000 (13:09 +1200)]
Merge branch 'MDL-45479-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 20 May 2014 00:49:56 +0000 (08:49 +0800)]
Merge branch '44974-28' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Tue, 20 May 2014 00:07:12 +0000 (12:07 +1200)]
Merge branch 'MDL-45543-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 19 May 2014 23:58:12 +0000 (11:58 +1200)]
Merge branch 'MDL-45477-master' of https://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 19 May 2014 23:55:35 +0000 (11:55 +1200)]
Merge branch 'MDL-45535-master' of https://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 19 May 2014 23:43:13 +0000 (11:43 +1200)]
Merge branch 'MDL-44953-master' of git://github.com/FMCorz/moodle
Frederic Massart [Tue, 13 May 2014 09:49:26 +0000 (17:49 +0800)]
MDL-45474 atto_undo: Remove notice when undo stack is empty
Sam Hemelryk [Mon, 19 May 2014 22:42:09 +0000 (10:42 +1200)]
Merge branch 'MDL-37838-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 19 May 2014 20:52:54 +0000 (08:52 +1200)]
Merge branch 'MDL-45380-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Mon, 19 May 2014 20:47:16 +0000 (08:47 +1200)]
Merge branch 'MDL-45135-master' of git://github.com/danpoltawski/moodle
Tim Hunt [Fri, 9 May 2014 13:20:17 +0000 (14:20 +0100)]
MDL-44449 quiz access rules should have a delete hook.
So they can clean up their settings when the quiz is deleted.
See
https://github.com/moodleou/moodle-quizaccess_honestycheck/commit/
babf149c2cc6dd734c272cd332b2032cc19db7d8
for an example of using this.
Damyon Wiese [Mon, 19 May 2014 13:20:10 +0000 (21:20 +0800)]
Merge branch 'MDL-45130-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 19 May 2014 12:52:19 +0000 (20:52 +0800)]
Merge branch 'MDL-45472-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 19 May 2014 12:18:59 +0000 (20:18 +0800)]
Merge branch 'MDL-45447-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 19 May 2014 12:11:50 +0000 (20:11 +0800)]
Merge branch 'MDL-43833' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 19 May 2014 12:04:50 +0000 (20:04 +0800)]
Merge branch 'MDL-45527-27' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 19 May 2014 11:54:42 +0000 (19:54 +0800)]
Merge branch 'MDL-45455' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 19 May 2014 10:43:15 +0000 (18:43 +0800)]
Merge branch 'MDL-45432-master' of https://github.com/lucisgit/moodle
sam marshall [Thu, 8 May 2014 12:41:27 +0000 (13:41 +0100)]
MDL-45469 Conditional availability: Restrict by text area broken
It has never worked, because the data for text area fields is not
loaded into the $USER object.
Changing it so that the dropdown list does not include these types
of field.
Marina Glancy [Mon, 19 May 2014 09:29:27 +0000 (17:29 +0800)]
Merge branch 'MDL-45478-master' of git://github.com/sammarshallou/moodle
Andrew Nicols [Thu, 8 May 2014 06:31:46 +0000 (14:31 +0800)]
MDL-45239 editor_atto: The editor cannot be active if it is not the active element
FireFox thinks that you can have an active selection on an element which
currently does not have focus. How this can be the case is a mystery.
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Andrew Nicols [Thu, 8 May 2014 06:36:16 +0000 (14:36 +0800)]
MDL-45468 editor_atto: Check that the common ancestor is within the editor
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Dan Poltawski [Mon, 19 May 2014 07:07:36 +0000 (15:07 +0800)]
Merge branch 'MDL-41109-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 19 May 2014 06:58:49 +0000 (14:58 +0800)]
Merge branch 'wip-MDL-34914-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 19 May 2014 05:01:39 +0000 (13:01 +0800)]
MDL-32543 upgrade: Increment the version bump
Conflicts:
version.php
Damyon Wiese [Mon, 19 May 2014 05:02:48 +0000 (13:02 +0800)]
Merge branch 'MDL-32543' of https://github.com/danielneis/moodle
Conflicts:
version.php
Damyon Wiese [Mon, 19 May 2014 04:45:21 +0000 (12:45 +0800)]
Merge branch 'MDL-23566' of https://github.com/aolley/moodle
Frederic Massart [Thu, 15 May 2014 07:52:48 +0000 (15:52 +0800)]
MDL-45537 mod_assign: Requiring locallib for class assign
Marina Glancy [Mon, 19 May 2014 04:37:10 +0000 (12:37 +0800)]
Merge branch 'wip-MDL-45483-master' of https://github.com/kwiliarty/moodle
Damyon Wiese [Mon, 19 May 2014 04:25:56 +0000 (12:25 +0800)]
Merge branch 'MDL-45533-27' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 19 May 2014 04:08:24 +0000 (12:08 +0800)]
Merge branch 'MDL-44634-master' of https://github.com/dbezborodovrp/moodle
Sam Hemelryk [Mon, 19 May 2014 01:37:12 +0000 (13:37 +1200)]
Merge branch 'MDL-45561-master' of git://github.com/jethac/moodle
Sam Hemelryk [Mon, 7 Apr 2014 03:56:40 +0000 (15:56 +1200)]
MDL-44974 admin: repositioned call to initialise renderer
Sam Hemelryk [Mon, 12 May 2014 23:18:47 +0000 (11:18 +1200)]
MDL-44711 navigation: better handling of course expansion exception
Eric Merrill [Sun, 18 May 2014 03:46:44 +0000 (23:46 -0400)]
MDL-45603 cache Fix the mappingsonly option to work as advertised.
Marina Glancy [Fri, 16 May 2014 09:09:07 +0000 (17:09 +0800)]
MDL-34914 cohorts: more understandable filter of user list by cohort
Andrew Nicols [Fri, 16 May 2014 05:45:30 +0000 (13:45 +0800)]
MDL-41109 dndupload: Add missing error string
Tim Hunt [Tue, 13 May 2014 12:35:39 +0000 (13:35 +0100)]
MDL-45455 quiz cron must rollback transaction on error.
Tim Hunt [Fri, 9 May 2014 15:18:18 +0000 (16:18 +0100)]
MDL-43833 quiz reports: persist states settings between pages.
Jetha Chan [Thu, 15 May 2014 07:49:28 +0000 (15:49 +0800)]
MDL-45561 themes: horizontal scroll in RTL base
Damyon Wiese [Thu, 15 May 2014 07:29:23 +0000 (15:29 +0800)]
weekly on-sync release 2.8dev
Damyon Wiese [Thu, 15 May 2014 07:29:20 +0000 (15:29 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Damyon Wiese [Thu, 15 May 2014 05:32:13 +0000 (13:32 +0800)]
MDL-41383 Filepicker: whitespace fix
Jetha Chan [Thu, 15 May 2014 02:54:37 +0000 (10:54 +0800)]
MDL-41383: RTL fix for base when zoomed out
Frederic Massart [Thu, 15 May 2014 03:10:54 +0000 (11:10 +0800)]
MDL-45533 editor_atto: Default paragraph is removed from empty Atto
Andrew Nicols [Wed, 14 May 2014 05:18:48 +0000 (13:18 +0800)]
MDL-45479 atto_image: Improve the preview area
This changes the preview area:
* to show the image at the requested size; and
* to fix the scaling issues.
Damien Bezborodov [Thu, 15 May 2014 01:18:50 +0000 (10:48 +0930)]
MDL-44634 Regression: link to user profile in comments block fails due to double URI encoding
Damien Bezborodov [Thu, 15 May 2014 01:18:50 +0000 (10:48 +0930)]
MDL-44634 Regression: link to user profile in comments block fails due to double URI encoding
sam marshall [Tue, 13 May 2014 17:43:21 +0000 (18:43 +0100)]
MDL-45535 CSS chunking breaks media rules if CSS invalid (IE)
Invalid CSS with extra } symbols, which previously (by fluke)
worked, was broken by recent chunking improvements. This change
makes the chunking code robust against this (stupid) situation.
sam marshall [Wed, 14 May 2014 10:47:53 +0000 (11:47 +0100)]
MDL-45550 Conditional availability: Missing lang string for save settings error
sam marshall [Thu, 8 May 2014 10:32:14 +0000 (11:32 +0100)]
MDL-45477 Behat: List of steps takes too long to load, times out
Increase time limit to 300 seconds (5 minutes).
Marina Glancy [Wed, 14 May 2014 08:34:52 +0000 (16:34 +0800)]
Merge branch 'MDL-36670' of git://github.com/jleyva/moodle
Ankit Agarwal [Wed, 14 May 2014 06:24:25 +0000 (14:24 +0800)]
MDL-45543 availability: Use correct namespace for global classes
Damyon Wiese [Wed, 14 May 2014 07:04:20 +0000 (15:04 +0800)]
Merge branch 'MDL-41383-master-basefix' of https://github.com/jethac/moodle
Jetha Chan [Wed, 14 May 2014 06:34:22 +0000 (14:34 +0800)]
MDL-41383 theme: filepicker zoom resiliency (base)
Fixed an issue that broke the file picker on base when initial zoom level is less than 100%.
Juan Leyva [Tue, 13 May 2014 14:05:39 +0000 (16:05 +0200)]
MDL-36670 logging: action parameter length restricted to 40 chars
Frederic Massart [Tue, 13 May 2014 09:11:18 +0000 (17:11 +0800)]
MDL-45527 task: Already deleted unconfirmed users are ignored
Damyon Wiese [Tue, 13 May 2014 08:00:10 +0000 (16:00 +0800)]
Merge branch 'MDL-41383-27' of git://github.com/jethac/moodle
Eric Merrill [Mon, 12 May 2014 20:01:32 +0000 (16:01 -0400)]
MDL-45523 quiz Cleanup duplicate question instances.
Eric Merrill [Mon, 12 May 2014 19:14:53 +0000 (15:14 -0400)]
MDL-45522 quiz Check that sumgrade is valid before saving.
Daniel Neis Araujo [Tue, 18 Feb 2014 20:14:19 +0000 (17:14 -0300)]
MDL-32543 Make sure the action and url fields of log table have correct sizes
Dan Poltawski [Mon, 12 May 2014 09:42:14 +0000 (17:42 +0800)]
MDL-37838 block_courseoverview: fix pluaralisation logic
Note that this kind of handling of plurals is extremely limited, see:
https://moodle.org/mod/forum/discuss.php?d=85897
http://search.cpan.org/~petdance/Locale-Maketext-1.12/lib/Locale/Maketext/TPJ13.pod
However, this is a simple fix to the existing logic
Jetha Chan [Mon, 12 May 2014 09:16:58 +0000 (17:16 +0800)]
MDL-41383 theme: filepicker zoom resiliency
Fixed an issue that broke the file picker on bootstrapbase when zooming in and out.
Dan Poltawski [Mon, 12 May 2014 09:05:51 +0000 (17:05 +0800)]
MDL-45135 mod_glossary: fix RTL alignment of table
Tablelib has a specific 'hook' to allow alignment to be corrected for
RTL languages, but needs to be specified direction in lowercase.
Damyon Wiese [Mon, 12 May 2014 09:00:08 +0000 (17:00 +0800)]
Merge branch 'MDL-45502' of git://github.com/stronk7/moodle
Frederic Massart [Mon, 12 May 2014 08:51:14 +0000 (16:51 +0800)]
MDL-44953 theme_more: Removing odd-looking text-shadow
Marina Glancy [Mon, 12 May 2014 08:24:31 +0000 (16:24 +0800)]
Merge branch 'wip-mdl-45514' of git://github.com/rajeshtaneja/moodle
Frederic Massart [Mon, 12 May 2014 08:08:13 +0000 (16:08 +0800)]
MDL-45130 editor_atto: Remove debugging messages for missing plugins
This is no longer required as the toolbar configuration prevents
missing plugins from being set. However, even if we do not output
any notice, we ignore missing plugins to prevent errors in case
one was uninstalled but left in the editor toolbar.
Frederic Massart [Mon, 12 May 2014 07:42:17 +0000 (15:42 +0800)]
MDL-45380 theme_bootstrapbase: Restore config override highlight
Rajesh Taneja [Mon, 12 May 2014 06:12:10 +0000 (14:12 +0800)]
MDL-45514 behat: Fixed should_not_exist timout param
AMOS bot [Mon, 12 May 2014 00:39:42 +0000 (00:39 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Sun, 11 May 2014 01:44:22 +0000 (03:44 +0200)]
MDL-45502 Bump release to 2.8 dev branch
AMOS bot [Sun, 11 May 2014 00:47:33 +0000 (00:47 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Sat, 10 May 2014 22:16:23 +0000 (00:16 +0200)]
weekly back-to-dev release 2.8dev
Eloy Lafuente (stronk7) [Sat, 10 May 2014 16:35:21 +0000 (18:35 +0200)]
Moodle release 2.7
AMOS bot [Sat, 10 May 2014 00:46:32 +0000 (00:46 +0000)]
Automatically generated installer lang files
Kevin Wiliarty [Thu, 8 May 2014 16:37:13 +0000 (12:37 -0400)]
MDL-45483 mod_forum: corrects values for maxattachments in forum settings
Damyon Wiese [Fri, 9 May 2014 03:07:26 +0000 (11:07 +0800)]
on-demand release 2.7rc2+
Damyon Wiese [Fri, 9 May 2014 03:07:10 +0000 (11:07 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Marina Glancy [Fri, 9 May 2014 02:35:04 +0000 (10:35 +0800)]
MDL-45486 Bump all versions to planned release
Dan Poltawski [Fri, 9 May 2014 02:50:26 +0000 (10:50 +0800)]
Merge branch 'MDL-45486' of git://github.com/stronk7/moodle
John Okely [Fri, 9 May 2014 01:51:20 +0000 (09:51 +0800)]
MDL-45296 mod_assign: Revert changes to lock_submission and unlock_submission events
AMOS bot [Fri, 9 May 2014 00:40:45 +0000 (00:40 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Fri, 9 May 2014 00:12:28 +0000 (02:12 +0200)]
MDL-45486 Bump all versions to planned release
This bumps all versions to planned 2.7 release
(
2014051200) version and all the dependencies to
current 2.7rc2 (
2014050800)
Eloy Lafuente (stronk7) [Thu, 8 May 2014 17:47:47 +0000 (19:47 +0200)]
MDL-45296 tests: ensure all submissions exist
The changes performed with the change from
create_from_user() to create_from_submission()
in practice enforce a new restriction about
submissions having to exist in order to fire
their lock/unlock events.
This did not exist before the change and, also,
it seems that the assign api itself, submission->lock() ...
also accepts non existing submissions.
So I was not 100% sure about how to fix these events:
1) enforcing submission to exist.
2) firing them only if the submission exist.
I've gone with 1) for now, making tests to pass. But will
raise the question in the Tracker, just in case we have
to move to the 2) approach for any reason.
Eloy Lafuente (stronk7) [Thu, 8 May 2014 15:50:11 +0000 (17:50 +0200)]
MDL-45296 tests: Fix unit tests to have objectid
In order to create the needed subscriptions to
make the event tests reliable a subscriptions
generator has been added. It performs raw-sql
subscriptions because by using the forum API
events would be fired (and that's something
we don't want to happen).
Eloy Lafuente (stronk7) [Thu, 8 May 2014 14:36:41 +0000 (16:36 +0200)]
Moodle release 2.7rc2
Eloy Lafuente (stronk7) [Thu, 8 May 2014 13:58:46 +0000 (15:58 +0200)]
Merge branch 'MDL-45296' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Thu, 8 May 2014 13:42:54 +0000 (15:42 +0200)]
MDL-45296 phpdoc: add some missing params
John Okely [Tue, 6 May 2014 02:11:58 +0000 (10:11 +0800)]
MDL-45296 events: Fix objecttable and ids
Various events had them incorrectly set or missing:
- submission_locked
- submission_unlocked
- subscription_created
- subscription_deleted
Marina Glancy [Thu, 8 May 2014 11:50:13 +0000 (19:50 +0800)]
Merge branch 'MDL-45462-master' of git://github.com/FMCorz/moodle
sam marshall [Thu, 8 May 2014 10:57:57 +0000 (11:57 +0100)]
MDL-45478 Conditional availability: Custom user restriction missing
There was an error in the JavaScript and custom user field
restrictions did not show correctly when editing the form.
Behat tests didn't cover custom user fields, so I added a
scenario.
Eloy Lafuente (stronk7) [Thu, 8 May 2014 10:52:54 +0000 (12:52 +0200)]
Merge branch 'MDL-45443-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Thu, 8 May 2014 10:40:27 +0000 (12:40 +0200)]
Merge branch 'MDL-45444-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Thu, 8 May 2014 10:00:33 +0000 (12:00 +0200)]
Merge branch 'wip-mdl-44262' of https://github.com/rajeshtaneja/moodle
Conflicts:
composer.json