David Scotson [Mon, 22 Apr 2013 15:17:29 +0000 (16:17 +0100)]
MDL-39286 Remove link on My Courses settings heading
Dan Poltawski [Thu, 18 Apr 2013 11:51:46 +0000 (12:51 +0100)]
on demand release 2.5beta+
Special 'Spoons curry' UK Edition ;-)
Dan Poltawski [Thu, 18 Apr 2013 11:41:24 +0000 (12:41 +0100)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
Damyon Wiese [Thu, 18 Apr 2013 08:29:38 +0000 (16:29 +0800)]
MDL-38592: Add major version redirect for settings used frontpage.
Dan Poltawski [Thu, 18 Apr 2013 07:50:29 +0000 (08:50 +0100)]
Merge branch 'MDL-39203-master' of git://github.com/FMCorz/moodle
Frederic Massart [Thu, 18 Apr 2013 06:47:22 +0000 (14:47 +0800)]
MDL-39203 repository: Fixed authentication errors with Dropbox
Dan Poltawski [Wed, 17 Apr 2013 11:48:17 +0000 (12:48 +0100)]
Merge branch 'wip-mdl-39110' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 17 Apr 2013 11:37:23 +0000 (12:37 +0100)]
Merge branch 'MDL-38573-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 17 Apr 2013 11:32:39 +0000 (12:32 +0100)]
Merge branch 'MDL-39081' of git://github.com/rwijaya/moodle
Dan Poltawski [Wed, 17 Apr 2013 11:27:24 +0000 (12:27 +0100)]
MDL-39021 pluginlib: theme_simple is a core plugin
Don't list as an add-on.
Dan Poltawski [Wed, 17 Apr 2013 11:09:20 +0000 (12:09 +0100)]
Merge branch 'MDL-39087-plugins-uninstall' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 17 Apr 2013 10:50:50 +0000 (12:50 +0200)]
Merge branch 'MDL-38956_master' of git://github.com/dmonllao/moodle
Yuliya Bozhko [Mon, 15 Apr 2013 23:23:52 +0000 (11:23 +1200)]
MDL-39049 Badges: Fix error when awarding a badge from recipients page
Frederic Massart [Mon, 25 Mar 2013 01:42:12 +0000 (09:42 +0800)]
MDL-38573 choice: Reformat settings form
Eloy Lafuente (stronk7) [Wed, 17 Apr 2013 00:43:49 +0000 (02:43 +0200)]
Merge branch 'w15_MDL-39052_m25_csvtemp' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 17 Apr 2013 00:01:16 +0000 (02:01 +0200)]
Merge branch 'MDL-39151-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 16 Apr 2013 23:55:45 +0000 (01:55 +0200)]
Merge branch 'w15_MDL-39069_m25_helpwindow' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 16 Apr 2013 23:40:51 +0000 (01:40 +0200)]
Merge branch 'MDL-38100-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 16 Apr 2013 23:36:43 +0000 (01:36 +0200)]
Merge branch 'MDL-39066-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Tue, 16 Apr 2013 23:27:39 +0000 (01:27 +0200)]
Merge branch 'wip-MDL-39145-m25' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 16 Apr 2013 23:06:17 +0000 (01:06 +0200)]
Merge branch 'w15_MDL-39129_m25_afterburner' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 16 Apr 2013 23:03:27 +0000 (01:03 +0200)]
Merge branch 'w15_MDL-39075_m25_userdesc' of git://github.com/skodak/moodle
Conflicts:
lib/db/upgrade.php
version.php
Eloy Lafuente (stronk7) [Tue, 16 Apr 2013 21:50:19 +0000 (23:50 +0200)]
Merge branch 'wip-MDL-39111-m25' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 16 Apr 2013 13:47:14 +0000 (14:47 +0100)]
Merge branch 'MDL-27814-master' of git://github.com/ankitagarwal/moodle
Conflicts:
lib/deprecatedlib.php
Frederic Massart [Tue, 16 Apr 2013 12:49:42 +0000 (20:49 +0800)]
MDL-38100 repository_googledocs: Proper Google Drive icon
Dan Poltawski [Tue, 16 Apr 2013 12:46:51 +0000 (13:46 +0100)]
Merge branch 'MDL-39140_m25' of git://github.com/sbourget/moodle
Dan Poltawski [Tue, 16 Apr 2013 12:42:01 +0000 (13:42 +0100)]
Merge branch 'wip-mdl-39116' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 16 Apr 2013 12:30:10 +0000 (13:30 +0100)]
Merge branch 'MDL-39029' of git://github.com/jacks92/moodle
Dan Poltawski [Tue, 16 Apr 2013 12:26:34 +0000 (13:26 +0100)]
Merge branch 'm25_MDL-38678_SCORM_RTE_not_required_for_SCO_Assets' of https://github.com/scara/moodle
Petr Škoda [Tue, 16 Apr 2013 12:12:31 +0000 (14:12 +0200)]
MDL-39069 open new window for help when JS disabled
Dan Poltawski [Tue, 16 Apr 2013 11:44:42 +0000 (12:44 +0100)]
Merge branch 'MDL-39080_master' of git://github.com/kordan/moodle
Dan Poltawski [Tue, 16 Apr 2013 11:11:30 +0000 (12:11 +0100)]
MDL-39063 badges: fix whitespace errors
Dan Poltawski [Tue, 16 Apr 2013 11:00:46 +0000 (12:00 +0100)]
Merge branch 'MDL-39063' of github.com:totara/openbadges
Conflicts:
admin/settings/badges.php
lib/db/upgrade.php
version.php
Damyon Wiese [Tue, 16 Apr 2013 08:56:09 +0000 (16:56 +0800)]
Merge branch 'wip-MDL-39064-master' of git://github.com/marinaglancy/moodle
Conflicts:
theme/bootstrap/style/generated.css
Damyon Wiese [Tue, 16 Apr 2013 08:03:33 +0000 (16:03 +0800)]
Merge branch 'wip-MDL-38592-master' of git://github.com/marinaglancy/moodle
Conflicts:
lib/db/upgrade.php
version.php
Damyon Wiese [Tue, 16 Apr 2013 07:56:10 +0000 (15:56 +0800)]
Merge branch 'w15_MDL-34674_m25_spell' of git://github.com/skodak/moodle
Daniel Neis Araujo [Thu, 21 Feb 2013 12:49:00 +0000 (09:49 -0300)]
MDL-38136: fix user_get_user_details doesn't return idnumber (thanks to Antonio Carlos Mariani)
Petr Škoda [Tue, 16 Apr 2013 07:25:24 +0000 (09:25 +0200)]
MDL-39052 create temp files only in Moodle temp folder
Ankit Agarwal [Mon, 15 Apr 2013 05:58:10 +0000 (13:58 +0800)]
MDL-39066 blogs: Add missing setType calls in blogs
Frederic Massart [Tue, 16 Apr 2013 06:42:38 +0000 (14:42 +0800)]
MDL-39151 repository: Do not filter repository listing on manage pages
Petr Škoda [Fri, 12 Apr 2013 12:35:30 +0000 (14:35 +0200)]
MDL-34674 add CTRL+right click hint to tinymce context menus
Damyon Wiese [Tue, 16 Apr 2013 06:32:53 +0000 (14:32 +0800)]
Merge branch 'wip-MDL-38055-m25' of git://github.com/samhemelryk/moodle
Marina Glancy [Tue, 26 Mar 2013 02:04:42 +0000 (13:04 +1100)]
MDL-38592 Settings for courses lists on front page are made more user friendly
- 'List of courses' is split into 'List of courses' (available) and 'Enrolled courses', CFG->disablemycourses is deprecated;
- CFG->frontpageloggedin by default shows list of available courses;
- There is separate item to display course search box
- CFG->maxcoursesincombo is deprecated
- CFG->maxcategorydepth changed default value to 2 since we have AJAX loading now
- FRONTPAGECOURSELIMIT is transformed to CFG->frontpagecourselimit
c
Marina Glancy [Tue, 16 Apr 2013 02:45:06 +0000 (12:45 +1000)]
MDL-39111 check repository instance context instead of repository usage context (following MDL-34346)
Marina Glancy [Mon, 15 Apr 2013 06:46:42 +0000 (16:46 +1000)]
MDL-39145 add text in upgrade.txt about functions deprecated in MDL-37085
Eloy Lafuente (stronk7) [Tue, 16 Apr 2013 00:07:15 +0000 (02:07 +0200)]
Merge branch 'w15_MDL-39132_m25_badgesettings' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 15 Apr 2013 23:24:33 +0000 (01:24 +0200)]
Merge branch 'wip-MDL-39127-m25-integration' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 15 Apr 2013 23:14:06 +0000 (01:14 +0200)]
Merge branch 'master_MDL-37844' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 15 Apr 2013 23:02:06 +0000 (11:02 +1200)]
MDL-39127 navigation: fixed loading of categories for navbar
Yuliya Bozhko [Mon, 15 Apr 2013 22:47:40 +0000 (10:47 +1200)]
MDL-39063 badges: Improve external backpack usability and workflow
Stephen Bourget [Mon, 15 Apr 2013 21:59:25 +0000 (17:59 -0400)]
MDL-39140 mod_folder: Fix missing call to setType()
Dan Poltawski [Mon, 15 Apr 2013 15:25:06 +0000 (16:25 +0100)]
Merge branch 'MDL-38880' of git://github.com/jmvedrine/moodle
Dan Poltawski [Mon, 15 Apr 2013 12:29:14 +0000 (13:29 +0100)]
NOBUG - reduce whitespace errors a little
Dan Poltawski [Mon, 15 Apr 2013 12:19:56 +0000 (13:19 +0100)]
MDL-39047 - theme: fix various whitespace problems
Petr Škoda [Mon, 15 Apr 2013 11:21:39 +0000 (13:21 +0200)]
MDL-39132 always include badge settings, hide the pages when disabled
Dan Poltawski [Mon, 15 Apr 2013 11:15:24 +0000 (12:15 +0100)]
Merge branch 'MDL-39047_master' of https://github.com/markn86/moodle
Rajesh Taneja [Mon, 15 Apr 2013 09:42:24 +0000 (17:42 +0800)]
MDL-39116 Course: Pluginname strings will be set in M.str for all modules supporting Dnd
Currently, if new activity/resource is created by DnD and M.str doesn't have pluginname string
it show wrong string, so loading pluginnames for all modules which support DnD
Mark Nelson [Mon, 15 Apr 2013 07:28:28 +0000 (15:28 +0800)]
MDL-39047 forms: set the z-index of the calendar pop-up so that it renders above the filemanager
Dan Poltawski [Mon, 15 Apr 2013 09:26:53 +0000 (10:26 +0100)]
MDL-38309 fix whitespace issues
Dan Poltawski [Mon, 15 Apr 2013 09:24:20 +0000 (10:24 +0100)]
Merge branch 'wip-MDL-38309-m25' of git://github.com/marinaglancy/moodle
Petr Škoda [Wed, 10 Apr 2013 11:10:00 +0000 (13:10 +0200)]
MDL-39129 convert afterburner to new theme setting file
This patch is based on work by Gareth J Barnard, Pau Ferrer Ocaña (crazyserver) and others.
Dan Poltawski [Mon, 15 Apr 2013 08:29:06 +0000 (09:29 +0100)]
MDL-37762 course: fix category url
Dan Poltawski [Mon, 15 Apr 2013 08:05:25 +0000 (09:05 +0100)]
Merge branch 'MDL-38980_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Mon, 15 Apr 2013 07:58:30 +0000 (08:58 +0100)]
Merge branch 'MDL-39010_master' of git://github.com/lazydaisy/moodle
Rossiani Wijaya [Mon, 15 Apr 2013 07:42:22 +0000 (15:42 +0800)]
MDL-39081 workshop mod: fixed missing setType error
Dan Poltawski [Mon, 15 Apr 2013 07:29:56 +0000 (08:29 +0100)]
Merge branch 'MDL-39000-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 15 Apr 2013 06:58:53 +0000 (07:58 +0100)]
Merge branch 'MDL-38011' of git://github.com/srynot4sale/moodle
Dan Poltawski [Mon, 15 Apr 2013 06:35:14 +0000 (07:35 +0100)]
Merge branch 'MDL-38716-master-int' of git://github.com/FMCorz/moodle
Rajesh Taneja [Mon, 15 Apr 2013 05:23:26 +0000 (13:23 +0800)]
MDL-39110 Administration: Get role from get_roles function to display as filter label
Damyon Wiese [Mon, 15 Apr 2013 06:24:52 +0000 (14:24 +0800)]
Merge branch 'MDL-39068' of git://github.com/stronk7/moodle
David Monllao [Thu, 11 Apr 2013 05:36:35 +0000 (13:36 +0800)]
MDL-38956 behat: New test
According to MDLQA-92, a teacher can preview
questions in the question bank.
Damyon Wiese [Mon, 15 Apr 2013 05:32:07 +0000 (13:32 +0800)]
MDL-37762 navbar - fold some long lines in previous patch
Damyon Wiese [Mon, 15 Apr 2013 05:30:28 +0000 (13:30 +0800)]
Merge branch 'wip-MDL-37762-m25' of https://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 15 Apr 2013 04:14:51 +0000 (12:14 +0800)]
MDL-38904 Theme - JS improvements for bootstrap.
Fix minor whitespace issue in thirdparty lib (will remove exclusion for it from ci).
Update yui-gallery modules location in readme.
Remove code-coverage files.
Damyon Wiese [Mon, 15 Apr 2013 03:57:38 +0000 (11:57 +0800)]
Merge branch 'MDL-38904-m' of git://github.com/andrewnicols/moodle
Frederic Massart [Thu, 28 Mar 2013 04:12:38 +0000 (12:12 +0800)]
MDL-38716 accessibility: ARIA attributes and roles defined on form actions
Damyon Wiese [Mon, 15 Apr 2013 03:23:17 +0000 (11:23 +0800)]
MDL-39021 Theme - Fix phpdoc @package tags for simple theme
Mary Evans [Mon, 15 Apr 2013 03:15:59 +0000 (11:15 +0800)]
MDL-39021 Themes - Add a new simple theme based on bootstrap.
Credits to:
Mary Evans <lazydaisy@visible-expression.co.uk> and
David Scotson <david.scotson@glasgow.ac.uk>
Damyon Wiese [Mon, 15 Apr 2013 03:01:27 +0000 (11:01 +0800)]
Merge branch 'w15_MDL-35434_m25_storedfilesetting' of git://github.com/skodak/moodle.git
Petr Škoda [Wed, 10 Apr 2013 08:57:18 +0000 (10:57 +0200)]
MDL-35434 add support for theme setting files
This patch is based on work by Gareth J Barnard, Pau Ferrer Ocaña (crazyserver) and others.
Petr Škoda [Tue, 9 Apr 2013 18:43:28 +0000 (20:43 +0200)]
MDL-35434 new stored file config setting
Marina Glancy [Mon, 15 Apr 2013 01:05:46 +0000 (11:05 +1000)]
MDL-38309 Added comments on overwriting functions in themes
Defined function tabree() as final so themes do not override it by mistake.
Added comments to other similar shortcut functions that themes should not override them (can not declare them final
for backward compartibility)
Marina Glancy [Thu, 11 Apr 2013 12:45:04 +0000 (22:45 +1000)]
MDL-38309 Substitute usage of print_tabs() with renderable tabtree
Marina Glancy [Thu, 11 Apr 2013 09:06:52 +0000 (19:06 +1000)]
MDL-38309 move HTML generation from print_tabs() to renderer
- created renderable object tabtree that represents the tree of tabs, extends tabobject
- created core_renderer::tabtree(), and supporting core_renderer::render_tabtree(), core_renderer::render_tabobject()
- change print_tabs() to use renderer function, deprecate supporting not needed functions
Damyon Wiese [Mon, 15 Apr 2013 00:58:12 +0000 (08:58 +0800)]
MDL-39092 Yuilib - remove more -coverage.js files
Also slight tweak to the readme for someone who does not know shifter.
Damyon Wiese [Mon, 15 Apr 2013 00:56:27 +0000 (08:56 +0800)]
Merge branch 'MDL-39092-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 15 Apr 2013 00:33:17 +0000 (02:33 +0200)]
Merge branch 'MDL-38617_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 15 Apr 2013 00:22:23 +0000 (02:22 +0200)]
Merge branch 'MDL-38947_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 15 Apr 2013 00:22:06 +0000 (02:22 +0200)]
Merge branch 'MDL-38948_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 15 Apr 2013 00:19:58 +0000 (02:19 +0200)]
Merge branch 'MDL-38949_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 15 Apr 2013 00:08:35 +0000 (02:08 +0200)]
Merge branch 'MDL-38962_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Sun, 14 Apr 2013 23:59:21 +0000 (01:59 +0200)]
Merge branch 'MDL-38960_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Sun, 14 Apr 2013 23:57:01 +0000 (01:57 +0200)]
Merge branch 'MDL-39089_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Sun, 14 Apr 2013 23:25:53 +0000 (11:25 +1200)]
MDL-37762 navbar: shows categories for current course again
Andrew Nicols [Sun, 14 Apr 2013 16:41:06 +0000 (17:41 +0100)]
MDL-39092 JavaScript: Add default Shifter configuration
The settings here ensure that -coverage.js files are not built, and that
the Shifter defaults to using the jshint configuration in the moodle root
directory.
Andrew Nicols [Sun, 14 Apr 2013 16:33:32 +0000 (17:33 +0100)]
MDL-39092 JavaScript: Ignore all upstream YUI coverage JS
Andrew Nicols [Sun, 14 Apr 2013 16:32:26 +0000 (17:32 +0100)]
MDL-39092 JavaScript: Remove all upstream YUI coverage JS files
Andrew Nicols [Sun, 14 Apr 2013 16:30:58 +0000 (17:30 +0100)]
MDL-39092 JavaScript: Ignore all Moodle YUI coverage JS
Andrew Nicols [Sun, 14 Apr 2013 16:30:08 +0000 (17:30 +0100)]
MDL-39092 JavaScript: Remove Moodle YUI coverage JS files
Eloy Lafuente (stronk7) [Sun, 14 Apr 2013 14:07:43 +0000 (16:07 +0200)]
MDL-39068 use cross-db text column ORDER BY
Credit goes to Valerii Kuznetsov, thanks!