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
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 [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
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
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
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
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
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
Damyon Wiese [Mon, 15 Apr 2013 06:24:52 +0000 (14:24 +0800)]
Merge branch 'MDL-39068' of git://github.com/stronk7/moodle
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!
David Monllao [Sun, 14 Apr 2013 07:02:39 +0000 (15:02 +0800)]
MDL-38947 behat: New test
According to MDLQA-73, in a lesson
activity, students can navigate through
a series of pages in various ways
depending upon their answers to questions.
David Monllao [Sun, 14 Apr 2013 05:03:27 +0000 (13:03 +0800)]
MDL-38948 behat: New test
According to MDLQA-76, a teacher can
set a time limit for a lesson activity.
David Monllao [Sun, 14 Apr 2013 04:32:34 +0000 (12:32 +0800)]
MDL-38617 behat: New test
According to MDLQA-1178, an administrator
can filter user accounts by role, cohort
and other variables.
David Monllao [Sun, 14 Apr 2013 03:09:03 +0000 (11:09 +0800)]
MDL-38949 behat: New test
According to MDLQA-81, a teacher can
password protect a lesson and/or set
available from and deadline dates.
David Monllao [Sun, 14 Apr 2013 03:07:33 +0000 (11:07 +0800)]
MDL-38949 behat: Fix editor presence detection issue
Checking not only the presence of an editor
in the page, also an editor for the target
field.
David Monllao [Sun, 14 Apr 2013 02:58:20 +0000 (10:58 +0800)]
MDL-38949 behat: Form field for selectyesno
Silly extension of behat_form_select.
Mary Evans [Sat, 13 Apr 2013 10:37:34 +0000 (11:37 +0100)]
MDL-38980 theme_bootstrap: Increased sort order value for language menu item.
Petr Škoda [Sun, 7 Apr 2013 16:18:01 +0000 (18:18 +0200)]
MDL-34674 use browser built-in spell checking in all browsers except < IE10
David Monllao [Fri, 12 Apr 2013 06:26:28 +0000 (14:26 +0800)]
MDL-38962 behat: New test
According to MDLQA-112, there is a choice
of formats for editing a wiki page.
David Monllao [Fri, 12 Apr 2013 05:22:59 +0000 (13:22 +0800)]
MDL-38960 behat: New test
According to MDLQA-111, a history of each
wiki page is available.
Paul Nicholls [Fri, 12 Apr 2013 04:40:12 +0000 (16:40 +1200)]
MDL-37762: Breadcrumb not showing categories on course page
David Monllao [Fri, 12 Apr 2013 04:14:13 +0000 (12:14 +0800)]
MDL-38089 mod_wiki: Fix incorrect links
Damyon Wiese [Fri, 12 Apr 2013 03:53:48 +0000 (11:53 +0800)]
MDL-29877 Grades - Remove hardcoded prefix from upgrade steps
Damyon Wiese [Fri, 12 Apr 2013 03:16:23 +0000 (11:16 +0800)]
MDL-29877 Grades - version bump for upgrade step.
Damyon Wiese [Fri, 12 Apr 2013 03:14:10 +0000 (11:14 +0800)]
Merge branch 'MDL-29877_bad_grade_item' of git://github.com/andyjdavis/moodle
Conflicts:
version.php
Dan Poltawski [Fri, 12 Apr 2013 03:08:28 +0000 (11:08 +0800)]
Merge branch 'MDL-39054' of git://github.com/jacks92/moodle
Dan Poltawski [Fri, 12 Apr 2013 02:45:00 +0000 (10:45 +0800)]
Merge branch 'MDL-39011_master' of github.com:totara/openbadges
Dan Poltawski [Fri, 12 Apr 2013 02:30:10 +0000 (10:30 +0800)]
Merge branch 'MDL-39049_master' of github.com:totara/openbadges
Dan Poltawski [Fri, 12 Apr 2013 02:26:05 +0000 (10:26 +0800)]
Merge branch 'MDL-37537' of git://github.com/srynot4sale/moodle
Dan Poltawski [Fri, 12 Apr 2013 02:08:45 +0000 (10:08 +0800)]
Merge branch 'MDL-38637-master' of github.com:StudiUM/moodle
Dan Poltawski [Fri, 12 Apr 2013 01:59:49 +0000 (09:59 +0800)]
Merge branch 'integration_MDL-38997' of github.com:totara/moodle
Matteo Scaramuccia [Sun, 24 Mar 2013 11:01:52 +0000 (12:01 +0100)]
MDL-38678 SCORM: Runtime Environment (RTE) checks not required in case of SCO Assets
Jean-Philippe Gaudreau [Thu, 11 Apr 2013 13:02:37 +0000 (09:02 -0400)]
MDL-38637 CAS Authentication: Undefined index: QUERY_STRING when executing cron
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 14:44:47 +0000 (16:44 +0200)]
Merge branch 'MDL-38828_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 14:32:32 +0000 (16:32 +0200)]
Merge branch 'MDL-38961_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 14:30:08 +0000 (16:30 +0200)]
Merge branch 'MDL-38963_master' of git://github.com/dmonllao/moodle
Jean-Michel Vedrine [Thu, 4 Apr 2013 16:32:59 +0000 (18:32 +0200)]
MDL-38880 Imported Cloze questions lose embedded images or other media
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 14:11:40 +0000 (16:11 +0200)]
Merge branch 'MDL-38940_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 13:56:45 +0000 (15:56 +0200)]
Merge branch 'MDL-38957_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 13:52:53 +0000 (15:52 +0200)]
Merge branch 'MDL-38958_master' of git://github.com/dmonllao/moodle
Marina Glancy [Wed, 10 Apr 2013 04:59:48 +0000 (14:59 +1000)]
MDL-39064 Course listings CSS ported from base to bootstrap theme
Marina Glancy [Wed, 10 Apr 2013 02:00:00 +0000 (12:00 +1000)]
MDL-39064 changed sequence of directives to separate course content and course listings
Jayesh Anandani [Thu, 11 Apr 2013 10:55:34 +0000 (16:25 +0530)]
MDL-39029 quiz password: autofocus feature added
Jayesh Anandani [Wed, 10 Apr 2013 19:44:32 +0000 (01:14 +0530)]
MDL-39054 quiz statistics: move hard-coded text to lang file
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 10:38:46 +0000 (12:38 +0200)]
on demand release 2.5beta+
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 10:32:32 +0000 (12:32 +0200)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
David Monllao [Thu, 11 Apr 2013 07:58:56 +0000 (15:58 +0800)]
MDL-38961 behat: New test
According to MDLQA-110, edited wiki
pages may be previewed before saving.
David Monllao [Thu, 11 Apr 2013 07:41:47 +0000 (15:41 +0800)]
MDL-38963 behat: New test
According to MDLQA-113, a teacher can
set a wiki to be collaborative or
individual.
David Monllao [Thu, 11 Apr 2013 02:47:10 +0000 (10:47 +0800)]
MDL-38940 behat: New test
According to MDLQA-32, glossary entries
can be searched or browsed by alphabet,
category, date or author.