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
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
Sam Hemelryk [Mon, 22 Jul 2013 23:06:08 +0000 (11:06 +1200)]
Merge branch 'MDL-39770_chat' of https://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Mon, 22 Jul 2013 22:45:13 +0000 (00:45 +0200)]
Merge branch 'MDL-39635_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 22 Jul 2013 20:36:23 +0000 (22:36 +0200)]
Merge branch 'wip-MDL-33563-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 22 Jul 2013 16:56:40 +0000 (18:56 +0200)]
Merge branch 'w30_MDL-40795_m26_ajaxerrordisplay' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 22 Jul 2013 15:40:03 +0000 (17:40 +0200)]
Merge branch 'MDL-40626-master' of git://github.com/danpoltawski/moodle
Mark Nelson [Mon, 22 Jul 2013 10:12:48 +0000 (18:12 +0800)]
MDL-40816 backup: code cleanup on the manage backups form
Mark Nelson [Mon, 22 Jul 2013 09:42:42 +0000 (17:42 +0800)]
MDL-40816 backup: added missing setType calls to the manage backups form
Dan Poltawski [Mon, 22 Jul 2013 09:00:40 +0000 (17:00 +0800)]
Merge branch 'w30_MDL-38867_m26_gspell' of https://github.com/skodak/moodle
Damyon Wiese [Mon, 22 Jul 2013 08:12:26 +0000 (16:12 +0800)]
MDL-40260 Course overview: code tidy for previous commit
Moving this check inside the following if makes it clear which code
branch it applies to.
Damyon Wiese [Mon, 22 Jul 2013 08:09:29 +0000 (16:09 +0800)]
Merge branch 'master_MDL-40260' of git://github.com/danmarsden/moodle
Damyon Wiese [Mon, 22 Jul 2013 08:00:41 +0000 (16:00 +0800)]
Merge branch 'wip-MDL-40174-m26' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 22 Jul 2013 07:47:48 +0000 (15:47 +0800)]
Merge branch 'w30_MDL-40545_m26_localcachedir' of https://github.com/skodak/moodle
Damyon Wiese [Mon, 22 Jul 2013 07:05:53 +0000 (15:05 +0800)]
Merge branch 'w30_MDL-39846_m26_event2' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 22 Jul 2013 07:01:26 +0000 (15:01 +0800)]
Merge branch 'MDL-38837_dev' of https://github.com/totara/openbadges
Dan Poltawski [Mon, 22 Jul 2013 06:36:29 +0000 (14:36 +0800)]
Merge branch 'wip-MDL-40121-master' of git://github.com/marinaglancy/moodle
Jamie Pratt [Sat, 20 Jul 2013 06:21:35 +0000 (13:21 +0700)]
MDL-40778 clear cache for random questions between tests
Damyon Wiese [Mon, 22 Jul 2013 04:11:43 +0000 (12:11 +0800)]
Merge branch 'MDL-40649_master' of https://github.com/markn86/moodle
Damyon Wiese [Mon, 22 Jul 2013 03:47:21 +0000 (11:47 +0800)]
Merge branch 'MDL-40468_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 22 Jul 2013 02:45:42 +0000 (10:45 +0800)]
Merge branch 'MDL-39441_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 22 Jul 2013 02:27:11 +0000 (10:27 +0800)]
Merge branch 'wip-MDL-37333_master' of git://github.com/gjb2048/moodle
Russell Smith [Sat, 20 Jul 2013 04:03:45 +0000 (14:03 +1000)]
MDL-40793 profiling: Allow multiple reference runs in display
Matt Petro [Sat, 1 Dec 2012 05:55:44 +0000 (00:55 -0500)]
MDL-35674 formslib: Optimized disabledIf javascript for large forms
Sam Hemelryk [Fri, 19 Jul 2013 03:51:40 +0000 (15:51 +1200)]
MDL-40174 navigation: don't remove active root nodes without children
Sam Hemelryk [Thu, 18 Jul 2013 23:15:31 +0000 (11:15 +1200)]
MDL-40540 dock: the dock loader is now a proper sub module
Sam Hemelryk [Thu, 18 Jul 2013 22:24:47 +0000 (10:24 +1200)]
MDL-40677 cache: fixed bug with maxsize when setting
Sam Hemelryk [Mon, 15 Jul 2013 23:50:43 +0000 (11:50 +1200)]
MDL-40677: cachestore_static: implemented support for maxsize
Sam Hemelryk [Mon, 15 Jul 2013 23:50:27 +0000 (11:50 +1200)]
MDL-40677: cachestore_session: implemented support for maxsize
Sam Hemelryk [Fri, 19 Jul 2013 00:47:23 +0000 (12:47 +1200)]
MDL-40700 cache: memcache and memcached stores now allow alphanumext prefixes
Chris Wharton [Thu, 18 Jul 2013 01:44:26 +0000 (13:44 +1200)]
MDL-40700 cache: Validate memcache key prefix field
Sam Hemelryk [Fri, 19 Jul 2013 00:49:37 +0000 (12:49 +1200)]
MDL-40700 pagelib: cleaned up phpdocs
Sam Hemelryk [Fri, 19 Jul 2013 00:50:58 +0000 (12:50 +1200)]
MDL-40700 cache: fixed cache store unit tests
Petr Škoda [Sun, 21 Jul 2013 16:18:49 +0000 (18:18 +0200)]
MDL-40809 remove after 10 years old default user images
Petr Škoda [Sun, 21 Jul 2013 09:55:37 +0000 (11:55 +0200)]
MDL-40723 use will_have_course_capability() to verify future course creator capabilities when creating courses
Petr Škoda [Sun, 21 Jul 2013 09:47:40 +0000 (11:47 +0200)]
MDL-40723 add new will_have_course_capability()
Petr Škoda [Sat, 20 Jul 2013 19:12:06 +0000 (21:12 +0200)]
MDL-40679 mark zlib extension as recommended
Petr Škoda [Sat, 20 Jul 2013 19:04:31 +0000 (21:04 +0200)]
MDL-40796 do not require city and country when uploading users
Andrew Nicols [Sat, 20 Jul 2013 15:20:44 +0000 (16:20 +0100)]
MDL-40799 JavaScript: Correct tooltip dependency on cache-base
Petr Škoda [Sat, 20 Jul 2013 13:02:51 +0000 (15:02 +0200)]
MDL-40627 add 2G extramemorylimit option to admin UI and use the same units in config-dist.php to prevent confusion
Credit goes to Julien Boulen, thanks for spotting this.
Petr Škoda [Sat, 20 Jul 2013 12:23:03 +0000 (14:23 +0200)]
MDL-40795 enable NO_DEBUG_DISPLAY in AJAX_SCRIPT by default
This should prevent some ajax problems in incorrectly configured production sites.
Note that developers need to learn to watch error logs all the time during development!
Petr Škoda [Sat, 20 Jul 2013 12:11:40 +0000 (14:11 +0200)]
MDL-40545 convert font cache to localcachedir
