Sam Hemelryk [Wed, 12 Mar 2014 01:13:10 +0000 (14:13 +1300)]
Merge branch 'master_MDL-37733' of git://github.com/danmarsden/moodle
Dan Poltawski [Wed, 12 Mar 2014 01:08:50 +0000 (09:08 +0800)]
Merge branch 'MDL-44061-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 11 Mar 2014 23:31:18 +0000 (12:31 +1300)]
Merge branch 'MDL-40699-UI-language-changes-when-logging-out-of-Moodle' of git://github.com/michael-milette/moodle
Eloy Lafuente (stronk7) [Tue, 11 Mar 2014 23:17:52 +0000 (00:17 +0100)]
Merge branch 'wip-MDL-32699-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 11 Mar 2014 22:56:51 +0000 (11:56 +1300)]
Merge branch 'MDL-42368-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Thu, 13 Mar 2014 17:33:15 +0000 (18:33 +0100)]
Merge branch 'mdl27_mdl-43497_allow_force_language_02' of https://github.com/brki/moodle
Sam Hemelryk [Tue, 11 Mar 2014 22:21:48 +0000 (11:21 +1300)]
Merge branch 'MDL-44345-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 11 Mar 2014 22:19:02 +0000 (11:19 +1300)]
Merge branch 'MDL-41173' of https://github.com/danielneis/moodle
Dan Poltawski [Tue, 11 Mar 2014 09:53:49 +0000 (17:53 +0800)]
Merge branch 'MDL-44478-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Thu, 13 Mar 2014 17:32:41 +0000 (18:32 +0100)]
Merge branch 'MDL-44534' of git://github.com/timhunt/moodle
Conflicts:
question/tests/behat/copy_questions.feature
Dan Poltawski [Tue, 11 Mar 2014 09:06:14 +0000 (17:06 +0800)]
Merge branch 'MDL-33653' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 11 Mar 2014 08:59:16 +0000 (16:59 +0800)]
Merge branch 'MDL-40913_master' of https://github.com/markn86/moodle
Marina Glancy [Thu, 6 Mar 2014 08:12:13 +0000 (16:12 +0800)]
MDL-43967 logging: references to the migrating dev docs
Dan Poltawski [Tue, 11 Mar 2014 07:50:41 +0000 (15:50 +0800)]
Merge branch 'MDL-44095' of https://github.com/shashirepo/moodle
Dan Poltawski [Tue, 11 Mar 2014 07:41:57 +0000 (15:41 +0800)]
Merge branch 'wip-MDL-44337-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 11 Mar 2014 07:30:02 +0000 (15:30 +0800)]
Merge branch 'wip-mdl-44458' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 11 Mar 2014 06:54:26 +0000 (14:54 +0800)]
MDL-30085 bump version
Rajesh Taneja [Wed, 5 Mar 2014 08:03:56 +0000 (16:03 +0800)]
MDL-44458 notes: Fixed url in events
Juan Leyva [Wed, 5 Mar 2014 10:59:26 +0000 (11:59 +0100)]
MDL-44462 mobile: Add mod_assign functions to service definition
To support new functionality in the Moodle Mobile app.
Dan Poltawski [Tue, 11 Mar 2014 06:35:51 +0000 (14:35 +0800)]
Merge branch 'MDL-44480-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
Dan Poltawski [Tue, 11 Mar 2014 04:59:23 +0000 (12:59 +0800)]
Merge branch 'MDL-41855' of git://github.com/nobelium/moodle
Dan Poltawski [Tue, 11 Mar 2014 04:42:27 +0000 (12:42 +0800)]
Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 11 Mar 2014 04:35:57 +0000 (12:35 +0800)]
Merge branch 'MDL-44497-master' of https://github.com/jamiepratt/moodle
Michael Milette [Thu, 6 Mar 2014 13:53:54 +0000 (08:53 -0500)]
MDL-40699 Language - Add option to Override Moodle's default behaviour to reset the UI language on logout
This change adds an option to the Site Admin > Langauge > Language Settings page which can prevent Moodle from changing language when users log out.
Affected files:
lang/en/admin.php
admin/settings/language.php
login/logout.php
Signed-off-by: Michael Milette <michael.milette@instruxmedia.com>
Dan Poltawski [Tue, 11 Mar 2014 03:37:44 +0000 (11:37 +0800)]
Merge branch 'wip-MDL-42870-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 11 Mar 2014 03:28:56 +0000 (11:28 +0800)]
Merge branch 'master_MDL-44066' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 11 Mar 2014 02:50:55 +0000 (10:50 +0800)]
Merge branch 'wip-MDL-43966-master' of git://github.com/marinaglancy/moodle
David Monllao [Tue, 11 Mar 2014 02:04:22 +0000 (10:04 +0800)]
MDL-43236 behat: Fixing missing changes
All "" "" should exists and "" "" should not exists
must be converted to the ones using exist rather than exists.
Sam Hemelryk [Tue, 11 Mar 2014 01:22:33 +0000 (14:22 +1300)]
Merge branch 'wip-MDL-40721-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 11 Mar 2014 01:18:08 +0000 (14:18 +1300)]
Merge branch 'w11_MDL-44451_m27_addonloc' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 10 Mar 2014 23:28:34 +0000 (00:28 +0100)]
Merge branch '44547-27' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Mon, 10 Mar 2014 23:05:22 +0000 (12:05 +1300)]
MDL-44547 repository_alfresco: version bump
Sam Hemelryk [Mon, 10 Mar 2014 22:54:52 +0000 (11:54 +1300)]
MDL-44496 fixed renamed method ref in comment
Sam Hemelryk [Mon, 10 Mar 2014 22:54:05 +0000 (11:54 +1300)]
Merge branch 'w11_MDL-44496_m27_eventbuffer' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 10 Mar 2014 21:10:08 +0000 (10:10 +1300)]
Merge branch 'MDL-44334-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 10 Mar 2014 20:19:44 +0000 (09:19 +1300)]
Merge branch 'MDL-43721-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 10 Mar 2014 19:51:36 +0000 (08:51 +1300)]
Merge branch 'wip-MDL-44471-master' of git://github.com/marinaglancy/moodle
Nobelium [Mon, 10 Mar 2014 14:03:33 +0000 (14:03 +0000)]
MDL-41855 SCORM form : Auto update frequency option under File manager
Placing the Auto update frequency option underneath the File manager in /mod/scorm/mod_form.php
This changes the postion of the auto update freq option both while creating a new scorm object and while editing the scorm object.
Tim Hunt [Mon, 10 Mar 2014 12:32:39 +0000 (12:32 +0000)]
MDL-44534 increase core_question Behat test robustness.
Dan Poltawski [Mon, 10 Mar 2014 07:13:43 +0000 (15:13 +0800)]
Merge branch 'wip-mdl-44017' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 10 Mar 2014 05:45:26 +0000 (13:45 +0800)]
Merge branch 'MDL-44440_master' of git://github.com/dmonllao/moodle
David Monllao [Mon, 10 Mar 2014 05:31:01 +0000 (13:31 +0800)]
MDL-44440 behat: Changing , for > as a navigation tree nodes separator
Using greater than as seems a more natural separator
than the comma when separating nodes which have a
hierarchy relation.
Dan Poltawski [Mon, 10 Mar 2014 04:04:14 +0000 (12:04 +0800)]
Merge branch 'MDL-43236_master' of git://github.com/dmonllao/moodle
Niclas Tollstorff [Fri, 31 Jan 2014 18:33:24 +0000 (19:33 +0100)]
MDL-37733 SCORM: Correct check for force new attempt
Dan Marsden [Fri, 14 Feb 2014 09:58:25 +0000 (22:58 +1300)]
MDL-44066 Restore: Restore source field.
Causes problems when restoring a SCORM pacakge that uses an alias.
Dan Marsden [Sun, 5 Jan 2014 20:43:39 +0000 (09:43 +1300)]
MDL-43247 SCORM: improve pop-up handling and redirect to homepage on close.
Mark Nelson [Thu, 20 Feb 2014 06:13:13 +0000 (22:13 -0800)]
MDL-40913 core_message: removed 'view' add_to_log call
Mark Nelson [Wed, 26 Feb 2014 06:27:38 +0000 (22:27 -0800)]
MDL-40913 core_message: created 'message_read' event
Mark Nelson [Thu, 20 Feb 2014 05:25:51 +0000 (21:25 -0800)]
MDL-40913 core_message: replaced 'write' add_to_log call with an event
Mark Nelson [Wed, 19 Feb 2014 06:11:07 +0000 (22:11 -0800)]
MDL-40913 core_message: replaced 'unblock contact' add_to_log call with an event
Mark Nelson [Wed, 19 Feb 2014 06:03:45 +0000 (22:03 -0800)]
MDL-40913 core_message: replaced 'block contact' add_to_log call with an event
Mark Nelson [Tue, 18 Feb 2014 04:51:36 +0000 (20:51 -0800)]
MDL-40913 core_message: replaced 'remove contact' add_to_log call with an event
Mark Nelson [Tue, 18 Feb 2014 04:36:39 +0000 (20:36 -0800)]
MDL-40913 core_message: replaced 'add contact' add_to_log call with an event
Tim Hunt [Fri, 7 Mar 2014 16:31:00 +0000 (16:31 +0000)]
MDL-33653 fix preview links on calc qtype edit forms.
Also, refactor how we render preview icons, to eliminate duplication.
M Kassaei [Thu, 14 Nov 2013 12:01:10 +0000 (12:01 +0000)]
MDL-33653 questions, a way to save changes and continue editing
James Pratt [Fri, 7 Mar 2014 10:24:13 +0000 (17:24 +0700)]
MDL-44497 quiz responses report : error when no attempts
Brian King [Tue, 24 Dec 2013 13:00:49 +0000 (14:00 +0100)]
MDL-43497 Language: Allow course language to be overridden
David Monllao [Mon, 24 Feb 2014 03:29:41 +0000 (11:29 +0800)]
MDL-43236 behat: Step arguments normalization
Updating step definitions arguments according to the
documentation page.
David Monllao [Fri, 21 Feb 2014 07:18:07 +0000 (15:18 +0800)]
MDL-43236 behat: Updating references to deprecated methods
David Monllao [Fri, 21 Feb 2014 07:14:15 +0000 (15:14 +0800)]
MDL-43236 behat: Deprecate old steps
Correcting grammar errors and deprecating
the previous steps definitions:
- behat_data_generators::the_following_exists()
- behat_general::should_exists()
- behat_general::should_not_exists()
Rajesh Taneja [Wed, 5 Mar 2014 07:01:27 +0000 (15:01 +0800)]
MDL-44017 Events: Added unit test for report_viewed events
Rajesh Taneja [Tue, 4 Mar 2014 08:13:28 +0000 (16:13 +0800)]
MDL-44017 Events: Deprecated content_viewed event
Replaced content_viewed event with appropriate events and deprecated
content_viewed event
Andrew Nicols [Tue, 25 Feb 2014 02:42:45 +0000 (10:42 +0800)]
MDL-44334 Javascript: Prevent scroll locking for small screen heights
David Monllao [Tue, 4 Mar 2014 09:40:56 +0000 (17:40 +0800)]
MDL-44440 behat: Refactoring features to use I navigate to
Replacing multiple "I expand node" steps by the
new "I navigate to". Also fixing few I navigate to
when dealing with non-JS.
David Monllao [Mon, 24 Feb 2014 10:14:57 +0000 (18:14 +0800)]
MDL-44440 behat: Other fixes to make clean work properly
- Update the step to follow links inside a treeview
to work also when JS is disabled.
- Make regions accept header and footer.
- Change some locators refering to non-clean compatible
regions.
- Restricting click to the table row in forum tracking
because seems to conflict with the navigation bar when
using narrow window sizes.
Rajesh Taneja [Thu, 13 Feb 2014 06:27:44 +0000 (14:27 +0800)]
MDL-44440 navigation: Added behat step to navigate from navigation/Admin block
This step will help navigate to different parts of moodle
using navigation or adminstration block.
David Monllao [Mon, 24 Feb 2014 05:35:46 +0000 (13:35 +0800)]
MDL-44440 behat: Log out compatible with clean
.navbar needs to be clicked before following
log in or log out links.
Krister [Fri, 31 Jan 2014 13:07:09 +0000 (15:07 +0200)]
MDL-42368 Themes: Anomaly breadcrumb fix
Previously the editing button could become unreachable with small window
sizes.
Petr Škoda [Fri, 7 Mar 2014 03:06:17 +0000 (11:06 +0800)]
MDL-44496 fix minor trait docs issue
The store trait is not necessary any more in bufferef_writer
because we define the required methods as abstract.
Petr Škoda [Fri, 7 Mar 2014 02:36:34 +0000 (10:36 +0800)]
MDL-44496 fix event buffering in log stores
Marina Glancy [Thu, 6 Feb 2014 07:00:12 +0000 (15:00 +0800)]
MDL-42870 completion: performance and readability code refactoring
Marina Glancy [Thu, 6 Feb 2014 06:58:52 +0000 (14:58 +0800)]
MDL-42870 completion: show failed activities as incompleted
Marina Glancy [Thu, 6 Mar 2014 01:21:36 +0000 (09:21 +0800)]
MDL-44471 Revert "MDL-42238 mod_wiki: Alternate name sql update to wiki_print_recent_activity"
This reverts commit
6d3d9bd927d5386b1dc4fbbcb7db5559efa7a5cd.
Marina Glancy [Thu, 20 Feb 2014 08:08:26 +0000 (16:08 +0800)]
MDL-44337 glossary: behat test for glossary categories
Marina Glancy [Wed, 26 Feb 2014 06:26:33 +0000 (14:26 +0800)]
MDL-43966 events: link to migration wiki in lib/upgrade.txt
Marina Glancy [Thu, 6 Mar 2014 01:29:06 +0000 (09:29 +0800)]
MDL-40721 wiki: missing page->set_url() when restoring wiki
Marina Glancy [Thu, 6 Mar 2014 02:02:07 +0000 (10:02 +0800)]
MDL-32699 wiki: only edit capability is required to restore wiki revision
Petr Škoda [Tue, 4 Mar 2014 06:21:41 +0000 (14:21 +0800)]
MDL-44359 fix explode(', ', regressions from MDL-44255
Eloy Lafuente (stronk7) [Thu, 6 Mar 2014 21:16:58 +0000 (22:16 +0100)]
weekly release 2.7dev
Eloy Lafuente (stronk7) [Thu, 6 Mar 2014 21:16:48 +0000 (22:16 +0100)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Andrew Nicols [Thu, 6 Mar 2014 09:02:22 +0000 (17:02 +0800)]
MDL-44480 Javascript: Correct dialogue ID generation
Damyon Wiese [Wed, 26 Feb 2014 08:29:48 +0000 (16:29 +0800)]
MDL-43721 Assign + groups: Improve performance of assign grading table
Add a function to the groups lib to filter a list of users down
to the ones who can see the module. Required because calling
groups_course_module_visible() for a list of users is too slow
and we shouldn't spread group logic outside of grouplib.php.
Using it in the assign grading table reduces DB queries from 6198/1 to 256/3.
This is 12secs down to 2.5secs.
Andrew Nicols [Thu, 6 Mar 2014 07:14:20 +0000 (15:14 +0800)]
MDL-44478 Javascript: Remove duplications in simpleyui rollup
Damyon Wiese [Thu, 6 Mar 2014 06:00:38 +0000 (14:00 +0800)]
MDL-43721 Assign: Static cache for plugin is_enabled and is_visible because they get used alot
Yuliya Bozhko [Thu, 13 Feb 2014 21:20:29 +0000 (10:20 +1300)]
MDL-44140 badges: Prevent non-owners to change visibility of issued badges
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
Damyon Wiese [Thu, 6 Mar 2014 05:37:52 +0000 (13:37 +0800)]
Revert "MDL-32917 YUI2 to YUI3 Calendar port: only display the date from the matching selector and display the month/year matching the selector value"
There are numerous bugs with this new module to do with showing the currently selected date,
random changes in the selected dates, showing multiple selected dates and css errors.
This reverts commit
1d128663f69be8b60fc28b6b7732acd24d800a98.
This reverts commit
4a521e6596918279fd0cdeb47d06e7906bc004cc.
Damyon Wiese [Thu, 6 Mar 2014 03:41:09 +0000 (11:41 +0800)]
Merge branch 'MDL-32917-master-nomerge3' of git://github.com/mouneyrac/moodle
Jerome Mouneyrac [Thu, 6 Mar 2014 03:35:00 +0000 (11:35 +0800)]
MDL-32917 YUI2 to YUI3 Calendar port: only display the date from the matching selector and display the month/year matching the selector value
Damyon Wiese [Thu, 6 Mar 2014 01:21:24 +0000 (09:21 +0800)]
Merge branch 'wip-MDL-44403-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 6 Mar 2014 01:03:19 +0000 (09:03 +0800)]
Revert "MDL-43852 Filters Fixed naked-OR conditions."
While the patch worked as intended, we discovered some other concerns
about use of this setting in testing.
This reverts commit
840c1c554d12d9214928da6f10989fc5546dbb43.
Eloy Lafuente (stronk7) [Wed, 5 Mar 2014 23:35:28 +0000 (00:35 +0100)]
Merge branch 'MDL-44425-en_fix' of git://github.com/mudrd8mz/moodle
Helen Foster [Mon, 3 Mar 2014 19:26:20 +0000 (20:26 +0100)]
MDL-44425 Merge English strings from the en_fix language pack
Frederic Massart [Wed, 5 Mar 2014 08:58:13 +0000 (16:58 +0800)]
MDL-44345 repository_youtube: Endless loop when reaching last results
Andrew Nicols [Mon, 24 Feb 2014 03:48:27 +0000 (11:48 +0800)]
MDL-44061 Ajax: Log whitespace issues to the server error log
Petr Škoda [Wed, 5 Mar 2014 08:33:41 +0000 (16:33 +0800)]
MDL-44451 fix plugin_misplaced_exception exception
Brent Boghosian [Tue, 14 Jan 2014 16:25:10 +0000 (11:25 -0500)]
MDL-43635: Further support custom contexts
Reading from config DB table and reset method for after plugin install
Add PHPUnit test for custom context changes
Dan Poltawski [Wed, 5 Mar 2014 06:21:28 +0000 (14:21 +0800)]
Merge branch 'MDL-44319-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 5 Mar 2014 06:18:21 +0000 (14:18 +0800)]
Merge branch 'wip-MDL-44287-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 5 Mar 2014 06:13:23 +0000 (14:13 +0800)]
Merge branch 'MDL-43930-master-fix1' of git://github.com/damyon/moodle
Damyon Wiese [Wed, 5 Mar 2014 05:44:56 +0000 (13:44 +0800)]
Merge branch 'MDL-44370-master' of git://github.com/ankitagarwal/moodle