moodle.git
6 years agoMerge branch 'wip_MDL-48420_m29_lasttypo' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 1 Dec 2014 17:08:56 +0000 (17:08 +0000)]
Merge branch 'wip_MDL-48420_m29_lasttypo' of https://github.com/skodak/moodle

6 years agoMerge branch 'MDL-48342' of git://github.com/jmvedrine/moodle
Dan Poltawski [Mon, 1 Dec 2014 16:31:15 +0000 (16:31 +0000)]
Merge branch 'MDL-48342' of git://github.com/jmvedrine/moodle

6 years agoMerge branch 'wip-MDL-32547-master-v2' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 1 Dec 2014 16:23:41 +0000 (16:23 +0000)]
Merge branch 'wip-MDL-32547-master-v2' of git://github.com/abgreeve/moodle

Conflicts:
version.php

6 years agoMerge branch 'MDL-40241_master' of https://github.com/dmonllao/moodle
Dan Poltawski [Mon, 1 Dec 2014 15:46:34 +0000 (15:46 +0000)]
Merge branch 'MDL-40241_master' of https://github.com/dmonllao/moodle

6 years agoMerge branch '48335-29' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 1 Dec 2014 14:28:19 +0000 (14:28 +0000)]
Merge branch '48335-29' of git://github.com/samhemelryk/moodle

7 years agoMerge branch '27548-29' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 1 Dec 2014 12:21:19 +0000 (12:21 +0000)]
Merge branch '27548-29' of git://github.com/samhemelryk/moodle

Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php

7 years agoMDL-40241 core_completion: Minor fixes to provided patch
David Monllao [Fri, 28 Nov 2014 09:23:37 +0000 (17:23 +0800)]
MDL-40241 core_completion: Minor fixes to provided patch

Thanks to Aaron Barnes and Jon Sharp for working on this issue.

7 years agoMerge branch 'MDL-18183-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 1 Dec 2014 01:45:50 +0000 (14:45 +1300)]
Merge branch 'MDL-18183-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'wip-MDL-48377-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 1 Dec 2014 01:02:08 +0000 (14:02 +1300)]
Merge branch 'wip-MDL-48377-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-48382' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 1 Dec 2014 00:58:13 +0000 (13:58 +1300)]
Merge branch 'MDL-48382' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-35696-master-course-meta-link-sort-order' of https://github.com...
Sam Hemelryk [Mon, 1 Dec 2014 00:50:52 +0000 (13:50 +1300)]
Merge branch 'MDL-35696-master-course-meta-link-sort-order' of https://github.com/amandadoughty/moodle

7 years agoMerge branch 'MDL-46618_master' of git://github.com/kordan/moodle
Sam Hemelryk [Mon, 1 Dec 2014 00:11:32 +0000 (13:11 +1300)]
Merge branch 'MDL-46618_master' of git://github.com/kordan/moodle

7 years agoMerge branch 'MDL-40607-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Sun, 30 Nov 2014 22:40:57 +0000 (11:40 +1300)]
Merge branch 'MDL-40607-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch 'MDL-14402-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 30 Nov 2014 22:35:44 +0000 (11:35 +1300)]
Merge branch 'MDL-14402-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-48384-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Sun, 30 Nov 2014 22:31:29 +0000 (11:31 +1300)]
Merge branch 'MDL-48384-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch 'MDL-48309-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 30 Nov 2014 22:10:25 +0000 (11:10 +1300)]
Merge branch 'MDL-48309-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-34867-master' of https://github.com/tbannister/moodle
Sam Hemelryk [Sun, 30 Nov 2014 21:45:04 +0000 (10:45 +1300)]
Merge branch 'MDL-34867-master' of https://github.com/tbannister/moodle

7 years agoMDL-47133 editor_atto: fixed lint errors
Sam Hemelryk [Sun, 30 Nov 2014 21:36:23 +0000 (10:36 +1300)]
MDL-47133 editor_atto: fixed lint errors

7 years agoMerge branch 'MDL-47133-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Sun, 30 Nov 2014 21:34:18 +0000 (10:34 +1300)]
Merge branch 'MDL-47133-master' of git://github.com/FMCorz/moodle

7 years agoMDL-48420 test: fix lasttnamephonetic typo
Petr Skoda [Sun, 30 Nov 2014 20:25:55 +0000 (09:25 +1300)]
MDL-48420 test: fix lasttnamephonetic typo

7 years agoMerge branch 'MDL-48227-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Sun, 30 Nov 2014 20:14:46 +0000 (09:14 +1300)]
Merge branch 'MDL-48227-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'MDL-42717-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Sun, 30 Nov 2014 19:47:34 +0000 (08:47 +1300)]
Merge branch 'MDL-42717-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'wip-mdl-48192' of https://github.com/rajeshtaneja/moodle
Sam Hemelryk [Sun, 30 Nov 2014 19:33:53 +0000 (08:33 +1300)]
Merge branch 'wip-mdl-48192' of https://github.com/rajeshtaneja/moodle

7 years agoMDL-28286 JavaScript: Convert all uses of M.str to M.util.get_string
Andrew Nicols [Thu, 20 Nov 2014 02:43:20 +0000 (10:43 +0800)]
MDL-28286 JavaScript: Convert all uses of M.str to M.util.get_string

7 years agoMDL-40607 deprecatedlib: final deprecations of 2.0 functions
Dan Poltawski [Sat, 22 Nov 2014 09:34:55 +0000 (09:34 +0000)]
MDL-40607 deprecatedlib: final deprecations of 2.0 functions

These functions are getting final deprecation following our process.
Note that print_arrow() is getting more time due to incorrect
replacement - see MDL-45448

7 years agoMDL-48342 Question: qformat_default::readquestion is broken
Jean-Michel Vedrine [Thu, 27 Nov 2014 08:38:38 +0000 (09:38 +0100)]
MDL-48342 Question: qformat_default::readquestion is broken

7 years agoMDL-34867 report_log: Improved download speed and memory usage.
Tyler Bannister [Mon, 24 Nov 2014 19:20:00 +0000 (14:20 -0500)]
MDL-34867 report_log: Improved download speed and memory usage.

7 years agoMDL-48382 quiz behat: make add question step more robust.
Tim Hunt [Wed, 26 Nov 2014 09:29:34 +0000 (09:29 +0000)]
MDL-48382 quiz behat: make add question step more robust.

7 years agoMDL-48227 forum: Update the message shown in emails
Ankit Agarwal [Tue, 25 Nov 2014 05:06:20 +0000 (10:36 +0530)]
MDL-48227 forum: Update the message shown in emails

AMOS BEGIN
 MOV [deleteoriginalonreply,mod_forum],[replytopostbyemail,mod_forum]
AMOS END

7 years agoMDL-40241 blocks_completionstatus: Fix notices
Aaron Barnes [Mon, 16 Dec 2013 08:00:40 +0000 (21:00 +1300)]
MDL-40241 blocks_completionstatus: Fix notices

7 years agoMDL-40241 completion: Default roles unable to manually complete course
Aaron Barnes [Thu, 5 Sep 2013 01:18:09 +0000 (13:18 +1200)]
MDL-40241 completion: Default roles unable to manually complete course

Thanks to Jon Sharp for authoring the original patch!

7 years agoweekly release 2.9dev
Dan Poltawski [Fri, 28 Nov 2014 08:04:39 +0000 (08:04 +0000)]
weekly release 2.9dev

7 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Fri, 28 Nov 2014 08:04:36 +0000 (08:04 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

7 years agoRevert "Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle"
Damyon Wiese [Fri, 28 Nov 2014 07:05:33 +0000 (15:05 +0800)]
Revert "Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle"

This reverts commit 861a0fd92a9a8ae3f970707a8e39a4ba96fbdaba.

This reverts commit f376c2ffd7d8304bafff851ead3ed10dee34c805, reversing
changes made to abe9be7240d7bda36bd3831b3638795466987745.

7 years agoMDL-32547 backup: Add setting for backup folder tidy up.
Adrian Greeve [Mon, 24 Nov 2014 01:45:27 +0000 (09:45 +0800)]
MDL-32547 backup: Add setting for backup folder tidy up.

7 years agoMDL-38128 mod_assign: Changes in grading summary page using team submissions
David Monllao [Thu, 27 Nov 2014 10:08:43 +0000 (18:08 +0800)]
MDL-38128 mod_assign: Changes in grading summary page using team submissions

If there is an active group and (groupmode != NOGROUPS)
the displayed info is related with that single group.

7 years agoRevert "Merge branch 'MDL-43127-master' of git://github.com/FMCorz/moodle"
Dan Poltawski [Thu, 27 Nov 2014 09:33:52 +0000 (09:33 +0000)]
Revert "Merge branch 'MDL-43127-master' of git://github.com/FMCorz/moodle"

This reverts commit 4e75dd78e6c93f7c341bca703d292606436610d5, reversing
changes made to f376c2ffd7d8304bafff851ead3ed10dee34c805.

7 years agoRevert "Merge branch 'MDL-43127-master-fixup' of https://github.com/FMCorz/moodle"
Dan Poltawski [Thu, 27 Nov 2014 09:33:48 +0000 (09:33 +0000)]
Revert "Merge branch 'MDL-43127-master-fixup' of https://github.com/FMCorz/moodle"

This reverts commit 7bd780835b2e9ff8002da218a5ca42de8dc321b4, reversing
changes made to 1e7e4d5f01c7eaa2278aa38f8abd8c04197d51cc.

7 years agoMDL-48192 tool_monitor: check output buffer and not ignore it.
Rajesh Taneja [Thu, 13 Nov 2014 08:32:56 +0000 (16:32 +0800)]
MDL-48192 tool_monitor: check output buffer and not ignore it.

Check what is thrown in output buffer and
make sure output is expected output.

7 years agoMDL-20365 auth_db: upgrade.txt - make the hash comment clearer
Dan Poltawski [Thu, 27 Nov 2014 08:43:32 +0000 (08:43 +0000)]
MDL-20365 auth_db: upgrade.txt - make the hash comment clearer

7 years agoMDL-20365 auth_db: refinement to the upgrade.txt
Dan Poltawski [Thu, 27 Nov 2014 08:26:43 +0000 (08:26 +0000)]
MDL-20365 auth_db: refinement to the upgrade.txt

7 years agoMDL-20365 auth_db: Warning users about case sensitive plain passwords
David Monllao [Thu, 27 Nov 2014 05:57:06 +0000 (13:57 +0800)]
MDL-20365 auth_db: Warning users about case sensitive plain passwords

Also, changing returned passwords to lower case when
maching against an md5() string or a sha1() string.

7 years agoMDL-22309 enrol_self: Fixing get_role_users usage
David Monllao [Thu, 27 Nov 2014 03:32:58 +0000 (11:32 +0800)]
MDL-22309 enrol_self: Fixing get_role_users usage

7 years agoMerge branch 'wip-mdl-48190-m' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 26 Nov 2014 12:25:17 +0000 (13:25 +0100)]
Merge branch 'wip-mdl-48190-m' of https://github.com/rajeshtaneja/moodle

7 years agoMDL-48384 thirdpartylibs: correct location of yui
Dan Poltawski [Wed, 26 Nov 2014 12:12:03 +0000 (12:12 +0000)]
MDL-48384 thirdpartylibs: correct location of yui

7 years agoMDL-20365 auth_db: cross-db passfield case and saltedcrypt unit test
Eloy Lafuente (stronk7) [Wed, 26 Nov 2014 11:04:31 +0000 (12:04 +0100)]
MDL-20365 auth_db: cross-db passfield case and saltedcrypt unit test

7 years agoMDL-47133 editor_atto: Use strict validation of keyboard shortcuts
Frederic Massart [Tue, 25 Nov 2014 03:56:47 +0000 (11:56 +0800)]
MDL-47133 editor_atto: Use strict validation of keyboard shortcuts

7 years agoMerge branch 'MDL-43127-master-fixup' of https://github.com/FMCorz/moodle
Dan Poltawski [Wed, 26 Nov 2014 09:22:56 +0000 (09:22 +0000)]
Merge branch 'MDL-43127-master-fixup' of https://github.com/FMCorz/moodle

7 years agoMDL-43127 tool_uploadcourse: Empty enrolment method is acceptable
Frederic Massart [Wed, 26 Nov 2014 09:11:35 +0000 (17:11 +0800)]
MDL-43127 tool_uploadcourse: Empty enrolment method is acceptable

Without the patch a course would not be created if it contained
an enrolment method column with an empty value. e.g.:

shortname,fullname,category,enrolment_1,enrolment_1_disable
courserestored,Course restored,1,,
courserestored2,Course restored 2,manual,1

7 years agoMerge branch 'MDL-48210-master-checker-caching' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 26 Nov 2014 08:20:36 +0000 (08:20 +0000)]
Merge branch 'MDL-48210-master-checker-caching' of git://github.com/mudrd8mz/moodle

7 years agoMDL-48210 updates checker: Fix empty return type
David Mudrák [Wed, 26 Nov 2014 08:07:50 +0000 (09:07 +0100)]
MDL-48210 updates checker: Fix empty return type

Credit goes to Marina Glancy for catching during the testing.

7 years agoMDL-48148 mod_forum: Use correct original subject when handling replies
Andrew Nicols [Wed, 26 Nov 2014 07:58:05 +0000 (15:58 +0800)]
MDL-48148 mod_forum: Use correct original subject when handling replies

7 years agoMDL-14402 blocks: Do not show assign roles on my home
Andrew Nicols [Wed, 19 Nov 2014 02:22:02 +0000 (10:22 +0800)]
MDL-14402 blocks: Do not show assign roles on my home

7 years agoMDL-48377 forum: do not swallow spaces in notification emails
Marina Glancy [Wed, 26 Nov 2014 04:10:41 +0000 (12:10 +0800)]
MDL-48377 forum: do not swallow spaces in notification emails

7 years agoMDL-27548 block_comments: add pagination tests
Sam Hemelryk [Wed, 26 Nov 2014 00:31:59 +0000 (13:31 +1300)]
MDL-27548 block_comments: add pagination tests

7 years agoMDL-27548 comments: component now recorded
Sam Hemelryk [Wed, 12 Nov 2014 22:38:41 +0000 (11:38 +1300)]
MDL-27548 comments: component now recorded

7 years agoMerge branch 'MDL-22309_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Tue, 25 Nov 2014 20:06:08 +0000 (09:06 +1300)]
Merge branch 'MDL-22309_master' of git://github.com/dmonllao/moodle

7 years agoMDL-48191 gradebook: fixed floating headers when emails not displayed
Jetha Chan [Mon, 17 Nov 2014 02:17:53 +0000 (10:17 +0800)]
MDL-48191 gradebook: fixed floating headers when emails not displayed

7 years agoMerge branch 'MDL-47329-master' of git://github.com/jethac/moodle
Sam Hemelryk [Tue, 25 Nov 2014 19:56:27 +0000 (08:56 +1300)]
Merge branch 'MDL-47329-master' of git://github.com/jethac/moodle

7 years agoMerge branch 'MDL-48276-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 25 Nov 2014 17:45:26 +0000 (18:45 +0100)]
Merge branch 'MDL-48276-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch 'MDL-48277-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 25 Nov 2014 17:38:24 +0000 (18:38 +0100)]
Merge branch 'MDL-48277-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch '23538-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 25 Nov 2014 16:00:06 +0000 (17:00 +0100)]
Merge branch '23538-29' of git://github.com/samhemelryk/moodle

Conflicts:
backup/util/ui/renderer.php

7 years agoMDL-48036 course: change multilang cache key
Heiko Schach [Fri, 21 Nov 2014 07:40:45 +0000 (15:40 +0800)]
MDL-48036 course: change multilang cache key

7 years agoMDL-46356 assign: remove unnecessary get_area_files call
Ashley Holman [Mon, 14 Jul 2014 09:17:38 +0000 (18:47 +0930)]
MDL-46356 assign: remove unnecessary get_area_files call

7 years agoMerge branch 'MDL-31500_master-revert-ui-changes' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 25 Nov 2014 13:59:33 +0000 (13:59 +0000)]
Merge branch 'MDL-31500_master-revert-ui-changes' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-41155-master' of git://github.com/gurgus/moodle
Dan Poltawski [Tue, 25 Nov 2014 13:18:13 +0000 (13:18 +0000)]
Merge branch 'MDL-41155-master' of git://github.com/gurgus/moodle

7 years agoMerge branch 'MDL-48210-master-checker-caching' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 25 Nov 2014 12:21:47 +0000 (13:21 +0100)]
Merge branch 'MDL-48210-master-checker-caching' of git://github.com/mudrd8mz/moodle

7 years agoMerge branch 'MDL-43483_master' of https://github.com/dmonllao/moodle
Dan Poltawski [Tue, 25 Nov 2014 11:28:19 +0000 (11:28 +0000)]
Merge branch 'MDL-43483_master' of https://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-46416-master-bare' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 25 Nov 2014 11:21:19 +0000 (11:21 +0000)]
Merge branch 'MDL-46416-master-bare' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-43127-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 25 Nov 2014 11:18:50 +0000 (11:18 +0000)]
Merge branch 'MDL-43127-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle
Dan Poltawski [Tue, 25 Nov 2014 11:07:50 +0000 (11:07 +0000)]
Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle

7 years agoMerge branch '48189-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 25 Nov 2014 10:18:16 +0000 (11:18 +0100)]
Merge branch '48189-29' of git://github.com/samhemelryk/moodle

7 years agoMDL-46416 group: Allow group pictures to be deleted
Frederic Massart [Thu, 6 Nov 2014 07:39:12 +0000 (15:39 +0800)]
MDL-46416 group: Allow group pictures to be deleted

7 years agoMDL-46416 group: Use a revision number for group pictures
Frederic Massart [Thu, 6 Nov 2014 07:23:58 +0000 (15:23 +0800)]
MDL-46416 group: Use a revision number for group pictures

7 years agoMDL-43127 tool_uploadcourse: Add support for more enrolment methods
Frederic Massart [Thu, 20 Nov 2014 10:12:02 +0000 (18:12 +0800)]
MDL-43127 tool_uploadcourse: Add support for more enrolment methods

7 years agoMerge branch 'MDL-22043-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 25 Nov 2014 02:54:12 +0000 (15:54 +1300)]
Merge branch 'MDL-22043-master' of git://github.com/andrewnicols/moodle

7 years agoMDL-38128 mod_assign: Adding group selector to grading summary page
David Monllao [Wed, 19 Nov 2014 06:37:12 +0000 (14:37 +0800)]
MDL-38128 mod_assign: Adding group selector to grading summary page

Thanks to Pau Ferrer Ocaña and Avi Levy for
their work on this issue.

7 years agoMDL-31500 backup: Warn users about front page backups
David Monllao [Tue, 25 Nov 2014 02:26:15 +0000 (10:26 +0800)]
MDL-31500 backup: Warn users about front page backups

They should know that they can only be restored on the front
page before selecting the destination course.

7 years agoMDL-31500 backup: Remove frontpage restore UI restrictions
David Monllao [Tue, 25 Nov 2014 01:37:53 +0000 (09:37 +0800)]
MDL-31500 backup: Remove frontpage restore UI restrictions

7 years agoMDL-23839 navigation: fixed php5.5ism
Sam Hemelryk [Tue, 25 Nov 2014 01:35:30 +0000 (14:35 +1300)]
MDL-23839 navigation: fixed php5.5ism

7 years agoMDL-48309 mod_forum: Handle discussion subscriptions correctly
Andrew Nicols [Fri, 21 Nov 2014 02:34:05 +0000 (10:34 +0800)]
MDL-48309 mod_forum: Handle discussion subscriptions correctly

7 years agoMDL-48309 mod_forum: Add discussion subscription to the navigation
Andrew Nicols [Tue, 25 Nov 2014 01:15:46 +0000 (09:15 +0800)]
MDL-48309 mod_forum: Add discussion subscription to the navigation

7 years agoMerge branch 'MDL-23839-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 25 Nov 2014 01:07:08 +0000 (14:07 +1300)]
Merge branch 'MDL-23839-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch '48334-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 25 Nov 2014 00:18:11 +0000 (01:18 +0100)]
Merge branch '48334-29' of git://github.com/samhemelryk/moodle

7 years agoMDL-23912 core_comment: update count after deletion
Jetha Chan [Mon, 17 Nov 2014 06:22:14 +0000 (14:22 +0800)]
MDL-23912 core_comment: update count after deletion

7 years agoMerge branch '38343-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 24 Nov 2014 23:26:41 +0000 (00:26 +0100)]
Merge branch '38343-29' of git://github.com/samhemelryk/moodle

7 years agoMerge branch '48304-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 24 Nov 2014 23:23:42 +0000 (00:23 +0100)]
Merge branch '48304-29' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-48197-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 24 Nov 2014 22:02:19 +0000 (11:02 +1300)]
Merge branch 'MDL-48197-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-48246-M29' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 24 Nov 2014 21:52:42 +0000 (10:52 +1300)]
Merge branch 'MDL-48246-M29' of git://github.com/lazydaisy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-48259' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 24 Nov 2014 21:49:54 +0000 (10:49 +1300)]
Merge branch 'MDL-48259' of git://github.com/timhunt/moodle

7 years agoMerge branch 'm29_MDL-48265' of https://github.com/totara/moodle
Sam Hemelryk [Mon, 24 Nov 2014 20:42:46 +0000 (09:42 +1300)]
Merge branch 'm29_MDL-48265' of https://github.com/totara/moodle

7 years agoMerge branch 'wip_MDL-48282_m29_firstaccess' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 24 Nov 2014 20:39:33 +0000 (09:39 +1300)]
Merge branch 'wip_MDL-48282_m29_firstaccess' of https://github.com/skodak/moodle

7 years agoMDL-20365 auth_db: post integration tweaks
Sam Hemelryk [Mon, 24 Nov 2014 20:05:20 +0000 (09:05 +1300)]
MDL-20365 auth_db: post integration tweaks

* Fixes SQL indentation.
* Amended the new auth_dbsaltedcrypt string.

7 years agoMerge branch 'MDL-20365_auth_db_salted_passwords' of https://github.com/MorrisR2...
Sam Hemelryk [Mon, 24 Nov 2014 19:19:04 +0000 (08:19 +1300)]
Merge branch 'MDL-20365_auth_db_salted_passwords' of https://github.com/MorrisR2/moodle

7 years agoMerge branch '47832-29-removed' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 24 Nov 2014 17:29:33 +0000 (17:29 +0000)]
Merge branch '47832-29-removed' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL9443_Filter_XHTML_files.2014-11-19' of git://github.com/Dave-B/moodle
Dan Poltawski [Mon, 24 Nov 2014 17:26:30 +0000 (17:26 +0000)]
Merge branch 'MDL9443_Filter_XHTML_files.2014-11-19' of git://github.com/Dave-B/moodle

7 years agoMerge branch 'MDL-45867-master' of https://github.com/dthies/moodle
Dan Poltawski [Mon, 24 Nov 2014 17:11:14 +0000 (17:11 +0000)]
Merge branch 'MDL-45867-master' of https://github.com/dthies/moodle

7 years agoMerge branch 'MDL-47601_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 24 Nov 2014 17:02:09 +0000 (17:02 +0000)]
Merge branch 'MDL-47601_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'wip-MDL-48252-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 24 Nov 2014 16:29:25 +0000 (16:29 +0000)]
Merge branch 'wip-MDL-48252-master' of git://github.com/abgreeve/moodle

7 years agoAutomatically generated installer lang files
AMOS bot [Mon, 24 Nov 2014 16:04:03 +0000 (00:04 +0800)]
Automatically generated installer lang files