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
Rajesh Taneja [Thu, 8 May 2014 09:46:50 +0000 (17:46 +0800)]
MDL-44262 Behat: Bump behat version to get format fix
Eloy Lafuente (stronk7) [Thu, 8 May 2014 09:31:54 +0000 (11:31 +0200)]
Merge branch 'wip-mdl-45461' of https://github.com/rajeshtaneja/moodle
Marina Glancy [Thu, 8 May 2014 07:41:20 +0000 (15:41 +0800)]
Merge branch 'MDL-45373-master' of git://github.com/jamiepratt/moodle
Frederic Massart [Thu, 8 May 2014 07:05:05 +0000 (15:05 +0800)]
MDL-45332 repository_url: URL parameter is using PARAM_URL
Marina Glancy [Wed, 7 May 2014 07:39:36 +0000 (15:39 +0800)]
MDL-45414 wiki: blank image for page index icons
Marina Glancy [Thu, 8 May 2014 04:05:20 +0000 (12:05 +0800)]
Merge branch 'MDL-44630_CC_Changes' of git://github.com/moodlerooms/moodle
Marina Glancy [Thu, 8 May 2014 04:04:53 +0000 (12:04 +0800)]
Merge branch 'MDL-45398-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Thu, 8 May 2014 03:05:20 +0000 (11:05 +0800)]
Merge branch 'MDL-45425-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Thu, 8 May 2014 02:09:39 +0000 (10:09 +0800)]
MDL-43312 tinymce: bump plugin version
Dan Poltawski [Thu, 8 May 2014 02:51:51 +0000 (10:51 +0800)]
Merge branch 'MDL-43312-master' of git://github.com/damyon/moodle
Rajesh Taneja [Thu, 8 May 2014 02:10:28 +0000 (10:10 +0800)]
MDL-45461 behat: Added custom hack notice for chrome+safari+ie
Eloy Lafuente (stronk7) [Wed, 7 May 2014 21:54:36 +0000 (23:54 +0200)]
Merge branch '45457-27' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Wed, 7 May 2014 20:14:10 +0000 (08:14 +1200)]
MDL-45457 phpdoc: fixed up a couple of @package typos
Mark Nielsen [Wed, 7 May 2014 19:38:32 +0000 (12:38 -0700)]
MDL-44630: Fixing PHP foreach warnings
Eloy Lafuente (stronk7) [Wed, 7 May 2014 17:58:52 +0000 (19:58 +0200)]
Merge branch 'MDL-45449-master' of https://github.com/sammarshallou/moodle
sam marshall [Wed, 7 May 2014 15:35:23 +0000 (16:35 +0100)]
MDL-45449 Availabillity settings - new visible/hidden control (eye icon) is hard to spot
This change makes it use a larger icon.
Eloy Lafuente (stronk7) [Wed, 7 May 2014 13:50:15 +0000 (15:50 +0200)]
Merge branch '45231-27-3' of git://github.com/samhemelryk/moodle
Dan Poltawski [Wed, 7 May 2014 09:51:31 +0000 (17:51 +0800)]
Merge branch 'wip-MDL-45319-master' of git://github.com/marinaglancy/moodle
sam marshall [Fri, 2 May 2014 17:42:59 +0000 (18:42 +0100)]
MDL-45398 Manage availability restrictions: Show/hide not working
The show/hide icons were not working correctly. In addition, the
report still displayed even when availability feature was turned
off.
As well as fixing them, I added a Behat test to cover this report.
Marina Glancy [Wed, 7 May 2014 08:52:11 +0000 (16:52 +0800)]
Merge branch 'MDL-45282_message' of git://github.com/andyjdavis/moodle
Dan Poltawski [Wed, 7 May 2014 08:38:00 +0000 (16:38 +0800)]
Merge branch 'MDL-45410-en_fix' of git://github.com/mudrd8mz/moodle
Mark Nelson [Wed, 7 May 2014 06:32:14 +0000 (23:32 -0700)]
MDL-45319 events: added debugging messages for missing relateduserid value
Mark Nelson [Wed, 7 May 2014 05:50:51 +0000 (22:50 -0700)]
MDL-45319 events: set the relateduserid when triggering the user_created/updated/deleted events
Mark Nelson [Fri, 2 May 2014 23:39:40 +0000 (16:39 -0700)]
MDL-45319 events: trivial changes
Marina Glancy [Wed, 16 Apr 2014 06:35:20 +0000 (14:35 +0800)]
MDL-45126 do not allow guests see name and summary of hidden course
Juan Leyva [Wed, 7 May 2014 07:49:28 +0000 (15:49 +0800)]
MDL-43119 Add valid until dates for tokens created by login/token.php
3 months were decided
Andrew Davis [Sat, 26 Apr 2014 13:16:29 +0000 (21:16 +0800)]
MDL-45282 core_user: fixed up some oddities in the bulk user messaging screen
Andrew Nicols [Tue, 6 May 2014 04:49:47 +0000 (12:49 +0800)]
MDL-45425 editor_atto: Check for change selections asynchronously
Frederic Massart [Thu, 20 Mar 2014 08:14:03 +0000 (16:14 +0800)]
MDL-43877 blocks: Files from blocks in my/ were accessible to the world
Dan Poltawski [Wed, 7 May 2014 06:18:13 +0000 (14:18 +0800)]
Merge branch 'MDL-44606-master' of github.com/damyon/moodle
Dan Poltawski [Wed, 7 May 2014 06:16:20 +0000 (14:16 +0800)]
Merge branch 'wip-MDL-45421-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Wed, 7 May 2014 06:06:08 +0000 (14:06 +0800)]
MDL-44606 assign: disable sesskey protection for unit test.
Damyon Wiese [Wed, 7 May 2014 05:28:20 +0000 (13:28 +0800)]
Merge branch 'MDL-45290-master-fix' of https://github.com/jethac/moodle
Marina Glancy [Wed, 7 May 2014 05:06:30 +0000 (13:06 +0800)]
Merge branch 'MDL-45387-master' of git://github.com/jethac/moodle
Marina Glancy [Wed, 7 May 2014 05:06:17 +0000 (13:06 +0800)]
Merge branch 'MDL-45201-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Wed, 7 May 2014 04:31:11 +0000 (12:31 +0800)]
MDL-43312 TinyMCE: Version bump to 3.5.10. Remove all the hacks.
I retested the old bugs that required custom hacks to tinymce and could not reproduce them,
so I have not reimplemented the hacks.
Damyon Wiese [Thu, 13 Mar 2014 08:14:45 +0000 (16:14 +0800)]
MDL-44606 Assign: Some grading functions are missing sesskey protection
Adrian Greeve [Fri, 2 May 2014 07:25:16 +0000 (15:25 +0800)]
MDL-45421 report_eventlist: Changed sorting of event name column to sort by event name.
It was sorting by the full event path previous to this.
Dan Poltawski [Wed, 7 May 2014 04:05:17 +0000 (12:05 +0800)]
Merge branch 'wip-MDL-45414-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 7 May 2014 03:50:09 +0000 (11:50 +0800)]
Merge branch 'wip-MDL-45429-master' of git://github.com/marinaglancy/moodle
Eric Merrill [Wed, 7 May 2014 01:43:32 +0000 (21:43 -0400)]
MDL-45439 reports Don't send contextlevel to legacy logging.
It doesn't support the column.
Jetha Chan [Wed, 7 May 2014 02:52:51 +0000 (10:52 +0800)]
MDL-45387 core_form: erroneous escaping on reference list
Fixed erroneous escaping in JS.
Helen Foster [Tue, 6 May 2014 22:16:51 +0000 (00:16 +0200)]
MDL-45410 Merge English strings from the en_fix language pack
Sam Hemelryk [Tue, 6 May 2014 21:42:02 +0000 (09:42 +1200)]
MDL-45231 theme_clean: navbar is absolute when running behat in IE
Mark Nielsen [Tue, 6 May 2014 21:00:13 +0000 (14:00 -0700)]
MDL-44630: Fix CC backup of quizzes
The common cartridge backup was skipping
quizzes because the <questions> element
is no longer in the Moodle backup file.
Instead, now reading from the list of
<question_instances> list.
Eloy Lafuente (stronk7) [Tue, 6 May 2014 13:57:48 +0000 (15:57 +0200)]
on-demand release 2.7rc1+
Marina Glancy [Tue, 6 May 2014 09:13:37 +0000 (17:13 +0800)]
MDL-45357 events: unittest correction, event description change
Jetha Chan [Tue, 6 May 2014 07:49:30 +0000 (15:49 +0800)]
MDL-45290 rubrics: overflow, delete button alignment
Adjusted delete button alignment, restored overflow rule, amended button alignment, minor RTL fixes.
Andrew Nicols [Tue, 6 May 2014 07:13:10 +0000 (15:13 +0800)]
MDL-45357 events: Remove unnecessary the before 'id' in event descriptions
Andrew Nicols [Tue, 6 May 2014 06:57:42 +0000 (14:57 +0800)]
MDL-45357 events: Normalise event description names
Andrew Nicols [Tue, 6 May 2014 06:32:06 +0000 (14:32 +0800)]
MDL-45357 events: Improve clarity of allow role change descriptions
Mark Nelson [Tue, 6 May 2014 04:47:24 +0000 (21:47 -0700)]
MDL-45357 events: removed unnecessary verb from description
Andrew Nicols [Tue, 6 May 2014 08:09:54 +0000 (16:09 +0800)]
MDL-45338 editor_atto: Correct gesturemoveend listening
Delegate gesturemoveend rather than listen to ensure adequate event filters
and that we apply to only the correct editor.
Marina Glancy [Tue, 6 May 2014 08:05:20 +0000 (16:05 +0800)]
MDL-45429 block_glossary_random: check capability before suggesting to edit
James Pratt [Tue, 6 May 2014 05:26:02 +0000 (12:26 +0700)]
MDL-45373 quiz response analysis : count all tries at question
don't filter repeated tries.
Marina Glancy [Tue, 6 May 2014 04:19:58 +0000 (12:19 +0800)]
Merge branch 'MDL-45409-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 6 May 2014 04:03:44 +0000 (12:03 +0800)]
MDL-45412 Cache: Mongo DB string change (older is less than)
Damyon Wiese [Tue, 6 May 2014 03:58:15 +0000 (11:58 +0800)]
MDL-45412 Cache: Look for the newer classname first (mongo store)
Damyon Wiese [Tue, 6 May 2014 04:03:19 +0000 (12:03 +0800)]
Merge branch '45412-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 6 May 2014 03:48:38 +0000 (11:48 +0800)]
Merge branch 'MDL-45403-master' of git://github.com/FMCorz/moodle
Conflicts:
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
Dan Poltawski [Tue, 6 May 2014 03:34:17 +0000 (11:34 +0800)]
Merge branch 'MDL-45253-master' of git://github.com/FMCorz/moodle
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Marina Glancy [Tue, 6 May 2014 03:28:48 +0000 (11:28 +0800)]
MDL-45414 wiki: fix broken image
Dan Poltawski [Tue, 6 May 2014 03:27:41 +0000 (11:27 +0800)]
Merge branch 'MDL-45338-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 6 May 2014 03:23:39 +0000 (11:23 +0800)]
Merge branch 'MDL-45290-master-fix' of github.com/jethac/moodle
Dan Poltawski [Tue, 6 May 2014 03:16:32 +0000 (11:16 +0800)]
Merge branch 'MDL-45376-master' of https://github.com/sammarshallou/moodle
Jetha Chan [Mon, 5 May 2014 06:41:43 +0000 (14:41 +0800)]
MDL-45290 rubric: IE8 and minor fixes, RTL
Added a fallback style for IE8, adjusted some minor styles, added RTL capability.
Dan Poltawski [Tue, 6 May 2014 02:25:48 +0000 (10:25 +0800)]
Merge branch 'MDL-30106' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 6 May 2014 02:18:44 +0000 (10:18 +0800)]
Merge branch 'MDL-42956-master' of git://github.com/lameze/moodle
Sam Hemelryk [Mon, 5 May 2014 21:30:27 +0000 (09:30 +1200)]
MDL-45412 cachestore_mongodb: added notification of old Mongo version use
Sam Hemelryk [Mon, 5 May 2014 21:29:45 +0000 (09:29 +1200)]
MDL-45412 cachestore_mongodb: fixed use of deprecated Mongo class
Juan Leyva [Fri, 2 May 2014 09:38:17 +0000 (11:38 +0200)]
MDL-30106 forum: get_posts WS fixes in data generator and def. values
Juan Leyva [Fri, 2 May 2014 09:22:29 +0000 (11:22 +0200)]
MDL-30106 forum: Bump version number (upgrading service and installing new ws)
Juan Leyva [Tue, 4 Mar 2014 14:45:27 +0000 (15:45 +0100)]
MDL-30106 forum: New web service mod_forum_get_forum_discussion_posts
Frederic Massart [Mon, 5 May 2014 04:28:33 +0000 (12:28 +0800)]
MDL-45403 editor_atto: Change default for tagMarchRequiresAll to true
Frederic Massart [Fri, 2 May 2014 08:39:04 +0000 (16:39 +0800)]
MDL-45253 editor_atto: Async the highlighting of buttons
Frederic Massart [Fri, 2 May 2014 03:45:11 +0000 (11:45 +0800)]
MDL-45253 editor_atto: Check for button highlights on change event
This will allow a button to be highlighted when a plugin has updated
the content, not only when the selection has changed.
Frederic Massart [Thu, 1 May 2014 09:38:39 +0000 (17:38 +0800)]
MDL-45253 editor_atto: Prevent selection of all nodes when selection is empty
Frederic Massart [Thu, 1 May 2014 08:37:23 +0000 (16:37 +0800)]
MDL-45253 editor_atto: selectionFilterMatches includes parents
Marina Glancy [Mon, 5 May 2014 09:41:01 +0000 (17:41 +0800)]
Merge branch 'MDL-34904-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Mon, 5 May 2014 09:24:08 +0000 (17:24 +0800)]
Merge branch 'MDL-45359-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
Marina Glancy [Mon, 5 May 2014 09:18:04 +0000 (17:18 +0800)]
Merge branch 'MDL-44174-master' of git://github.com/FMCorz/moodle
Marina Glancy [Mon, 5 May 2014 09:17:45 +0000 (17:17 +0800)]
Merge branch 'MDL-45342-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Mon, 5 May 2014 09:17:30 +0000 (17:17 +0800)]
Merge branch 'MDL-43319-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Mon, 5 May 2014 09:17:11 +0000 (17:17 +0800)]
Merge branch 'MDL-44972-master' of git://github.com/damyon/moodle
Marina Glancy [Mon, 5 May 2014 09:16:52 +0000 (17:16 +0800)]
Merge branch '45231-27-2' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 5 May 2014 08:27:36 +0000 (16:27 +0800)]
MDL-44972 Atto dialogues: Change M.core.dialogue attribute name to "focusOnShowSelector"
And some minor cleanups.
Ankit Agarwal [Mon, 5 May 2014 08:26:35 +0000 (16:26 +0800)]
MDL-45409 conditional_activity: Do not iterate over deprecated properties
Marina Glancy [Mon, 5 May 2014 08:09:53 +0000 (16:09 +0800)]
Merge branch 'MDL-45357_master' of git://github.com/markn86/moodle
Mark Nelson [Wed, 30 Apr 2014 22:37:17 +0000 (15:37 -0700)]
MDL-45357 events: changed event descriptions to ensure consistency in core
Damyon Wiese [Mon, 5 May 2014 07:21:11 +0000 (15:21 +0800)]
MDL-44972 Atto: Focus on the first input field in forms in dialogues.
Damyon Wiese [Mon, 5 May 2014 06:05:18 +0000 (14:05 +0800)]
MDL-44224: outdent plugin - handle divs that have been silently switched for ps
Also - fix a shifter warning.
Sam Hemelryk [Mon, 5 May 2014 01:23:09 +0000 (13:23 +1200)]
MDL-44224 atto_indent: converts blockquotes to div indents
Ankit Agarwal [Mon, 5 May 2014 05:28:43 +0000 (13:28 +0800)]
MDL-45201 recent_activity: Fix set type notice in recent activity form
Damyon Wiese [Mon, 5 May 2014 02:43:15 +0000 (10:43 +0800)]
Merge branch 'MDL-45290-master' of git://github.com/jethac/moodle
Damyon Wiese [Mon, 5 May 2014 02:35:28 +0000 (10:35 +0800)]
Merge branch 'MDL-45382-master' of git://github.com/FMCorz/moodle
Marina Glancy [Mon, 5 May 2014 02:18:03 +0000 (10:18 +0800)]
Merge branch 'wip-MDL-45127-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Fri, 2 May 2014 02:23:06 +0000 (14:23 +1200)]
MDL-45231 theme_clean: default navbar to absolute when running behat
Dan Poltawski [Fri, 2 May 2014 09:41:54 +0000 (17:41 +0800)]
Moodle release 2.7rc1
Dan Poltawski [Fri, 2 May 2014 09:41:51 +0000 (17:41 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
