46728 Commits

Author SHA1 Message Date
Petr Skoda
4478743ca4 MDL-26265 use cm_info in PAGE->cm because it has more useful information; add context property to cm_info 2011-02-07 23:11:43 +01:00
Petr Skoda
f2f45270ee Merge branch 'MDL-26267' of git://github.com/samhemelryk/moodle 2011-02-07 23:07:16 +01:00
Petr Skoda
81c29ae06d Merge branch 'MDL-26266' of git://github.com/samhemelryk/moodle 2011-02-07 23:05:08 +01:00
Eloy Lafuente (stronk7)
9ac8ff207c dml-sqlsrv MDL-26025 whitespace fix 2011-02-07 22:33:26 +01:00
Eloy Lafuente (stronk7)
9597afb572 Merge branch 'MDL-26025' of git://github.com/samhemelryk/moodle 2011-02-07 22:26:33 +01:00
Eloy Lafuente (stronk7)
5df4947cb8 Merge branch 'w06_MDL-26234_20_customfields' of git://github.com/skodak/moodle 2011-02-07 22:21:21 +01:00
Eloy Lafuente (stronk7)
9beb04e1d5 Merge branch 'w06_MDL-26290_20_mysqlport' of git://github.com/skodak/moodle 2011-02-07 21:56:07 +01:00
Petr Skoda
c055cebfbb Merge branch 'MDL-25780' of git://git.luns.net.uk/moodle 2011-02-07 21:49:32 +01:00
Eloy Lafuente (stronk7)
e32d5f9b88 Merge branch 'w06_MDL-26256_20_collator' of git://github.com/skodak/moodle 2011-02-07 21:41:04 +01:00
Petr Skoda
476b123a72 Merge branch 'm20_MDL-25468_coding_error' of git://github.com/dongsheng/moodle 2011-02-07 21:37:16 +01:00
Petr Skoda
8c4a6a4fe8 Merge branch 'MDL-21250-capitalized-strings' of git://github.com/mudrd8mz/moodle 2011-02-07 21:31:35 +01:00
Petr Skoda
a052bf8ba0 Merge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle 2011-02-07 21:28:20 +01:00
Eloy Lafuente (stronk7)
8fc84ff1c1 Merge branch 'w06_MDL-26219_20_upgradelog' of git://github.com/skodak/moodle 2011-02-07 20:22:29 +01:00
Petr Skoda
bb8b29715a MDL-26219 fix borked upgrade logging and add new fileversion column 2011-02-07 20:00:20 +01:00
Charles Fulton
7038944105 MDL-26299: missing break causes incorrect value for unitrole 2011-02-07 09:53:31 -08:00
Helen Foster
72d484ddb6 MDL-21250 capital letters removal 2011-02-07 15:55:18 +01:00
Eloy Lafuente (stronk7)
20ba9a2e47 Merge branch 'MDL-17357-duplicate-strings' of git://github.com/mudrd8mz/moodle 2011-02-07 15:53:15 +01:00
David Mudrak
d5b7f35d65 MDL-17357 Removed duplicate string definitions 2011-02-07 15:08:07 +01:00
Sam Hemelryk
0032523aed Merge branch 'PULL-226-workshop' of git://github.com/mudrd8mz/moodle 2011-02-07 17:58:12 +08:00
David Mudrak
32ea207a48 MDL-26298 Workshop: fixed trivial typos in phpDoc blocks 2011-02-07 10:49:34 +01:00
David Mudrak
d239b952a5 MDL-26296 Workshop: trivial change in manual allocator CSS
When only two rows of the allocations table are displayed with the new
allocation highlighted, it is better not highlight the odd row.
2011-02-07 10:49:30 +01:00
Sam Hemelryk
6ae16d7fff Merge branch 'w06_MDL-26262_20_onlineblock' of git://github.com/skodak/moodle 2011-02-07 16:31:38 +08:00
AMOS bot
a4f9369548 Automatic installer lang files (20110207) 2011-02-07 09:27:45 +01:00
Dongsheng Cai
100e0d4989 NAVIGATION MDL-25468 remove optional_param from navigationlib.php, use override_active_url to help find the correct node 2011-02-07 16:25:58 +08:00
Sam Hemelryk
9cb70adc33 Merge branch 'w06_MDL-26238_20_group' of git://github.com/skodak/moodle 2011-02-07 16:20:02 +08:00
Sam Hemelryk
9377348eb0 Merge branch 'w06_MDL-26221_20_courserole' of git://github.com/skodak/moodle 2011-02-07 16:11:50 +08:00
Sam Hemelryk
dedda4abc3 Merge branch 'MDL-26272' of git://github.com/stronk7/moodle 2011-02-07 16:03:27 +08:00
Sam Hemelryk
c1a974983a Merge branch 'MDL-26245-typo_in_exception_string' of git://github.com/mudrd8mz/moodle 2011-02-07 15:41:26 +08:00
Sam Hemelryk
82bbf32d3c Merge branch 'MDL-26252-import-groups-help' of git://github.com/mudrd8mz/moodle 2011-02-07 15:32:23 +08:00
Sam Hemelryk
d44327efd9 Merge branch 'MDL-26119_message_logging' of git://github.com/andyjdavis/moodle 2011-02-07 15:16:40 +08:00
Sam Hemelryk
89652edd6c Merge branch 'MDL-26242' of git://github.com/timhunt/moodle 2011-02-07 15:13:53 +08:00
Sam Hemelryk
449adacbc3 Merge branch 'MDL-25639' of git://git.luns.net.uk/moodle 2011-02-07 14:21:24 +08:00
Sam Hemelryk
1ca95a13f3 Merge branch 'MDL-25874' of git://git.luns.net.uk/moodle 2011-02-07 14:01:00 +08:00
Sam Hemelryk
e8d6d24729 Merge branch 'm20_MDL-25671_data_template_editor' of git://github.com/dongsheng/moodle 2011-02-07 13:50:36 +08:00
Sam Hemelryk
ed4801f4f0 Merge branch 'MDL-25939' 2011-02-07 13:40:51 +08:00
Sam Hemelryk
e896935574 MDL-25939 Fixed whitespace issues in the splash theme 2011-02-07 13:40:43 +08:00
Sam Hemelryk
2addb4ba1b mod-workshop MDL-26267 workshop_extend_navigation argument 4 is now always going to be a cm_info object 2011-02-07 13:20:09 +08:00
Sam Hemelryk
f0dcc21259 navigation MDL-26266 Refactored code to ensure when loading activities is a cm_info object 2011-02-07 12:16:13 +08:00
Sam Hemelryk
046ff94ec8 dml-sqlsrv MDL-26025 Fixed up typo in simpletests and added a couple more tests 2011-02-07 11:23:30 +08:00
Sam Hemelryk
fe1dd7ebde dml-sqlsrv MDL-26025 Removed use of property to track rownumber field in favor of always unsetting it 2011-02-07 10:46:50 +08:00
Sam Hemelryk
7e1bd89d32 sqlsrv MDL-26025 Fixed up numerous issues with the limit_to_top_n function 2011-02-07 10:33:49 +08:00
Petr Skoda
0b661c7d52 MDL-26256 detect missing collator support and use workaround instead 2011-02-06 22:27:25 +01:00
Petr Skoda
8c4b142cb2 MDL-26290 add experimental windows mysqli named pipe support 2011-02-06 22:11:28 +01:00
Petr Skoda
801dea0605 MDL-26262 fix online users block error on non-course pages 2011-02-06 22:04:44 +01:00
Petr Skoda
77f9f23b0f MDL-26290 make sure ini_get('mysqli.default_port') returns number 2011-02-06 21:21:23 +01:00
Petr Skoda
bb98eea114 MDL-26234 fix fatal user upload error when custom text area field present
Please note this does not fix problems with the actual upload of custon text area fields.
2011-02-06 20:57:21 +01:00
Charles Fulton
9250bf8172 MDL-26238 remove deprecated second parameter from groups_get_group() calls 2011-02-06 18:15:36 +01:00
Petr Skoda
8f0eb9fd7a MDL-26221 add missing course/lib.php include when using make_categories_list() 2011-02-06 17:58:47 +01:00
Eloy Lafuente (stronk7)
195a0848ec MDL-26272 ratings - fix uses breaking after last modinfo changes 2011-02-04 17:30:51 +01:00
David Mudrak
51abc39695 MDL-26188 Workshop: get rid of a method that is not used anyway
The protected method get_allocations_recordset() is a relict from
earlier development phases of Workshop module. Removing it as it
confuses recent Eloy's recordset usage detection tool.
2011-02-04 14:33:48 +01:00