Dan Poltawski [Mon, 29 Jul 2013 05:20:59 +0000 (13:20 +0800)]
Merge branch 'wip-MDL-29731-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 29 Jul 2013 04:40:05 +0000 (12:40 +0800)]
Merge branch 'MDL-36399' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 29 Jul 2013 02:41:54 +0000 (10:41 +0800)]
Merge branch 'MDL-40547' of https://github.com/Lightwork-Marking/moodle
Dan Poltawski [Mon, 29 Jul 2013 02:09:45 +0000 (10:09 +0800)]
Merge branch 'MDL-40863' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 29 Jul 2013 01:05:07 +0000 (13:05 +1200)]
Merge branch 'w31_MDL-11270_m26_nvarcharmax' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 29 Jul 2013 00:54:31 +0000 (12:54 +1200)]
Merge branch 'MDL-40878' of git://github.com/timhunt/moodle
Sam Hemelryk [Sun, 28 Jul 2013 23:53:02 +0000 (11:53 +1200)]
Merge branch 'w31_MDL-40891_m26_mkdirrace' of https://github.com/skodak/moodle
Sam Hemelryk [Sun, 28 Jul 2013 23:50:00 +0000 (11:50 +1200)]
Merge branch 'MDL-40727-master' of git://github.com/damyon/moodle
Sam Hemelryk [Sun, 28 Jul 2013 23:01:57 +0000 (11:01 +1200)]
Merge branch 'MDL-40854' of git://github.com/timhunt/moodle
Sam Hemelryk [Sun, 28 Jul 2013 22:53:05 +0000 (10:53 +1200)]
Merge branch 'MDL-40005_lti_headers' of git://github.com/moodlerooms/moodle
Sam Hemelryk [Sun, 28 Jul 2013 22:49:40 +0000 (10:49 +1200)]
Merge branch 'MDL-40806-m' of git://github.com/andrewnicols/moodle
Paul Charsley [Mon, 15 Jul 2013 02:18:43 +0000 (14:18 +1200)]
MDL-40547 added marking allocation and workflow to
mod_assign_get_assignments
Petr Škoda [Fri, 26 Jul 2013 18:28:57 +0000 (20:28 +0200)]
MDL-40891 prevent exceptions when creating directories in file store
Even if cache creation fails moodle should continue working.
Petr Škoda [Fri, 26 Jul 2013 18:27:36 +0000 (20:27 +0200)]
MDL-40891 work around make_writable_directory() race condition
You will still get a "PHP Warning: mkdir(): File exists" but that should not cause any problems on production sites.
Tim Hunt [Wed, 24 Jul 2013 18:14:15 +0000 (19:14 +0100)]
MDL-40854 fix mod/...:view capabilities
Prior to the fix, if you did not have a capability like mod/page:view,
then you woulds still see the link to the Page activity in the course
section, but when you clicked on it, you would run into a
require_capability error.
It is a principle that we never show users a link to a page they are not
allowed to access, therefore, when users do not have mod/...:view, they
should not see the link on the course page.
This patch implements this in the cm_info class, in a similar way to how
access restrictions by groups works.
It does not assume that the mod/...:view capability exists. If the
capability does not exist, then users are not prevented from seeing the
link.
Tim Hunt [Thu, 25 Jul 2013 11:40:40 +0000 (12:40 +0100)]
MDL-40867 fix misleading PHPdocs for _get_coursemodule_info
Tim Hunt [Wed, 24 Jul 2013 12:17:05 +0000 (13:17 +0100)]
MDL-40863 feedback and LTI mods need get_extra_capabilities fn
Since moodle/site:accessallgroups is relevant to how them.
Tim Hunt [Wed, 24 Jul 2013 19:49:20 +0000 (20:49 +0100)]
MDL-36399 LTI editing tool config breaks on Oracle.
Note that this fix will fail if the tool URL is longer than 1333
characters.
Petr Škoda [Tue, 23 Jul 2013 12:43:47 +0000 (14:43 +0200)]
MDL-11270 use NVARCHAR(MAX) and VARBINARY(MAX) in SQL Server
Damyon Wiese [Fri, 26 Jul 2013 03:24:11 +0000 (11:24 +0800)]
weekly release 2.6dev
Petr Škoda [Sun, 21 Jul 2013 15:34:54 +0000 (17:34 +0200)]
MDL-40808 remove unused DML strings
Dan Poltawski [Thu, 25 Jul 2013 08:40:45 +0000 (16:40 +0800)]
Revert "MDL-39770 mod_chat: some tweaks to make it prettier to reduce screen wastage"
This reverts commit
9035e3d24b5ee8fd8b692854bb10876d1d51e74b.
Dan Poltawski [Thu, 25 Jul 2013 08:40:40 +0000 (16:40 +0800)]
Revert "MDL-39770 mod_chat: cleanup of the Bubble chat theme"
This reverts commit
5f06bf8554700190a3a98ef3251d6ac803aee529.
Mark Nielsen [Wed, 24 Jul 2013 16:07:14 +0000 (09:07 -0700)]
MDL-40005: LTI module uses Apache specific function for retrieving request headers
Marina Glancy [Wed, 24 Jul 2013 11:43:56 +0000 (21:43 +1000)]
MDL-29731, MDL-40843 Correctly access course_modinfo->get_groups()
Marina Glancy [Wed, 24 Jul 2013 11:39:26 +0000 (21:39 +1000)]
MDL-29731 Bugs in recent activity when using separate groups
Damyon Wiese [Thu, 25 Jul 2013 00:56:42 +0000 (17:56 -0700)]
MDL-40727 Cache: Fix file cache store on windows.
Jason Fowler [Wed, 24 Jul 2013 05:03:47 +0000 (13:03 +0800)]
MDL-39748 - Grading - Fixing the increasing height regression
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Wed, 24 Jul 2013 07:19:47 +0000 (19:19 +1200)]
Merge branch 'w30_MDL-23493_m26_fonts' of https://github.com/skodak/moodle
Petr Škoda [Wed, 24 Jul 2013 06:52:22 +0000 (08:52 +0200)]
MDL-23493 fix borked regex matching for non-standard font extensions
Petr Škoda [Sun, 21 Jul 2013 11:00:11 +0000 (13:00 +0200)]
MDL-39985 add explicit MariaDB support
Frederic Massart [Wed, 24 Jul 2013 01:20:38 +0000 (09:20 +0800)]
MDL-32746 libraries: Upgrade redirect for major version
Due to the newly introduced event user_loggedin, the upgrade
could not be reached as the event class was not found during login.
To remedy this, we need to force the upgrade before login.
Marina Glancy [Wed, 24 Jul 2013 00:58:32 +0000 (10:58 +1000)]
MDL-40766 Smarter positioning of tinymce button
Sam Hemelryk [Tue, 23 Jul 2013 23:28:26 +0000 (11:28 +1200)]
Merge branch 'wip-MDL-37869-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 23 Jul 2013 23:14:14 +0000 (11:14 +1200)]
Merge branch 'MDL-40315_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 21:42:11 +0000 (23:42 +0200)]
Merge branch 'w30_MDL-40642_m26_umask' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 21:21:38 +0000 (23:21 +0200)]
Merge branch 'MDL-39704_master' of https://github.com/nadavkav/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 21:11:24 +0000 (23:11 +0200)]
MDL-40801 Update versions in thirdpartylibs.xml
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 21:06:35 +0000 (23:06 +0200)]
Merge branch 'w30_MDL-40801_m26_jquery' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 21:04:13 +0000 (23:04 +0200)]
Merge branch 'w30_MDL-40627_m26_extramemorylimit' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 20:56:34 +0000 (22:56 +0200)]
Merge branch 'wip-MDL-40540-m26' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 20:39:13 +0000 (22:39 +0200)]
Merge branch 'MDL-40544_master' of https://github.com/nadavkav/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 20:34:16 +0000 (22:34 +0200)]
Merge branch 'MDL-40589_master' of https://github.com/nadavkav/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 20:28:54 +0000 (22:28 +0200)]
Merge branch 'MDL-40189_master' of https://github.com/nadavkav/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 20:10:08 +0000 (22:10 +0200)]
Merge branch 'MDL-40071_master' of https://github.com/nadavkav/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 18:32:40 +0000 (20:32 +0200)]
Merge branch 'w30_MDL-40723_m26_creators' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 18:29:43 +0000 (20:29 +0200)]
Merge branch 'w30_MDL-40796_m26_citycountry' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 16:58:03 +0000 (18:58 +0200)]
Merge branch 'w30_MDL-40809_m26_olduserimages' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 16:20:50 +0000 (18:20 +0200)]
Merge branch 'w30_MDL-40679_m26_zlib' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 16:18:52 +0000 (18:18 +0200)]
Merge branch 'MDL-40816_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 15:50:38 +0000 (17:50 +0200)]
Merge branch 'MDL-40785' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 15:45:22 +0000 (17:45 +0200)]
Merge branch 'MDL-40672_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 15:17:13 +0000 (17:17 +0200)]
Merge branch 'MDL-40595_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 15:00:02 +0000 (17:00 +0200)]
MDL-40700 tests: skip if there is not instance
Various reasons can lead to the cache stores not being available
(missing extension, configuration...). Under those situations
the test must be skipped because for sure it will break if
we continue.
Petr Škoda [Tue, 23 Jul 2013 13:59:02 +0000 (15:59 +0200)]
MDL-40723 fix docs typo
Petr Škoda [Tue, 23 Jul 2013 13:55:07 +0000 (15:55 +0200)]
MDL-40723 use guess_if_creator_will_have_course_capability() for the new weird function
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 11:58:20 +0000 (13:58 +0200)]
Merge branch 'wip-MDL-40700-m26' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 11:50:06 +0000 (13:50 +0200)]
Merge branch 'wip-MDL-40762-m26' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 11:19:41 +0000 (13:19 +0200)]
Merge branch 'wip-MDL-40763-m26' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 10:52:50 +0000 (12:52 +0200)]
Merge branch 'wip-MDL-40677-m26' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 10:16:11 +0000 (12:16 +0200)]
Merge branch 'MDL-40082_master' of https://github.com/nadavkav/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Tue, 23 Jul 2013 08:44:32 +0000 (16:44 +0800)]
Merge branch 'MDL-20609' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 23 Jul 2013 08:41:45 +0000 (16:41 +0800)]
Merge branch 'MDL-40480' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 23 Jul 2013 08:04:50 +0000 (16:04 +0800)]
Merge branch 'MDL-38863_master' of git://github.com/dmonllao/moodle
Jamie Pratt [Thu, 18 Jul 2013 03:44:46 +0000 (10:44 +0700)]
MDL-40729 check marks and grades from quiz attempts
compare to marks in csv file.
Frederic Massart [Tue, 23 Jul 2013 07:49:57 +0000 (15:49 +0800)]
MDL-32746 phpunit: Adding auth/tests to PHPUnit core suites
Jamie Pratt [Wed, 17 Jul 2013 11:35:25 +0000 (18:35 +0700)]
MDL-40076 Build entire quiz attempts by supplying attempt
data for each question in the quiz, pulling responses
from a csv file.
Damyon Wiese [Tue, 23 Jul 2013 07:51:59 +0000 (15:51 +0800)]
Merge branch 'MDL-40295' of git://github.com/rwijaya/moodle
David Monllao [Tue, 16 Jul 2013 12:15:48 +0000 (14:15 +0200)]
MDL-40672 behat: New activities data generator
David Monllao [Wed, 15 May 2013 00:50:19 +0000 (08:50 +0800)]
MDL-38863 behat: Role assign generator
Jamie Pratt [Wed, 17 Jul 2013 11:23:06 +0000 (18:23 +0700)]
MDL-40714 pass through simulated data to sub questions
in multi-answer question type
Jamie Pratt [Sun, 14 Jul 2013 12:26:35 +0000 (19:26 +0700)]
MDL-40542 need to be able to select variant
in unit tests
Jamie Pratt [Sun, 14 Jul 2013 12:08:53 +0000 (19:08 +0700)]
MDL-40541 need to be able to select random q
in unit tests
Jamie Pratt [Sun, 14 Jul 2013 11:23:48 +0000 (18:23 +0700)]
MDL-40543 convert from simulated responses
to post data
Damyon Wiese [Tue, 23 Jul 2013 06:49:42 +0000 (14:49 +0800)]
Merge branch 'MDL-32746-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 23 Jul 2013 06:26:35 +0000 (14:26 +0800)]
Merge branch 'wip_MDL-40778_v2' of https://github.com/jamiepratt/moodle
Damyon Wiese [Tue, 23 Jul 2013 06:16:31 +0000 (14:16 +0800)]
Merge branch 'wip-MDL-39748-master' of git://github.com/phalacee/moodle
Damyon Wiese [Tue, 23 Jul 2013 06:14:08 +0000 (14:14 +0800)]
MDL-28019 tinymce managefiles: change tabs to spaces
Marina Glancy [Thu, 18 Jul 2013 04:28:48 +0000 (14:28 +1000)]
MDL-28019 Added plugin tinymce_managefiles
Marina Glancy [Thu, 18 Jul 2013 04:29:13 +0000 (14:29 +1000)]
MDL-28019 Added plugin repository_areafiles
Dan Poltawski [Tue, 23 Jul 2013 05:33:49 +0000 (13:33 +0800)]
MDL-40585 fix trailing whitespace
Dan Poltawski [Tue, 23 Jul 2013 05:33:27 +0000 (13:33 +0800)]
Merge branch 'MDL-40585_grouped_parent_exists' of git://github.com/mr-russ/moodle
Dan Poltawski [Tue, 23 Jul 2013 05:27:32 +0000 (13:27 +0800)]
Merge branch 'MDL-40719' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 23 Jul 2013 04:35:41 +0000 (12:35 +0800)]
Merge branch 'MDL-40584' of https://github.com/mr-russ/moodle
Jason Fowler [Thu, 13 Jun 2013 05:47:59 +0000 (13:47 +0800)]
MDL-39748 - Grading Methods - Fixing input field widths for Rubrics
Frederic Massart [Wed, 17 Jul 2013 03:42:29 +0000 (11:42 +0800)]
MDL-32746 core: Implement new user_loggedin event
Dan Poltawski [Tue, 23 Jul 2013 02:42:02 +0000 (10:42 +0800)]
Merge branch 'MDL-40793_profile_compare' of https://github.com/mr-russ/moodle
Damyon Wiese [Tue, 23 Jul 2013 02:37:20 +0000 (10:37 +0800)]
Merge branch 'wip-MDL-40648-master' of git://github.com/marinaglancy/moodle
Conflicts:
version.php
Sam Hemelryk [Tue, 23 Jul 2013 02:14:27 +0000 (14:14 +1200)]
Merge branch 'MDL-40680-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 23 Jul 2013 02:09:08 +0000 (14:09 +1200)]
Merge branch 'MDL-40666-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Tue, 23 Jul 2013 02:01:59 +0000 (10:01 +0800)]
Merge branch 'MDL-35674-form-dependencies' of https://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 23 Jul 2013 01:59:16 +0000 (13:59 +1200)]
Merge branch 'master_MDL-40702' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 23 Jul 2013 01:52:16 +0000 (03:52 +0200)]
Merge branch 'wip-MDL-38707-master' of git://github.com/marinaglancy/moodle
Jason Fowler [Tue, 16 Jul 2013 02:36:27 +0000 (10:36 +0800)]
MDL-37869 - Course - Removing the ALT text from activity and resource icons as it duplicated the accesshide text
Sam Hemelryk [Tue, 23 Jul 2013 00:00:59 +0000 (12:00 +1200)]
Merge branch 'MDL-39695_master' of git://github.com/kordan/moodle
Sam Hemelryk [Mon, 22 Jul 2013 23:57:50 +0000 (11:57 +1200)]
Merge branch 'MDL-40670-master' of git://github.com/barbararamiro/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Mon, 22 Jul 2013 23:12:39 +0000 (11:12 +1200)]
Merge branch 'MDL-40799-m' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 22 Jul 2013 23:12:34 +0000 (11:12 +1200)]
Merge branch 'MDL-40788-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 22 Jul 2013 22:48:47 +0000 (00:48 +0200)]
Merge branch 'MDL-40123_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Mon, 22 Jul 2013 23:07:53 +0000 (11:07 +1200)]
Merge branch 'MDL-40787-m' of git://github.com/andrewnicols/moodle
