Dan Poltawski [Wed, 28 Nov 2012 01:40:24 +0000 (09:40 +0800)]
Merge branch 'MDL-36752-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 27 Nov 2012 22:48:12 +0000 (11:48 +1300)]
Merge branch 'MDL-36336_modLtiRestoreGrade' of git://github.com/moodlerooms/moodle
Sam Hemelryk [Tue, 27 Nov 2012 22:41:42 +0000 (11:41 +1300)]
Merge branch 'wip-mdl-36238' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 27 Nov 2012 22:25:24 +0000 (11:25 +1300)]
Merge branch 'wip-MDL-34530_MASTER' of git://github.com/jason-platts/moodle
Sam Hemelryk [Tue, 27 Nov 2012 22:14:47 +0000 (11:14 +1300)]
Merge branch 'MDL-30139_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 27 Nov 2012 22:12:53 +0000 (11:12 +1300)]
Merge branch 'MDL-36012-master' of git://github.com/damyon/moodle
Sam Hemelryk [Tue, 27 Nov 2012 21:57:09 +0000 (10:57 +1300)]
Merge branch 'MDL-35997-wip1' of git://github.com/mouneyrac/moodle
Conflicts:
version.php
Andrew Robert Nicols [Tue, 27 Nov 2012 14:45:47 +0000 (14:45 +0000)]
MDL-36752 Be more specific about tooltip selectors
Aparup Banerjee [Tue, 27 Nov 2012 08:20:26 +0000 (16:20 +0800)]
Merge branch 'MDL-36865_master' of git://github.com/markn86/moodle
Mark Nelson [Tue, 27 Nov 2012 07:58:30 +0000 (15:58 +0800)]
MDL-36865 filepicker: ensuring the dnd arrow displays in the center of the filepicker for all supported browsers
Aparup Banerjee [Tue, 27 Nov 2012 07:49:32 +0000 (15:49 +0800)]
Merge branch 'MDL-36710-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Tue, 27 Nov 2012 07:33:11 +0000 (15:33 +0800)]
MDL-36710 calendar: Correcting the validation checks
Dan Poltawski [Tue, 27 Nov 2012 07:26:18 +0000 (15:26 +0800)]
Merge branch 'MDL-36629-master' of git://github.com/FMCorz/moodle
Frederic Massart [Tue, 27 Nov 2012 06:52:53 +0000 (14:52 +0800)]
MDL-36629 usability: CSS adaptations for Workshop
Barbara Ramiro [Tue, 27 Nov 2012 06:42:01 +0000 (14:42 +0800)]
MDL-36629 usability: New workshop icons
Aparup Banerjee [Tue, 27 Nov 2012 06:56:03 +0000 (14:56 +0800)]
Merge branch 'MDL-36841_master' of git://github.com/markn86/moodle
Dan Poltawski [Tue, 27 Nov 2012 06:23:29 +0000 (14:23 +0800)]
Merge branch 'MDL-34695' of git://github.com/rwijaya/moodle
Mark Nelson [Tue, 27 Nov 2012 04:38:11 +0000 (12:38 +0800)]
MDL-36841 portfolio: ensure variables in parent function match those of childs to prevent strict standard error
Dan Poltawski [Tue, 27 Nov 2012 06:09:56 +0000 (14:09 +0800)]
Merge branch 'MDL-36302-master' of git://github.com/damyon/moodle
Damyon Wiese [Mon, 26 Nov 2012 04:06:40 +0000 (12:06 +0800)]
MDL-36302 course: Set correct URL on settings page for navigation.
Dan Poltawski [Tue, 27 Nov 2012 06:01:04 +0000 (14:01 +0800)]
Merge branch 'MDL-36782-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 27 Nov 2012 05:58:20 +0000 (13:58 +0800)]
Merge branch 'MDL-36184-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 27 Nov 2012 05:53:15 +0000 (13:53 +0800)]
version bump for lots of theme changes
Frederic Massart [Fri, 23 Nov 2012 08:18:35 +0000 (16:18 +0800)]
MDL-36782 usability: Adjustments following new mark as read icon
Barbara Ramiro [Fri, 23 Nov 2012 08:17:53 +0000 (16:17 +0800)]
MDL-36782 usability: New icon to mark posts as read on forum
Dan Poltawski [Tue, 27 Nov 2012 05:38:53 +0000 (13:38 +0800)]
Merge branch 'wip-MDL-36466-m24' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 27 Nov 2012 05:37:49 +0000 (13:37 +0800)]
Merge branch 'wip-MDL-36825-m24' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 27 Nov 2012 05:32:34 +0000 (13:32 +0800)]
Merge branch 'MDL-36752-master' of git://git.luns.net.uk/moodle
Dan Poltawski [Tue, 27 Nov 2012 05:26:38 +0000 (13:26 +0800)]
Merge branch 'MDL-36806' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 27 Nov 2012 05:18:20 +0000 (13:18 +0800)]
Merge branch 'MDL-36442_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Tue, 27 Nov 2012 05:10:27 +0000 (13:10 +0800)]
Merge branch 'MDL-36775-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/upgrade.txt
Dan Poltawski [Tue, 27 Nov 2012 05:06:32 +0000 (13:06 +0800)]
Merge branch 'MDL-36784-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 27 Nov 2012 05:00:44 +0000 (13:00 +0800)]
Merge branch 'MDL-36550-master' of git://github.com/FMCorz/moodle
Frederic Massart [Tue, 27 Nov 2012 04:37:10 +0000 (12:37 +0800)]
MDL-36550 theme: Fixed syntax error in CSS rules
Aparup Banerjee [Tue, 27 Nov 2012 04:19:52 +0000 (12:19 +0800)]
Merge branch 'wip-mdl-36767' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 27 Nov 2012 04:14:05 +0000 (12:14 +0800)]
Merge branch 'MDL-36802-master' of git://github.com/FMCorz/moodle
Frederic Massart [Thu, 22 Nov 2012 09:08:10 +0000 (17:08 +0800)]
MDL-36470 usability: Course legacy files uses the folder icon
Aparup Banerjee [Tue, 27 Nov 2012 04:02:14 +0000 (12:02 +0800)]
Merge branch 'MDL-36710-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 27 Nov 2012 03:55:21 +0000 (11:55 +0800)]
Merge branch 'MDL-36636-master' of git://github.com/FMCorz/moodle
Rajesh Taneja [Thu, 22 Nov 2012 06:55:50 +0000 (14:55 +0800)]
MDL-36767 Administration: user_filter_yesno use different name for sql filter
user_filter_yesno extends user_filter_simpleselect, so if user bulk action filter has both
user_filter_simpleselect and user_filter_yesno, they use the same filter name but counter is
different as they are different classes. Hence using different filter name will avoid confilts
Aparup Banerjee [Tue, 27 Nov 2012 03:52:50 +0000 (11:52 +0800)]
Merge branch 'MDL-36305-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 27 Nov 2012 03:39:21 +0000 (11:39 +0800)]
Merge branch 'MDL-36631-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/upgrade.txt
Dan Poltawski [Tue, 27 Nov 2012 03:25:10 +0000 (11:25 +0800)]
Merge branch 'MDL-36630-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 27 Nov 2012 02:57:49 +0000 (10:57 +0800)]
MDL-36742 - Add IE svg fixes
Dan Poltawski [Tue, 27 Nov 2012 02:50:31 +0000 (10:50 +0800)]
Merge branch 'MDL-36559-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 27 Nov 2012 02:44:42 +0000 (10:44 +0800)]
MDL-36623 - IE9 svg fixes
Dan Poltawski [Tue, 27 Nov 2012 02:40:24 +0000 (10:40 +0800)]
Merge branch 'MDL-36623-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 27 Nov 2012 02:36:59 +0000 (10:36 +0800)]
Merge branch 'MDL-36550-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 27 Nov 2012 02:13:47 +0000 (10:13 +0800)]
MDL-36628 - IE svgtool fix
Dan Poltawski [Tue, 27 Nov 2012 02:10:04 +0000 (10:10 +0800)]
Merge branch 'MDL-36628-master' of git://github.com/FMCorz/moodle
Mary Evans [Tue, 27 Nov 2012 01:38:11 +0000 (01:38 +0000)]
MDL-36442 theme_boxxie: Adds definition to block header command icons
Sam Hemelryk [Mon, 26 Nov 2012 23:14:48 +0000 (12:14 +1300)]
MDL-36768 cache: Fixed regression in cache stores by reordering classes
Sam Hemelryk [Mon, 26 Nov 2012 22:38:57 +0000 (11:38 +1300)]
Merge branch 'MDL-36826-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 26 Nov 2012 22:22:08 +0000 (11:22 +1300)]
Merge branch 'wip-MDL-36795-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Mon, 26 Nov 2012 22:10:37 +0000 (11:10 +1300)]
Merge branch 'MDL-35760_master' of git://github.com/markn86/moodle
Sam Hemelryk [Mon, 26 Nov 2012 22:05:40 +0000 (11:05 +1300)]
Merge branch 'MDL-36829' of https://github.com/kastashov/moodle
Sam Hemelryk [Mon, 26 Nov 2012 21:41:41 +0000 (10:41 +1300)]
Merge branch 'MDL-36760' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 26 Nov 2012 21:16:08 +0000 (10:16 +1300)]
MDL-36825 cachestore_file: fixed isready condition check
Frederic Massart [Tue, 20 Nov 2012 11:45:38 +0000 (19:45 +0800)]
MDL-36550 usability: CSS updates on course page
Dan Poltawski [Mon, 26 Nov 2012 07:01:31 +0000 (15:01 +0800)]
MDL-35717|NOBUG - fix trailing whitespace problems
Adrian Greeve [Fri, 23 Nov 2012 07:50:11 +0000 (15:50 +0800)]
MDL-36795 - lib / administration: maxsections now limits the default setting for numsections.
In the default course settings, setting the maximum number topics / weeks to 0 would not
change the default number of sections on the same page as any other number would.
A more appropriate check has been put in place.
This also incorporates a fix for MDL-28584. The course edit screen now also checks to see
if maxsections is set or numeric. If it is not set or numeric then it defaults to 52.
Kirill Astashov [Mon, 26 Nov 2012 05:53:02 +0000 (16:23 +1030)]
MDL-36829: Fix outcome value not being saved when grading a submission
Damyon Wiese [Mon, 26 Nov 2012 05:33:13 +0000 (13:33 +0800)]
MDL-36826: Group assignment - Feedback files are not sent entire group
Dan Poltawski [Mon, 26 Nov 2012 04:07:04 +0000 (12:07 +0800)]
Merge branch 'MDL-35717-quiz-attempt-checkstate' of git://github.com/mpetrowi/moodle
Conflicts:
mod/quiz/tests/generator/lib.php
Dan Poltawski [Mon, 26 Nov 2012 03:42:35 +0000 (11:42 +0800)]
Merge branch 'wip-MDL-36066-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Mon, 26 Nov 2012 02:32:08 +0000 (10:32 +0800)]
MDL-36066 Removed accidentally added image file causing wrong filemanager display
Damyon Wiese [Mon, 26 Nov 2012 02:30:37 +0000 (10:30 +0800)]
MDL-36728: Assignment - submission statement default - Add a langstring fix
Damyon Wiese [Thu, 22 Nov 2012 05:03:56 +0000 (13:03 +0800)]
MDL-36728: Assignment - Improve usability of require submission statement setting.
This change will hide the setting "Require that students accept the submission statement" at
the assignment level if no submission statement has been configured for a site. It also includes a
change to the help text to separate the assignment level setting from the site level setting. This
change also sets a default assignment submission statement.
AMOS BEGIN
CPY [requiresubmissionstatement,mod_assign],[requiresubmissionstatementassignment,mod_assign]
AMOS END
Sam Hemelryk [Mon, 26 Nov 2012 01:58:13 +0000 (14:58 +1300)]
Merge branch 'MDL-36609_master' of git://github.com/markn86/moodle
Sam Hemelryk [Mon, 26 Nov 2012 01:46:25 +0000 (14:46 +1300)]
Merge branch 'MDL-35569-master' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 26 Nov 2012 01:44:40 +0000 (14:44 +1300)]
Merge branch 'wip-MDL-36551-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Mon, 26 Nov 2012 01:29:58 +0000 (02:29 +0100)]
Merge branch 'wip-MDL-36819-m24-rb' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 26 Nov 2012 01:28:12 +0000 (02:28 +0100)]
Merge branch 'wip-MDL-36768-m24-r2' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Sun, 25 Nov 2012 19:31:06 +0000 (08:31 +1300)]
MDL-36819 cache: implemented cache_is_configurable interface
Sam Hemelryk [Fri, 23 Nov 2012 01:22:44 +0000 (14:22 +1300)]
MDL-36768 cache: replaced cache_store interface with abstract class
Sam Hemelryk [Sun, 25 Nov 2012 22:42:28 +0000 (11:42 +1300)]
Merge branch 'MDL-36763-master' of git://git.luns.net.uk/moodle
Sam Hemelryk [Sun, 25 Nov 2012 22:01:15 +0000 (11:01 +1300)]
Merge branch 'MDL-36400-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Sun, 25 Nov 2012 21:40:58 +0000 (10:40 +1300)]
Merge branch 'MDL-35963-master' of git://github.com/damyon/moodle
Sam Hemelryk [Sun, 25 Nov 2012 21:24:42 +0000 (10:24 +1300)]
Merge branch 'master_MDL-36772' of git://github.com/danmarsden/moodle
Sam Hemelryk [Thu, 22 Nov 2012 21:32:51 +0000 (10:32 +1300)]
MDL-36768 cache: Implemented abstract cache store base class
Sam Hemelryk [Wed, 21 Nov 2012 21:33:57 +0000 (10:33 +1300)]
MDL-36466 cache: tidy up after review
Sam Hemelryk [Tue, 13 Nov 2012 02:32:57 +0000 (15:32 +1300)]
MDL-36466 cache: disabled caching during installation and upgrade
Sam Hemelryk [Tue, 13 Nov 2012 01:59:19 +0000 (14:59 +1300)]
MDL-36466 cache: implemented functionality to disable the bulk of the cache API
Sam Hemelryk [Mon, 12 Nov 2012 21:12:35 +0000 (10:12 +1300)]
MDL-36466 cache: renamed disable to disable_stores and added tests
Sam Hemelryk [Mon, 12 Nov 2012 20:28:22 +0000 (09:28 +1300)]
MDL-36466 cache: renamed define NO_CACHE_STORES to CACHE_DISABLE_STORES
Sam Hemelryk [Mon, 12 Nov 2012 20:26:07 +0000 (09:26 +1300)]
MDL-36466 cache: improved handling of exceptions during initialisation.
Tim Hunt [Fri, 23 Nov 2012 15:54:58 +0000 (15:54 +0000)]
MDL-36806 question files: fix unnecessary require_login call.
quiz_question_pluginfile later does the correct check. Doing this
other check first means you get an error about changing $PAGE->context.
Tim Hunt [Thu, 22 Nov 2012 15:20:38 +0000 (15:20 +0000)]
MDL-36760 formslib: fix frozen elements with [] in name.
This was a regression caused by MDL-30845 or, to be precise, the related
issue MDL-32785.
Form elements with names like multipier[0] require special handling,
such as is present in HTML_QuickForm_element::_prepareValue. I have
added equivalent handling to MoodleQuickForm::exportValues. I am afraid
that I could not think of a way to do this reliably without duplicating
code.
Frederic Massart [Fri, 23 Nov 2012 08:52:46 +0000 (16:52 +0800)]
MDL-36802 usability: New icons used for LTI settings
Dan Poltawski [Fri, 23 Nov 2012 08:07:34 +0000 (16:07 +0800)]
On demand release 2.4beta+
Dan Poltawski [Fri, 23 Nov 2012 08:06:30 +0000 (16:06 +0800)]
MDL-36436 - fix ie9 svg compatibility
Dan Poltawski [Fri, 23 Nov 2012 07:21:00 +0000 (15:21 +0800)]
On demand release 2.4beta+
Dan Marsden [Fri, 23 Nov 2012 07:20:46 +0000 (20:20 +1300)]
MDL-36772 SCORM add boilerplate and remove <!-- as it cause jscache to crash and burn.
Dan Poltawski [Fri, 23 Nov 2012 07:11:14 +0000 (15:11 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
Aparup Banerjee [Fri, 23 Nov 2012 06:47:25 +0000 (14:47 +0800)]
Merge branch 'w47_MDL-36780_m24_redirect' of git://github.com/skodak/moodle
Frederic Massart [Fri, 23 Nov 2012 06:45:29 +0000 (14:45 +0800)]
MDL-36775 usability: Code update following new calendar icons
Barbara Ramiro [Fri, 23 Nov 2012 06:11:07 +0000 (14:11 +0800)]
MDL-36775 usability: New icons for calendar events
Frederic Massart [Wed, 21 Nov 2012 07:19:45 +0000 (15:19 +0800)]
MDL-36631 usability: Core edit for new messaging icons
Barbara Ramiro [Wed, 21 Nov 2012 07:19:07 +0000 (15:19 +0800)]
MDL-36631 usability: New icons for messaging
Petr Škoda [Thu, 22 Nov 2012 09:31:58 +0000 (10:31 +0100)]
MDL-36779 fix undefined NO_MOODLE_COOKIE after failed db connect