Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 23:43:19 +0000 (00:43 +0100)]
Merge branch 'MDL-38483_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 22:38:07 +0000 (23:38 +0100)]
Merge branch 'MDL-38557' of git://github.com/timhunt/moodle
Conflicts:
lib/db/upgrade.php
version.php
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 22:27:16 +0000 (23:27 +0100)]
Merge branch 'MDL-38651' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 22:22:25 +0000 (23:22 +0100)]
Merge branch 'MDL-38647' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 22:14:24 +0000 (23:14 +0100)]
Merge branch 'w13_MDL-38589_m25_pear' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 22:13:33 +0000 (23:13 +0100)]
Merge branch 'w13_MDL-37783_m12_testinfo' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 22:10:11 +0000 (23:10 +0100)]
Merge branch 'MDL-38563-master-int' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 22:04:48 +0000 (23:04 +0100)]
Merge branch 'w13_MDL-37742_m25_dirtyoracle' of git://github.com/skodak/moodle
Conflicts:
lib/upgrade.txt
Petr Škoda [Tue, 26 Mar 2013 19:00:52 +0000 (20:00 +0100)]
MDL-37742 add debugging message when $DB->sql_empty() used
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 15:09:06 +0000 (16:09 +0100)]
Merge branch 'w13_MDL-37782_m25_testtrans' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 15:07:12 +0000 (16:07 +0100)]
Merge branch 'w13_MDL-38671_m25_adodb' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 15:03:37 +0000 (16:03 +0100)]
Merge branch 'MDL-38582' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 12:37:13 +0000 (13:37 +0100)]
Merge branch 'MDL-38719'
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 12:20:23 +0000 (13:20 +0100)]
MDL-38719 forms: detectMissingSetType() handle of repetitions.
It seems that formslib, for repetition, relies in the type
especified by the main (non existent at the end) element, instead
of assingning a type to each repetition.
Surely a result of storing types apart from elements. :-(
With the patch, detectMissingSetType() will detect
repeated elements (name containing '[') and will
perform the verification against that main element type.
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 11:13:40 +0000 (12:13 +0100)]
MDL-38719 forms: add some missing types.
This just adds some missing types to different places
causing phpunit tests to fail.
Aparup Banerjee [Tue, 26 Mar 2013 09:22:22 +0000 (17:22 +0800)]
MDL-38564 fixed whitespace
Aparup Banerjee [Tue, 26 Mar 2013 09:20:01 +0000 (17:20 +0800)]
Merge branch 'MDL-38564-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Tue, 26 Mar 2013 09:12:18 +0000 (17:12 +0800)]
Merge branch 'w13_MDL-38672_m25_purifier' of git://github.com/skodak/moodle
Ankit Agarwal [Wed, 20 Mar 2013 05:17:48 +0000 (13:17 +0800)]
MDL-38564 Adding unit tests for the functions compare_activities_by_time_asc() and compare_activities_by_time_desc()
Damyon Wiese [Tue, 26 Mar 2013 08:11:47 +0000 (16:11 +0800)]
Merge branch 'w13_MDL-38673_m25_flowplayer' of git://github.com/skodak/moodle
Damyon Wiese [Tue, 26 Mar 2013 07:40:04 +0000 (15:40 +0800)]
Merge branch 'm25_MDL-38336_SCORM_TOC_links_when_Display_course_structure_is_on' of https://github.com/scara/moodle
Damyon Wiese [Tue, 26 Mar 2013 07:16:15 +0000 (15:16 +0800)]
MDL-38468 Filelib: Fix ordering of new mimetypes
Damyon Wiese [Tue, 26 Mar 2013 07:13:35 +0000 (15:13 +0800)]
Merge branch 'm25_MDL-38468_Fix_MHTML_files_delivery' of https://github.com/scara/moodle
Conflicts:
lib/db/upgrade.php
version.php
Damyon Wiese [Tue, 26 Mar 2013 06:57:04 +0000 (14:57 +0800)]
Merge branch 'MDL-38528' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 26 Mar 2013 06:50:18 +0000 (14:50 +0800)]
MDL-35875: Version bump for CSS changes
Damyon Wiese [Tue, 26 Mar 2013 06:49:34 +0000 (14:49 +0800)]
Merge branch 'MDL-35875-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/upgrade.txt
Damyon Wiese [Tue, 26 Mar 2013 06:29:57 +0000 (14:29 +0800)]
Merge branch 'MDL-30438_b' of git://github.com/rwijaya/moodle
Damyon Wiese [Tue, 26 Mar 2013 06:22:35 +0000 (14:22 +0800)]
MDL-38147 Course: Added version bump for cache definitions.
Damyon Wiese [Tue, 26 Mar 2013 06:22:11 +0000 (14:22 +0800)]
Merge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle
Conflicts:
lib/upgrade.txt
Damyon Wiese [Tue, 26 Mar 2013 05:46:29 +0000 (13:46 +0800)]
Merge branch 'MDL-34311-master' of git://github.com/danpoltawski/moodle
Conflicts:
course/moodleform_mod.php
lib/upgrade.txt
Damyon Wiese [Tue, 26 Mar 2013 05:33:52 +0000 (13:33 +0800)]
MDL-38598 Forms: Version bump for js changes.
Damyon Wiese [Tue, 26 Mar 2013 05:28:57 +0000 (13:28 +0800)]
Merge branch 'MDL-38598-master-int' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 26 Mar 2013 05:23:53 +0000 (13:23 +0800)]
Merge branch 'MDL-38380' of git://github.com/lazydaisy/moodle
Marina Glancy [Tue, 26 Mar 2013 05:17:34 +0000 (16:17 +1100)]
MDL-38147 bug fix, changed usage of non-existing function
Damyon Wiese [Tue, 26 Mar 2013 05:12:29 +0000 (13:12 +0800)]
Merge branch 'MDL-38390' of git://github.com/jonof/moodle
Damyon Wiese [Tue, 26 Mar 2013 04:59:53 +0000 (12:59 +0800)]
Merge branch 'MDL-38429' of git://github.com/rwijaya/moodle
Damyon Wiese [Tue, 26 Mar 2013 04:19:05 +0000 (12:19 +0800)]
Merge branch 'MDL-38569-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 26 Mar 2013 03:09:00 +0000 (14:09 +1100)]
MDL-38147 fixed small bug on changed categories cache
Damyon Wiese [Tue, 26 Mar 2013 02:41:33 +0000 (10:41 +0800)]
Merge branch 'wip-mdl-36882' of git://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 26 Mar 2013 02:04:31 +0000 (10:04 +0800)]
Merge branch 'wip-mdl-36125' of git://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 26 Mar 2013 01:38:46 +0000 (09:38 +0800)]
Merge branch 'wip-MDL-38650_master' of git://github.com/gjb2048/moodle
Gareth J Barnard [Mon, 25 Mar 2013 10:26:35 +0000 (10:26 +0000)]
MDL-38650 theme_mymobile: Convert to new jQuery support infrastructure.
Damyon Wiese [Mon, 25 Mar 2013 08:00:00 +0000 (16:00 +0800)]
Merge branch 'MDL-38674-m' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 25 Mar 2013 07:51:01 +0000 (15:51 +0800)]
Merge branch 'MDL-38668' of git://github.com/stronk7/moodle
Damyon Wiese [Mon, 25 Mar 2013 07:36:25 +0000 (15:36 +0800)]
Merge branch 'w13_MDL-38675_m25_tcpdf' of git://github.com/skodak/moodle
Rossiani Wijaya [Mon, 25 Mar 2013 06:07:18 +0000 (14:07 +0800)]
MDL-38429 Lesson Module: improve lesson code by reseting NULL value to use lowercase.
Damyon Wiese [Mon, 25 Mar 2013 06:05:17 +0000 (14:05 +0800)]
MDL-38654 Deprecating gdversion setting: Fix typo for new install
Damyon Wiese [Mon, 25 Mar 2013 06:02:31 +0000 (14:02 +0800)]
Merge branch 'w13_MDL-38654_m25_gdversion' of git://github.com/skodak/moodle
Conflicts:
lang/en/admin.php
Roman Tsukanov [Mon, 25 Mar 2013 05:07:18 +0000 (13:07 +0800)]
MDL-38429: lesson report - Improve lesson statistics code.
Damyon Wiese [Mon, 25 Mar 2013 04:27:32 +0000 (12:27 +0800)]
Merge branch 'w13_MDL-15727_m25_jquery' of git://github.com/skodak/moodle
Rossiani Wijaya [Mon, 25 Mar 2013 03:47:05 +0000 (11:47 +0800)]
MDL-30438 Lesson Module: fixed input text editable capability after checking/unchecking unmask option
Damyon Wiese [Mon, 25 Mar 2013 03:30:36 +0000 (11:30 +0800)]
Merge branch 'MDL-38044-master' of git://github.com/FMCorz/moodle
Rossiani Wijaya [Mon, 11 Mar 2013 05:09:23 +0000 (13:09 +0800)]
MDL-30438 Lesson Module: improve password field to disabled when password protect is set to no.
Damyon Wiese [Mon, 25 Mar 2013 03:15:03 +0000 (11:15 +0800)]
Merge branch 'wip-MDL-34917_master' of git://github.com/gjb2048/moodle
Damyon Wiese [Mon, 25 Mar 2013 02:30:54 +0000 (10:30 +0800)]
MDL-31681: Formatting changes to fix indentation
Also removed/refactored some confusing use of references.
Marina Glancy [Tue, 5 Mar 2013 00:41:16 +0000 (11:41 +1100)]
MDL-38147 Added functions coursecat::search_courses(), get_courses()
Also search_courses_count(), get_courses_count();
Added unittests
Marina Glancy [Fri, 22 Mar 2013 01:59:03 +0000 (12:59 +1100)]
MDL-38147 fixes to phpdocs and avoid using deprecated context functions
Marina Glancy [Mon, 18 Mar 2013 04:00:55 +0000 (15:00 +1100)]
MDL-38147 changed logic for building list in make_categories_list()
Marina Glancy [Thu, 28 Feb 2013 01:29:15 +0000 (12:29 +1100)]
MDL-38147 Improvements to caching of course categories, coursecat::get_children() improvements
- Course categories caches are purged by event now
- session cache has additional 10 minutes ttl to clear itself and accomodate for permission changes that do not trigger event purging
- additional request-level cache for coursecat::get()
- We store only children of one category in one cache key
- Function coursecat::get_children() can return results sorted and/or paginated. Added tests
Marina Glancy [Wed, 27 Feb 2013 00:35:35 +0000 (11:35 +1100)]
MDL-38147 Performance improvements to coursecat class:
- Retrieve and cache only often-used fields of course category
- Removed function coursecat::get_all_visible() as potentially causing performance issues
- removed function coursecat::get_all_parents() as ineffective and unnecessary, replaced with get_parents()
- retrieve all fields from course_categories when unretrieved field is accessed
Also some code improvements:
- rename functions starting with _ , rename arguments, etc.
Marina Glancy [Wed, 20 Feb 2013 09:51:21 +0000 (20:51 +1100)]
MDL-38147 deprecated get_categories(), change usage to coursecat
Marina Glancy [Fri, 22 Feb 2013 01:24:40 +0000 (12:24 +1100)]
MDL-38147 deprecated get_child_categories(), change usage to coursecat
Marina Glancy [Thu, 21 Feb 2013 23:45:07 +0000 (10:45 +1100)]
MDL-38147 deprecated get_all_subcategories()
Marina Glancy [Thu, 21 Feb 2013 00:33:15 +0000 (11:33 +1100)]
MDL-38147 deprecated create_course_category(), change usage to coursecat. Also avoid direct DB update of table course_categories
changed to usage of
- coursecat::create()
- coursecat::update()
Marina Glancy [Thu, 21 Feb 2013 00:22:20 +0000 (11:22 +1100)]
MDL-38147 deprecated get_course_category(), change usage to coursecat
Marina Glancy [Wed, 20 Feb 2013 23:55:35 +0000 (10:55 +1100)]
MDL-38147 deprecated move_category(), course_category_hide(), course_category_show(), change usage to coursecat
All usages in core replaced with:
- coursecat::change_parent()
- coursecat::hide()
- coursecat::show()
Marina Glancy [Wed, 20 Feb 2013 23:46:52 +0000 (10:46 +1100)]
MDL-38147 deprecated category_delete_move(), category_delete_full(), change usage to coursecat
Marina Glancy [Wed, 20 Feb 2013 23:37:52 +0000 (10:37 +1100)]
MDL-38147 deprecated make_categories_list(), change usage to coursecat
Marina Glancy [Thu, 21 Feb 2013 00:30:12 +0000 (11:30 +1100)]
MDL-38147 Added coursecatlib_test.php, changed other tests to use coursecat::create() for creating category
Marina Glancy [Wed, 20 Feb 2013 22:57:40 +0000 (09:57 +1100)]
MDL-38147 Created class coursecat, added cache definition and lang strings
Damyon Wiese [Mon, 25 Mar 2013 02:15:38 +0000 (10:15 +0800)]
Merge branch 'MDL-31681' of https://github.com/Lightwork-Marking/moodle
Dan Poltawski [Mon, 25 Mar 2013 01:38:56 +0000 (09:38 +0800)]
MDL-34311 mod_url: Missing setType on the external url
Dan Poltawski [Mon, 25 Mar 2013 01:26:10 +0000 (09:26 +0800)]
MDL-34311 course: add missing type on cm idnumber
We must use PARAM_RAW for idnumbers because external systems could use
any characters and this is a linking field for external systems.
Dan Poltawski [Fri, 22 Mar 2013 08:40:30 +0000 (16:40 +0800)]
MDL-34311 course: prevent course edit form warnings
There is a placeholder element.
Dan Poltawski [Fri, 22 Mar 2013 08:38:10 +0000 (16:38 +0800)]
MDL-34311 formslib: warn when no param type set
Params without a type set will not be getting cleaned, so if developers
really do not want cleaning, they should set it explicitly.
Damyon Wiese [Mon, 25 Mar 2013 01:20:53 +0000 (09:20 +0800)]
MDL-37033 Environment - Fix indenting in XML
David Monllao [Thu, 14 Mar 2013 08:50:37 +0000 (16:50 +0800)]
MDL-38483 behat: New test
According to MDLQA-89
Damyon Wiese [Mon, 25 Mar 2013 01:13:50 +0000 (09:13 +0800)]
Merge branch 'MDL-37033' of git://github.com/stronk7/moodle
Frederic Massart [Fri, 22 Mar 2013 03:39:19 +0000 (11:39 +0800)]
MDL-38569 form: No advanced settings in Common module settings
Frederic Massart [Fri, 22 Mar 2013 02:26:50 +0000 (10:26 +0800)]
MDL-38598 form: Prevent flickering due to advanced fields
Eloy Lafuente (stronk7) [Sun, 24 Mar 2013 22:40:50 +0000 (23:40 +0100)]
Merge branch 'MDL-38658-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Sun, 24 Mar 2013 22:39:07 +0000 (23:39 +0100)]
Merge branch 'MDL-36927-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Sun, 24 Mar 2013 22:26:55 +0000 (23:26 +0100)]
Merge branch 'w13_MDL-38581_m25_forumtests' of git://github.com/skodak/moodle
Petr Škoda [Sun, 24 Mar 2013 21:17:36 +0000 (22:17 +0100)]
MDL-38654 add full $CFG->gdversion backwards compatibility for now
Paul Charsley [Wed, 20 Mar 2013 22:00:59 +0000 (11:00 +1300)]
MDL-31681 added core_grade_get_definitions web service function
Petr Škoda [Sun, 24 Mar 2013 17:59:33 +0000 (18:59 +0100)]
MDL-38675 import tcpdf 5.9.209
Petr Škoda [Sun, 24 Mar 2013 17:35:09 +0000 (18:35 +0100)]
MDL-38673 import flash based FlowPlayer 3.2.16
Andrew Robert Nicols [Sun, 24 Mar 2013 17:24:00 +0000 (17:24 +0000)]
MDL-38674 JavaScript: Migrate moodle-filter_glossary-autolink to use Shifter
Petr Škoda [Sun, 24 Mar 2013 17:00:44 +0000 (18:00 +0100)]
MDL-38672 import HTML Purifier 4.5.0
Petr Škoda [Sun, 24 Mar 2013 16:47:42 +0000 (17:47 +0100)]
MDL-38671 add adodb 5.18
Petr Škoda [Sun, 24 Mar 2013 13:16:28 +0000 (14:16 +0100)]
MDL-37782 reset DB after each failed database test
Petr Škoda [Mon, 28 Jan 2013 17:57:46 +0000 (18:57 +0100)]
MDL-37742 simplify dirty one-space oracle hack
Matteo Scaramuccia [Tue, 5 Mar 2013 22:39:24 +0000 (23:39 +0100)]
MDL-38336 SCORM: incorrect TOC bulding when 'Display course structure' is on
Eloy Lafuente (stronk7) [Sun, 24 Mar 2013 09:42:28 +0000 (10:42 +0100)]
MDL-38668 timezones: update to tzdata 2013b
Gareth J Barnard [Sat, 23 Mar 2013 17:01:32 +0000 (17:01 +0000)]
MDL-34917 course: Jump to section navigation for 'One section per page'.
Matteo Scaramuccia [Thu, 14 Mar 2013 21:41:34 +0000 (22:41 +0100)]
MDL-38468 Files API: fixed the support for MTHML (MIME HTML: web page archive) files
Jonathon Fowler [Sat, 16 Mar 2013 11:25:22 +0000 (21:25 +1000)]
MDL-38390 qformat_blackboard_six: use pool title as category name
If the category title is empty, generate a sequentially-numbered
title to use instead.
Petr Škoda [Fri, 22 Mar 2013 23:06:39 +0000 (00:06 +0100)]
MDL-37783 add some useful information to any phpunit output
Petr Škoda [Fri, 22 Mar 2013 21:47:08 +0000 (22:47 +0100)]
MDL-38589 improve missing PHPUnit library hint
Andrew Robert Nicols [Fri, 22 Mar 2013 17:29:56 +0000 (17:29 +0000)]
MDL-38658 JavaScript: Correct fullpath for dndupload definition