Tim Hunt [Tue, 2 Apr 2013 10:57:12 +0000 (11:57 +0100)]
MDL-26956 enrol form: add missing setType calls.
sam marshall [Wed, 27 Mar 2013 14:56:20 +0000 (14:56 +0000)]
MDL-26956 (3) Enrol: Add filter options to enrolments screen
sam marshall [Wed, 27 Mar 2013 17:15:23 +0000 (17:15 +0000)]
MDL-26956 (2) Forms: Function to render form to string
Previously it was only possible to display the form immediately as
HTML output. You had to wrap in an output buffer in order to put
it in a renderer. This new function does the output buffer for you.
sam marshall [Wed, 27 Mar 2013 11:30:22 +0000 (11:30 +0000)]
MDL-26956 (1) Library: Move search SQL function to datalib
This function used to be in the user selector, but it is useful in
other areas where we want to search for users as it handles a number
of search options (including extra fields, etc.) and returns SQL
which can be included in a joined query.
A unit test has been added to check the results of these searches.
Damyon Wiese [Thu, 28 Mar 2013 06:44:31 +0000 (14:44 +0800)]
weekly release 2.5dev
Damyon Wiese [Thu, 28 Mar 2013 06:36:33 +0000 (14:36 +0800)]
Fix permissions
Damyon Wiese [Thu, 28 Mar 2013 01:39:05 +0000 (09:39 +0800)]
Merge branch 'MDL-25631' of git://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 22:56:57 +0000 (23:56 +0100)]
Merge branch 'MDL-38516-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 22:38:33 +0000 (23:38 +0100)]
Merge branch 'MDL-38520-m' of https://github.com/andrewnicols/moodle
Andrew Robert Nicols [Sat, 16 Mar 2013 22:30:02 +0000 (22:30 +0000)]
MDL-38516 JavaScript: Migrate moodle-block_navigation-navigation to use Shifter
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 22:20:18 +0000 (23:20 +0100)]
Merge branch 'MDL-38473-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 22:06:46 +0000 (23:06 +0100)]
Merge branch 'MDL-38404-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 21:42:33 +0000 (22:42 +0100)]
Merge branch 'MDL-38472-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 21:29:21 +0000 (22:29 +0100)]
Merge branch 'MDL-38519-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 20:43:30 +0000 (21:43 +0100)]
Merge branch 'MDL-38517-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 17:50:34 +0000 (18:50 +0100)]
Merge branch 'MDL-38471-m' of https://github.com/andrewnicols/moodle
Damyon Wiese [Wed, 27 Mar 2013 06:11:27 +0000 (14:11 +0800)]
Merge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Wed, 27 Mar 2013 06:06:27 +0000 (17:06 +1100)]
MDL-38147 fixed bug with windows PHP different function behaviour
Marina Glancy [Wed, 27 Mar 2013 06:05:51 +0000 (17:05 +1100)]
MDL-38147 added comments for SQL-based course search that might not work on some DB
Marina Glancy [Wed, 27 Mar 2013 05:07:29 +0000 (16:07 +1100)]
MDL-38147 do not use DB->sql_length because it does not work on MSSQL
Aparup Banerjee [Wed, 27 Mar 2013 05:07:10 +0000 (13:07 +0800)]
Merge branch 'MDL-38632' of git://github.com/stronk7/moodle
Damyon Wiese [Wed, 27 Mar 2013 04:17:47 +0000 (12:17 +0800)]
Merge branch 'MDL-38736-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Wed, 27 Mar 2013 04:11:06 +0000 (12:11 +0800)]
MDL-38717 Admin: Change setType for email to PARAM_EMAIL
Damyon Wiese [Wed, 27 Mar 2013 03:57:14 +0000 (11:57 +0800)]
Merge branch 'MDL-38717-master' of git://github.com/danpoltawski/moodle
Aparup Banerjee [Wed, 27 Mar 2013 02:38:31 +0000 (10:38 +0800)]
Merge branch 'MDL-38659' of git://github.com/stronk7/moodle
Dan Poltawski [Wed, 27 Mar 2013 02:08:40 +0000 (10:08 +0800)]
MDL-38736 mod_choice: fix missing param type
Damyon Wiese [Wed, 27 Mar 2013 02:16:09 +0000 (10:16 +0800)]
MDL-35876: Whitespace, indenting and more verbose upgrade.txt
Dan Poltawski [Wed, 27 Mar 2013 02:12:46 +0000 (10:12 +0800)]
MDL-38717 admin: missing setType on email
Damyon Wiese [Wed, 27 Mar 2013 02:06:30 +0000 (10:06 +0800)]
Merge branch 'wip-MDL-35876-master' of git://github.com/phalacee/moodle
Conflicts:
lib/upgrade.txt
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 01:00:02 +0000 (02:00 +0100)]
Merge branch 'wip-mdl-38543' of git://github.com/deraadt/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 00:51:35 +0000 (01:51 +0100)]
Merge branch 'MDL-38552-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 00:49:10 +0000 (01:49 +0100)]
Merge branch 'MDL-38566-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/base/style/core.css
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 23:47:32 +0000 (00:47 +0100)]
Merge branch 'MDL-38484_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 23:46:05 +0000 (00:46 +0100)]
Merge branch 'MDL-38531_master' of git://github.com/dmonllao/moodle
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
Eric Merrill [Tue, 26 Mar 2013 19:18:10 +0000 (15:18 -0400)]
MDL-25631 backup Decoupling legacy files from course config settigs. If they are present, they will be restored.
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 14:34:50 +0000 (15:34 +0100)]
MDL-38659 environment: fix incorrect feedback messages
Eloy Lafuente (stronk7) [Sun, 24 Mar 2013 01:13:52 +0000 (02:13 +0100)]
MDL-38659 environment: verify feedback matches levels
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
Jason Fowler [Mon, 11 Mar 2013 06:56:35 +0000 (14:56 +0800)]
MDL-35876 - Blocks - Adding verbose move here descriptions to blocks for accessibility
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
