Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 22:52:07 +0000 (23:52 +0100)]
Merge branch 'MDL-43874' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 20:11:03 +0000 (21:11 +0100)]
Merge branch 'MDL-43757_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Mon, 27 Jan 2014 19:40:45 +0000 (08:40 +1300)]
Merge branch 'wip-MDL-43643-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 18:23:09 +0000 (19:23 +0100)]
Merge branch 'wip-mdl-43765' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 18:19:31 +0000 (19:19 +0100)]
Merge branch 'wip-mdl-43766' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 16:18:56 +0000 (17:18 +0100)]
Merge branch 'MDL-43773-master' of https://github.com/lucisgit/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 16:03:25 +0000 (17:03 +0100)]
Merge branch 'MDL-43581' of git://github.com/timhunt/moodle
Tim Hunt [Mon, 27 Jan 2014 11:57:55 +0000 (11:57 +0000)]
MDL-43874 quiz, teacher comments should respect display options.
Whether the comments on manually graded questions were visible to
students should have been controlled by the 'Specific feedback' Review
option in the quiz settings. However, the quiz was not setting
$displayoptions->manualcomment, so it did not work.
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 11:02:28 +0000 (12:02 +0100)]
Merge branch 'wip-MDL-43800-master' of git://github.com/marinaglancy/moodle
Tim Hunt [Thu, 23 Jan 2014 15:35:53 +0000 (15:35 +0000)]
MDL-43581 additionalhtmlfooter should be added to every page
Not just pages with a visible footer.
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 09:59:37 +0000 (10:59 +0100)]
Merge branch 'MDL-43809' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 27 Jan 2014 02:28:47 +0000 (15:28 +1300)]
Merge branch 'MDL-33839c' of git://github.com/mkassaei/moodle
Sam Hemelryk [Mon, 27 Jan 2014 01:30:57 +0000 (14:30 +1300)]
Merge branch 'w04_MDL-43761_m27_sqlinstall' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jan 2014 00:18:05 +0000 (01:18 +0100)]
Merge branch 'MDL-43758_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Sun, 26 Jan 2014 23:26:44 +0000 (00:26 +0100)]
Merge branch 'MDL-43734_purgeUserSession' of https://github.com/moodlerooms/moodle
Sam Hemelryk [Sun, 26 Jan 2014 22:32:08 +0000 (11:32 +1300)]
Merge branch 'w04_MDL-43746_m27_courselogin' of https://github.com/skodak/moodle
Sam Hemelryk [Sun, 26 Jan 2014 22:16:11 +0000 (11:16 +1300)]
Merge branch 'MDL-43794' of https://github.com/merrill-oakland/moodle
M Kassaei [Fri, 24 Jan 2014 14:08:19 +0000 (14:08 +0000)]
MDL-33839d, Remove the move icon from the question bank
Tony Butler [Mon, 20 Jan 2014 15:42:00 +0000 (15:42 +0000)]
MDL-43773 mod_choice: Swap order of name column headings in text export
David Monllao [Mon, 20 Jan 2014 05:34:26 +0000 (13:34 +0800)]
MDL-43758 performance: New metric, time spent by the database
This patch adds a new performance metric to the performance
info shown by MDL_PERF* vars, the time spent by the database,
it was one of the wonderful @poltawski ideas. To be more specific
the value displayed is the sum of the time elapsed between query_start()
and query_end().
David Monllao [Mon, 20 Jan 2014 07:58:23 +0000 (15:58 +0800)]
MDL-43757 behat: Allowing the form field guesser to detect TinyMCE
It includes 2 more minor fixes:
- Escapes values sent to TinyMCE as it was breaking
when values contained double quotes.
- Adding seconds to the screenshots directory to
avoid using the same folder for multiple runs.
David Monllao [Mon, 20 Jan 2014 07:54:29 +0000 (15:54 +0800)]
MDL-43757 messaging: Behat feature to test participants messaging
The new test checks that messages can be sent from
the participants block and they can be read when
accesing user's recent conversations.
Petr Skoda [Tue, 21 Jan 2014 09:41:29 +0000 (17:41 +0800)]
MDL-43746 fix require_course_login regression caused by MDL-25981
Petr Škoda [Fri, 24 Jan 2014 05:47:22 +0000 (13:47 +0800)]
MDL-43761 execute bulk sql when modifying db structure
In case of postgresql this uses transactions to allow easier recovery from broken installs.
Petr Škoda [Fri, 24 Jan 2014 05:46:30 +0000 (13:46 +0800)]
MDL-43761 use single query in mysql when crating tables
Petr Skoda [Mon, 20 Jan 2014 06:06:44 +0000 (14:06 +0800)]
MDL-43761 refactor db manager code to send arrays of SQL to the dml driver
Jason Fowler [Tue, 21 Jan 2014 00:10:15 +0000 (08:10 +0800)]
MDL-40786 User profile: Fixing narrow screen RTL collapse
Nadav Kavalerchik [Sat, 17 Aug 2013 21:17:11 +0000 (00:17 +0300)]
MDL-40786 User Profile: Right align profile fields in RTL mode (theme/bootstrapbase, theme/clean)
Tim Hunt [Wed, 22 Jan 2014 12:45:08 +0000 (12:45 +0000)]
MDL-43809 qformat_xml messes up $s in multianswer questions.
Eloy Lafuente (stronk7) [Thu, 23 Jan 2014 11:38:19 +0000 (12:38 +0100)]
weekly release 2.7dev
Eloy Lafuente (stronk7) [Thu, 23 Jan 2014 11:38:06 +0000 (12:38 +0100)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Damyon Wiese [Thu, 23 Jan 2014 09:13:18 +0000 (17:13 +0800)]
Revert "MDL-43247 SCORM: improve pop-up handling and redirect to homepage on close."
This reverts commit
ed3d1ee60d1e48ade21438fd98fef2deb63ecb5f.
This reverts commit
ed8eebeecefa98e17c96084b72fe2cd923cc051d.
This reverts commit
f664a9387818b5b359df4696040da0aea07b926a.
This reverts commit
9d2276572372f5d249cde8c61d0976e25f0fa4a8.
Dan Marsden [Thu, 23 Jan 2014 07:38:01 +0000 (20:38 +1300)]
MDL-43247 SCORM: use window.closed property instead of window.opener for IE
Marina Glancy [Thu, 23 Jan 2014 02:59:33 +0000 (10:59 +0800)]
MDL-43643 chat: do not assign to nonexisting cm_info properties
Damyon Wiese [Thu, 23 Jan 2014 02:49:56 +0000 (10:49 +0800)]
MDL-43247 Scorm: Fix for undefined js variable when popup is blocked.
Damyon Wiese [Thu, 23 Jan 2014 02:27:18 +0000 (10:27 +0800)]
Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle
Dan Poltawski [Thu, 23 Jan 2014 01:32:36 +0000 (09:32 +0800)]
Merge branch 'MDL-43670' of git://github.com/timhunt/moodle
Eric Merrill [Wed, 22 Jan 2014 13:57:53 +0000 (08:57 -0500)]
MDL-43794 Files API Set the mtime of files to extraction time.
The restore cleanup code expects the mtime to be the time of extraction
not the mtime before archiving. If set to the old mtime, the restore
files may be cleaned up before the restore is complete.
This behaviour also matches the behaviour of the zip unpacker.
Dan Marsden [Wed, 22 Jan 2014 08:53:26 +0000 (21:53 +1300)]
MDL-43247 SCORM: convert some js to YUI
Tim Hunt [Wed, 22 Jan 2014 08:32:10 +0000 (08:32 +0000)]
MDL-43670 fix quiz backup.
Marina Glancy [Wed, 22 Jan 2014 04:16:26 +0000 (12:16 +0800)]
MDL-43800 course: groupings are sorted alphabetically
Damyon Wiese [Wed, 22 Jan 2014 02:00:43 +0000 (10:00 +0800)]
MDL-26680: Reset my moodle page - add sesskey check.
Damyon Wiese [Wed, 22 Jan 2014 01:52:38 +0000 (09:52 +0800)]
Merge branch 'MDL-26680-master' of git://github.com/micaherne/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Wed, 22 Jan 2014 01:15:52 +0000 (09:15 +0800)]
Merge branch 'w03_MDL-43661_m27_edulevel' of https://github.com/skodak/moodle
Michael Aherne [Wed, 25 Jul 2012 12:33:29 +0000 (13:33 +0100)]
MDL-26680 my page My Moodle "reset to default" button
Dan Poltawski [Tue, 21 Jan 2014 15:29:20 +0000 (23:29 +0800)]
Merge branch 'MDL-41506-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Petr Škoda [Mon, 13 Jan 2014 01:44:35 +0000 (09:44 +0800)]
MDL-43661 use new edulevel in all existing events
Petr Škoda [Mon, 13 Jan 2014 01:15:52 +0000 (09:15 +0800)]
MDL-43661 change event property level to edulevel
Level is a reserved word in sql, sorry.
Dan Poltawski [Tue, 21 Jan 2014 07:21:17 +0000 (15:21 +0800)]
Merge branch 'mdl34020-master' of https://github.com/tlock/moodle
Dan Poltawski [Tue, 21 Jan 2014 06:49:26 +0000 (14:49 +0800)]
Merge branch '43714-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 21 Jan 2014 06:28:50 +0000 (14:28 +0800)]
Merge branch 'MDL-43760-master' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 21 Jan 2014 05:47:39 +0000 (13:47 +0800)]
Merge branch 'MDL-43725-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 21 Jan 2014 05:17:05 +0000 (13:17 +0800)]
Merge branch 'wip-MDL-43294-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Tue, 21 Jan 2014 05:06:30 +0000 (13:06 +0800)]
Merge branch 'MDL-41810_master' of https://github.com/totara/openbadges
Conflicts:
badges/upgrade.txt
Damyon Wiese [Tue, 21 Jan 2014 04:57:05 +0000 (12:57 +0800)]
Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 21 Jan 2014 04:24:38 +0000 (12:24 +0800)]
Merge branch 'wip-MDL-43700-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 21 Jan 2014 04:19:34 +0000 (12:19 +0800)]
Merge branch 'MDL-43717_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 21 Jan 2014 03:58:40 +0000 (11:58 +0800)]
MDL-43670 quiz: improve code comments a little
Dan Poltawski [Tue, 21 Jan 2014 03:25:38 +0000 (11:25 +0800)]
Merge branch 'MDL-43670' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 21 Jan 2014 03:21:52 +0000 (11:21 +0800)]
Merge branch 'MDL-43693-master' of https://github.com/lucisgit/moodle
Rajesh Taneja [Mon, 20 Jan 2014 08:15:37 +0000 (16:15 +0800)]
MDL-43765 reports: Fixed addtional name warning
Fix the alternate name warning which is generated when course participation report
is viewed
Damyon Wiese [Tue, 21 Jan 2014 02:41:40 +0000 (10:41 +0800)]
Merge branch 'wip-mdl-40917' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 21 Jan 2014 02:37:01 +0000 (10:37 +0800)]
Merge branch 'MDL-42955_b' of git://github.com/rwijaya/moodle
Damyon Wiese [Tue, 21 Jan 2014 01:35:21 +0000 (09:35 +0800)]
Merge branch 'MDL-41688-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 21 Jan 2014 01:28:54 +0000 (09:28 +0800)]
Merge branch 'MDL-43732' of github.com:merrill-oakland/moodle
Eloy Lafuente (stronk7) [Tue, 21 Jan 2014 00:59:50 +0000 (01:59 +0100)]
Merge branch 'wip-MDL-43333-master' of git://github.com/marinaglancy/moodle
Eric Merrill [Wed, 15 Jan 2014 23:15:05 +0000 (18:15 -0500)]
MDL-43732 quiz Fix styles so that question div doesn't overlap controls.
Eloy Lafuente (stronk7) [Tue, 21 Jan 2014 00:54:00 +0000 (01:54 +0100)]
Merge branch 'wip-MDL-43211-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 21 Jan 2014 00:46:16 +0000 (01:46 +0100)]
Merge branch 'MDL-43401-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 21 Jan 2014 00:43:13 +0000 (01:43 +0100)]
Merge branch 'MDL-43480_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 21 Jan 2014 00:13:04 +0000 (01:13 +0100)]
Merge branch 'MDL-41693-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 20 Jan 2014 23:20:28 +0000 (00:20 +0100)]
Merge branch 'MDL-39684-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Eloy Lafuente (stronk7) [Mon, 20 Jan 2014 23:17:31 +0000 (00:17 +0100)]
Merge branch 'MDL-40533-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 20 Jan 2014 23:05:03 +0000 (00:05 +0100)]
Merge branch 'MDL-43743_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 20 Jan 2014 22:59:27 +0000 (23:59 +0100)]
Merge branch 'MDL-41362-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Frederic Massart [Tue, 14 Jan 2014 14:24:13 +0000 (15:24 +0100)]
MDL-41688 gradebook: Improved grading layout on bootstrapbase themes
Damyon Wiese [Mon, 20 Jan 2014 09:24:04 +0000 (17:24 +0800)]
MDL-39756 qtype_essay : Make defaults match upgrade (and php) for responserequired field
Damyon Wiese [Mon, 20 Jan 2014 09:10:38 +0000 (17:10 +0800)]
Merge branch 'MDL-43632-master' of https://github.com/lucisgit/moodle
Rajesh Taneja [Mon, 20 Jan 2014 08:43:37 +0000 (16:43 +0800)]
MDL-43766 reports: Fixed wrong string variable
Damyon Wiese [Mon, 20 Jan 2014 08:20:15 +0000 (16:20 +0800)]
Merge branch 'MDL-39756-essay' of https://github.com/ktemkin/moodle
Damyon Wiese [Mon, 20 Jan 2014 08:02:54 +0000 (16:02 +0800)]
Merge branch 'MDL-32523' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 20 Jan 2014 07:29:15 +0000 (15:29 +0800)]
Merge branch 'wip-MDL-41062-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 20 Jan 2014 07:25:46 +0000 (15:25 +0800)]
Merge branch '42682-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 20 Jan 2014 06:24:38 +0000 (14:24 +0800)]
Merge branch 'MDL-43690' of git://github.com/timhunt/moodle
Rossiani Wijaya [Mon, 20 Jan 2014 06:00:29 +0000 (14:00 +0800)]
MDL-42955: Removed scrollbar from block's action menu
Damyon Wiese [Mon, 20 Jan 2014 05:37:51 +0000 (13:37 +0800)]
MDL-43760 Potential fix for fletcher scott issues with fullname.
Damyon Wiese [Mon, 20 Jan 2014 05:21:58 +0000 (13:21 +0800)]
Merge branch 'MDL-42495-m' of git://github.com/micaherne/moodle
Dan Poltawski [Mon, 20 Jan 2014 04:56:17 +0000 (12:56 +0800)]
Merge branch 'MDL-42980' of git://github.com/rwijaya/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Marina Glancy [Tue, 14 Jan 2014 06:54:00 +0000 (14:54 +0800)]
MDL-41062 gradebook: corrections to grade_item upgrade script, more tests
Damyon Wiese [Mon, 20 Jan 2014 03:27:07 +0000 (11:27 +0800)]
Merge branch 'MDL-39683-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Mon, 20 Jan 2014 03:22:27 +0000 (11:22 +0800)]
MDL-40051 Add mnet test folder to phpunit.xml.dist
Damyon Wiese [Mon, 20 Jan 2014 02:57:30 +0000 (10:57 +0800)]
Merge branch '43675-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 20 Jan 2014 02:53:50 +0000 (10:53 +0800)]
Merge branch 'MDL-43671_message' of https://github.com/andyjdavis/moodle
Damyon Wiese [Mon, 20 Jan 2014 02:41:36 +0000 (10:41 +0800)]
Merge branch 'MDL-40051_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 20 Jan 2014 02:33:36 +0000 (10:33 +0800)]
Merge branch 'MDL-40139-master' of git://github.com/FMCorz/moodle
Mark Nelson [Sun, 1 Dec 2013 00:16:42 +0000 (16:16 -0800)]
MDL-40051 core_lib: replaced add_to_log call when failing to send email with an event
Mark Nelson [Fri, 29 Nov 2013 20:58:40 +0000 (12:58 -0800)]
MDL-40051 core_mnet: replaced add_to_log calls with events
Ankit Agarwal [Fri, 17 Jan 2014 06:38:50 +0000 (14:38 +0800)]
MDL-43725 report_loglive: Fixing undefined variable error
AMOS BEGIN
CPY [page,report_log],[page,report_loglive]
AMOS END
Damyon Wiese [Mon, 20 Jan 2014 02:02:40 +0000 (10:02 +0800)]
Merge branch 'MDL-43733' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 20 Jan 2014 01:45:43 +0000 (09:45 +0800)]
Merge branch 'wip-mdl-43306-m' of git://github.com/rajeshtaneja/moodle
