Sam Hemelryk [Mon, 19 Mar 2012 01:14:28 +0000 (14:14 +1300)]
Merge branch 'MDL-28187_messaging_nav' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 19 Mar 2012 01:10:37 +0000 (14:10 +1300)]
Merge branch 'MDL-31835_recent_conversations' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Sun, 18 Mar 2012 22:01:50 +0000 (11:01 +1300)]
MDL-19125 upgrade: Fixed typo
Sam Hemelryk [Sun, 18 Mar 2012 21:28:14 +0000 (10:28 +1300)]
Merge branch 'MDL-30890' of git://github.com/rwijaya/moodle
Sam Hemelryk [Sun, 18 Mar 2012 21:08:47 +0000 (10:08 +1300)]
MDL-19125 lib: Fixed up inline comments during integration
Sam Hemelryk [Sun, 18 Mar 2012 21:07:57 +0000 (10:07 +1300)]
Merge branch 'MDL-19125_module_security' of git://github.com/timhunt/moodle
Andrew Davis [Thu, 8 Mar 2012 07:45:45 +0000 (14:45 +0700)]
MDL-28187 message: fixed up $PAGE->set_url() in /message/index.php so the nav highlighted properly
Andrew Davis [Sat, 3 Mar 2012 06:47:41 +0000 (13:47 +0700)]
MDL-31835 message: added a view conversation type link after each conversation on the recent conversation screen
Tim Hunt [Thu, 15 Mar 2012 18:46:43 +0000 (18:46 +0000)]
MDL-31594 question manual grading: did not handle comma as decimal.
Tim Hunt [Thu, 8 Mar 2012 12:00:38 +0000 (12:00 +0000)]
MDL-19125 module restrictions: document change in mod/upgrade.txt
Tim Hunt [Wed, 7 Mar 2012 16:24:02 +0000 (16:24 +0000)]
MDL-19125 module restrictions: addinstance capabilities for all mods
Tim Hunt [Wed, 7 Mar 2012 11:33:50 +0000 (11:33 +0000)]
MDL-19125 module restrictions: use a capability
1. This used to use a complex legacy system which was buggy.
2. It now relies on a new mod/...:addinstance capability for each module.
3. All the legacy code has been stripped out.
4. Old restriction data is upgraded by creating the necessary permission
overrides. Similarly, when old backups are restored, the old settings
are converted to be overrides.
5. The required addinstance capabilities will be added as a separate
commit.
6. There is a developer debug warning about modules that are missing the
addinstance capability, unless they are MOD_ARCHETYPE_SYSTEM mods.
Eloy Lafuente (stronk7) [Thu, 15 Mar 2012 10:44:35 +0000 (11:44 +0100)]
weekly release 2.3dev
Eloy Lafuente (stronk7) [Thu, 15 Mar 2012 10:41:55 +0000 (11:41 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
Rossiani Wijaya [Thu, 15 Mar 2012 08:55:59 +0000 (16:55 +0800)]
MDL-30890 accessibility compliance: add summary to calendar table
AMOS bot [Thu, 15 Mar 2012 00:31:47 +0000 (00:31 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Wed, 14 Mar 2012 23:39:17 +0000 (00:39 +0100)]
Merge branch 'MDL-26243-master' of https://github.com/mackensen/moodle
Jenny Gray [Tue, 6 Mar 2012 13:30:28 +0000 (13:30 +0000)]
MDL-31911 admin tools: moved loop after tools admin category created
Eloy Lafuente (stronk7) [Wed, 14 Mar 2012 17:14:36 +0000 (18:14 +0100)]
MDL-30995 completion: switch one type & name for correctness
Eloy Lafuente (stronk7) [Wed, 14 Mar 2012 17:10:24 +0000 (18:10 +0100)]
MDL-28972 formslib: whitespace fixes
Eloy Lafuente (stronk7) [Wed, 14 Mar 2012 17:07:21 +0000 (18:07 +0100)]
Merge branch 'MDL-30995' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Wed, 14 Mar 2012 06:39:36 +0000 (14:39 +0800)]
MDL-30995 completion: updating PHPdocs as suggested by little smurfs
Sam Hemelryk [Wed, 14 Mar 2012 01:38:08 +0000 (14:38 +1300)]
MDL-28972 formslib: Fixed up variable naming
Sam Hemelryk [Wed, 14 Mar 2012 01:40:07 +0000 (14:40 +1300)]
Merge branch 'wip-mdl-28972' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Wed, 14 Mar 2012 01:16:27 +0000 (09:16 +0800)]
Merge branch 'MDL-31853_admin_externalpage_setup' of git://github.com/davosmith/moodle
Sam Hemelryk [Wed, 14 Mar 2012 00:52:18 +0000 (13:52 +1300)]
MDl-30616 course: Fixed bug with module subtype links
Sam Hemelryk [Tue, 13 Mar 2012 22:52:38 +0000 (11:52 +1300)]
Merge branch 'MDL-29147_insertElementBefore_warning' of git://github.com/davosmith/moodle
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 22:40:39 +0000 (23:40 +0100)]
Merge branch 'MDL-30616-master-7' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 13 Mar 2012 22:29:52 +0000 (11:29 +1300)]
Merge branch 'MDL-29440-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 13 Mar 2012 22:23:39 +0000 (11:23 +1300)]
Merge branch 'MDL-31975_master' of git://github.com/kordan/moodle
Sam Hemelryk [Tue, 13 Mar 2012 22:15:13 +0000 (11:15 +1300)]
Merge branch 'MDL-31169_master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 21:54:48 +0000 (22:54 +0100)]
MDL-31929 minor fixup (the file is plenty, but avoid introducing new ones)
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 22:01:11 +0000 (23:01 +0100)]
Merge branch 'wip-MDL-31929-master' of git://github.com/marinaglancy/moodle
Ankit Agarwal [Tue, 13 Mar 2012 05:59:10 +0000 (13:59 +0800)]
MDL-28998 libraries: Using default value of 0 for userid during login
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 21:35:04 +0000 (22:35 +0100)]
Merge branch 'wip-MDL-27405-m23' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Tue, 13 Mar 2012 21:16:34 +0000 (10:16 +1300)]
MDL-27405 navigation: Fixed up buggy array_merge call
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 17:13:52 +0000 (18:13 +0100)]
Merge branch 'w11_MDL-31790_m23_resetunenrol' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 17:08:40 +0000 (18:08 +0100)]
Merge branch 'MDL-31981' of git://github.com/timhunt/moodle
Andrew Davis [Thu, 1 Mar 2012 06:53:48 +0000 (13:53 +0700)]
MDL-31834 message: fixed up some not quite correct usage of moodle/site:readallmessages
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 15:15:02 +0000 (16:15 +0100)]
Merge branch 'wip-MDL-31175-m23' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 12:36:48 +0000 (13:36 +0100)]
Merge branch 'w11_MDL-31845_m23_dbenrolcat' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 12:13:31 +0000 (13:13 +0100)]
MDL-31718 add a few more tests to check that lens and tags are properly handled
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 11:51:41 +0000 (12:51 +0100)]
Merge branch 'w11_MDL-31718_m23_shortentext' of git://github.com/skodak/moodle
Petr Skoda [Tue, 13 Mar 2012 11:30:13 +0000 (12:30 +0100)]
MDL-31790 prevent removing of protected role assignments from subcontexts
Aparup Banerjee [Tue, 13 Mar 2012 08:54:08 +0000 (16:54 +0800)]
Merge branch 'MDL-31709_message_get_participants' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Tue, 13 Mar 2012 08:10:19 +0000 (16:10 +0800)]
Merge branch 'wip-MDL-31838-master' of git://github.com/marinaglancy/moodle
Petr Skoda [Tue, 13 Mar 2012 08:09:04 +0000 (09:09 +0100)]
MDL-31790 fix incorrect capability
Aparup Banerjee [Tue, 13 Mar 2012 07:51:53 +0000 (15:51 +0800)]
Merge branch 'master_MDL-31942' of git://github.com/danmarsden/moodle
Aparup Banerjee [Tue, 13 Mar 2012 07:16:30 +0000 (15:16 +0800)]
Merge branch 'wip-mdl-27862' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Tue, 13 Mar 2012 07:10:41 +0000 (15:10 +0800)]
MDL-31008 themes : fixed up incorrect css typo
Aparup Banerjee [Tue, 13 Mar 2012 03:45:28 +0000 (11:45 +0800)]
Merge branch 'wip-mdl-30817' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 13 Mar 2012 03:36:37 +0000 (16:36 +1300)]
MDL-29745 Fixed white space
Sam Hemelryk [Tue, 13 Mar 2012 03:35:15 +0000 (16:35 +1300)]
Merge branch 'scorm_graph_report' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Tue, 13 Mar 2012 03:26:42 +0000 (11:26 +0800)]
Merge branch 'MDL-30867' of git://github.com/rwijaya/moodle
Mary Evans [Sat, 3 Mar 2012 17:38:49 +0000 (17:38 +0000)]
MDL-31008 themes : (base theme) reversed MDL-26712 by making dimmed objects grey and added new rule for dimmed activity label text to give 50% transparancy instead
Aparup Banerjee [Tue, 13 Mar 2012 02:14:58 +0000 (10:14 +0800)]
MDL-31910 Quiz : fixed whitespace
M Kassaei [Fri, 9 Mar 2012 17:45:14 +0000 (17:45 +0000)]
MDL-31910 Quiz : Error on Manual Grading report
Aparup Banerjee [Tue, 13 Mar 2012 02:00:33 +0000 (10:00 +0800)]
Merge branch 'MDL-31935_search_restore_link' of git://github.com/davosmith/moodle
Ankit Agarwal [Tue, 13 Mar 2012 01:28:34 +0000 (09:28 +0800)]
MDL-22895 scorm: Fixed up issues with graph report
Sam Hemelryk [Tue, 13 Mar 2012 01:10:00 +0000 (14:10 +1300)]
Merge branch 'MDL-31808-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 13 Mar 2012 01:04:44 +0000 (14:04 +1300)]
Merge branch 'MDL-31917-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 13 Mar 2012 01:00:41 +0000 (14:00 +1300)]
Merge branch 'MDL-31919-master-2' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 23:15:59 +0000 (00:15 +0100)]
Merge branch 'w11_MDL-31985_m23_lobsizes' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 12 Mar 2012 23:00:08 +0000 (12:00 +1300)]
Merge branch 'w11_MDL-27457_m23_enrolnorecover' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 12 Mar 2012 22:55:54 +0000 (11:55 +1300)]
Merge branch 'MDL-30298_master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 22:16:27 +0000 (23:16 +0100)]
Merge branch 'w11_MDL-31899_m23_mysqlcolumns' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 12 Mar 2012 21:34:03 +0000 (10:34 +1300)]
Merge branch 'MDL-31702' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 12 Mar 2012 21:10:36 +0000 (10:10 +1300)]
Merge branch 'MDL-31362_unused_constant' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 20:36:36 +0000 (21:36 +0100)]
Merge branch 'w11_MDL-31956_m23_paypal' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 18:34:29 +0000 (19:34 +0100)]
MDL-31805 html2text - change tests acordingly with the new version
With the new version in place, both <th> and <a> contents are
being handled by the conversion. Accomodate existing tests to
that change.
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 19:18:09 +0000 (20:18 +0100)]
Merge branch 'MDL-31979-master' of git://github.com/micaherne/moodle
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 17:04:55 +0000 (18:04 +0100)]
Merge branch 'w11_MDL-31805_m23_html2text' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 17:00:23 +0000 (18:00 +0100)]
Merge branch 'w11_MDL-31595_m23_enrolme' of git://github.com/skodak/moodle
Petr Skoda [Mon, 12 Mar 2012 16:18:55 +0000 (17:18 +0100)]
MDL-31805 migrate html2text tests from web lib to new location
Note: the handling of <p> seems to have changed, it does double newlines only between paragraphs now (this makes sense to me).
Petr Skoda [Mon, 12 Mar 2012 15:47:28 +0000 (16:47 +0100)]
MDL-31595 improve enrol link comments
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 15:33:27 +0000 (16:33 +0100)]
Merge branch 'w11_MDL-31815_m23_confirmemail' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 14:49:04 +0000 (15:49 +0100)]
Merge branch 'w11_MDL-31534_m23_pageinitroot' of git://github.com/skodak/moodle
Petr Skoda [Mon, 12 Mar 2012 12:58:01 +0000 (13:58 +0100)]
MDL-31534 init PAGE before require_login()
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 12:38:30 +0000 (13:38 +0100)]
Merge branch 'w11_MDL-31494_m23_adodblink' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 11:47:56 +0000 (12:47 +0100)]
Merge branch 'w11_MDL-29514_m23_enum' of git://github.com/skodak/moodle
Mary Evans [Mon, 12 Mar 2012 10:37:35 +0000 (10:37 +0000)]
MDL-30298 report_progress: adds outer wrapper with class no-overflow to report table so as to enable horizontal scroll bar
Michael Aherne [Fri, 9 Mar 2012 16:14:07 +0000 (16:14 +0000)]
MDL-31979 Typo in config-dist.php
Ankit Agarwal [Thu, 19 Jan 2012 08:54:40 +0000 (14:24 +0530)]
MDL-30995 Completion Fixedup some more PHP DOC issues
Sam Hemelryk [Fri, 6 Jan 2012 05:04:01 +0000 (18:04 +1300)]
MDL-30995 completion: Fixed up PHPdocs for activity completion
Ankit Kumar Agarwal [Fri, 7 Oct 2011 05:20:14 +0000 (10:50 +0530)]
MDL-29745 SCORM Introducing new Graphs report for scorm module
Sam Hemelryk [Mon, 12 Mar 2012 04:29:39 +0000 (17:29 +1300)]
Merge branch 'master_MDL-31888' of git://github.com/danmarsden/moodle
Conflicts:
mod/scorm/styles.css
Sam Hemelryk [Mon, 12 Mar 2012 04:20:37 +0000 (17:20 +1300)]
MDL-27304 mod_wiki: Fixed up phpdocs for globals
Sam Hemelryk [Mon, 12 Mar 2012 04:20:01 +0000 (17:20 +1300)]
Merge branch 'MDL-27304-master' of https://github.com/mackensen/moodle
Charles Fulton [Fri, 17 Feb 2012 21:19:25 +0000 (13:19 -0800)]
MDL-31664 fix invalid boolean to string comparison
Sam Hemelryk [Mon, 12 Mar 2012 03:36:29 +0000 (16:36 +1300)]
MDL-27212 Fixed up whitespace after integration
Marina Glancy [Wed, 7 Mar 2012 03:41:21 +0000 (11:41 +0800)]
MDL-31929: Repositories wikimedia and youtube lack paging
repositories wikimedia and youtube:
- save last search in
- process parameter 'page'
- remove buttons 'Refresh', 'Search' and 'Logout' since they don't have meaning
filepicker:
- allow unknown number of pages (['pages'] = -1), show one 'Next' page after the current (both JS and non-JS modes)
repository wikimedia:
- add non-AJAX search form to make it work with JS disabled
Marina Glancy [Wed, 7 Mar 2012 03:25:18 +0000 (11:25 +0800)]
MDL-31838: Allow caching static responses from repositories in file picker
Sam Hemelryk [Mon, 12 Mar 2012 03:28:16 +0000 (16:28 +1300)]
Merge branch 'MDL-27212-master' of git://github.com/ankitagarwal/moodle
Rajesh Taneja [Fri, 9 Mar 2012 06:15:02 +0000 (14:15 +0800)]
MDL-28972 formslib: orignalvalue is considered and checkboxes are updated depending on orignalvalue of controller
Rajesh Taneja [Tue, 6 Mar 2012 04:06:59 +0000 (12:06 +0800)]
MDL-28972 formslib: Checkbox controller will use yui to select and unselect checkboxes
Sam Hemelryk [Mon, 12 Mar 2012 02:19:20 +0000 (15:19 +1300)]
Merge branch 'MDL-28998-master' of git://github.com/ankitagarwal/moodle
Rajesh Taneja [Fri, 9 Mar 2012 08:52:52 +0000 (16:52 +0800)]
MDL-27862 Themes: Device name first letter is capital and font is made similar to theme name font
Rajesh Taneja [Wed, 7 Mar 2012 03:45:45 +0000 (11:45 +0800)]
MDL-27862 Themes: clear theme cache button will redirect to the page on which it was pressed
Rajesh Taneja [Wed, 7 Mar 2012 03:33:12 +0000 (11:33 +0800)]
MDL-27862 Themes: replaced disabled use theme button with unset theme button
Rajesh Taneja [Fri, 24 Feb 2012 04:06:13 +0000 (12:06 +0800)]
MDL-27862 Themes: Added button to un-select theme for devices, except default device