Commit graph

56894 commits

Author SHA1 Message Date
Dan Poltawski
556f228a9e Merge branch 'MDL-36897_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-12-11 13:54:23 +08:00
Dan Poltawski
a2f2dbb5dc Merge branch 'w49_MDL-36685_m23_tablecells' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-12-11 13:44:01 +08:00
Dan Poltawski
f55f2e48ca Merge branch 'MDL-34791-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE 2012-12-11 13:23:08 +08:00
Dan Poltawski
1c570f9096 Merge branch 'MDL-36808-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE 2012-12-11 12:19:46 +08:00
Petr Škoda
1d2b58b5dd MDL-36983 fix incorrect test method name
Credit goes to David Scotson, thanks.
2012-12-11 12:10:43 +08:00
Dan Poltawski
a2577a7cc3 Merge branch 'w49_MDL-36892_m23_enrolreadme' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-12-11 12:07:22 +08:00
Dan Poltawski
957dfed5f2 Merge branch 'MDL-36845_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-12-11 11:58:54 +08:00
Aparup Banerjee
4e66b8908c Merge branch 'w49_MDL-36817_m23_composer' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-12-11 11:54:53 +08:00
Dan Poltawski
f95ba651fc Merge branch 'MDL-36828_23' of https://github.com/aolley/moodle into MOODLE_23_STABLE 2012-12-11 11:44:40 +08:00
Dan Poltawski
10c8b7390c Merge branch 'wip-MDL-36110-s23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE 2012-12-11 11:33:22 +08:00
Dan Poltawski
5d1dff532e Merge branch 'wip-MDL-35884-s23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE 2012-12-11 11:17:43 +08:00
Jason Fowler
2874baa411 MDL-35884 - Course - Fixing bad whitespace/character return 2012-12-11 11:12:17 +08:00
Jason Fowler
4885064053 MDL-35884 - Course - Remove text from ALT attribute for activity chooser 2012-12-11 11:11:49 +08:00
Sam Hemelryk
39a36d7d7b Merge branch 'MDL-36650_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-12-11 16:11:08 +13:00
Dan Poltawski
3f358a021b Merge branch 'MDL-36025-negative-zero-MOODLE_23_STABLE' of git://github.com/mpetrowi/moodle into MOODLE_23_STABLE 2012-12-11 11:07:43 +08:00
Sam Hemelryk
b54470f497 Merge branch 'w49_MDL-36731_m23_uploadestrict' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-12-11 16:04:13 +13:00
Sam Hemelryk
237ea8768c Merge branch 'MDL-36905_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE 2012-12-11 15:44:32 +13:00
Dan Poltawski
b2fa6cfa93 Merge branch 'MDL-34052-23' of https://github.com/damyon/moodle into MOODLE_23_STABLE 2012-12-11 10:39:42 +08:00
Dan Poltawski
8f647f1d3a Merge branch 'w49_MDL-31424_m23_paypalcase' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-12-11 10:31:44 +08:00
Sam Hemelryk
2e6538382a Merge branch 'MDL-36942_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-12-11 15:04:17 +13:00
Sam Hemelryk
b74804c8a8 Merge branch 'MDL-36954_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-12-11 14:59:50 +13:00
Dan Poltawski
14802ee558 Merge branch 'MDL-36773-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE 2012-12-11 09:56:47 +08:00
Petr Škoda
702ac0ce02 MDL-37061 always validate lang when setting session user
This should resolve problems with TinyMCE langs and some unknown MUCH caching issue.
2012-12-11 14:44:41 +13:00
Andrew Davis
72754427b6 MDL-36321 core_message: made the course participants list correctly show if course participants are contacts or not 2012-12-11 08:55:25 +08:00
Petr Škoda
f6ca5cf303 MDL-29442 add missing utf-8 to entity html encoding and decoding 2012-12-11 10:23:12 +13:00
Sam Hemelryk
3c805e592c Merge branch 'MDL-36263-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE 2012-12-11 10:10:07 +13:00
Sam Hemelryk
f1cf05cbbe Merge branch 'MDL-36601-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE 2012-12-11 09:41:49 +13:00
Sam Hemelryk
667dfa5e7c Merge branch 'MDL-36805-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE 2012-12-11 09:14:59 +13:00
Iñaki Arenaza
c31d0566d7 MDL-37088 auth_ldap: bad operator in ldap sync_user() method 2012-12-10 16:48:14 +01:00
Andrew Robert Nicols
53e1e390f3 MDL-34791 AJAX Update a graded activity's title in the gradebook on rename 2012-12-10 14:15:27 +00:00
Andrew Robert Nicols
8fdecaa51a MDL-36805 Correct docs for workshop_grade_item_update in mod_workshop
The documentation suggested that the modname field should be present on the
$workshop parameter when this is not required. It is not used in any point
in the function and the $workshop variable is never passed to another
function which may use it.
2012-12-10 12:27:30 +00:00
Dan Poltawski
1423ab3709 Merge branch 'w49_MDL-36737_m23_glossstrict' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-12-10 19:37:41 +08:00
Vadim Dvorovenko
4dcae0d897 MDL-32639 files: Removing '0' start folder in archives created with filemanager
Signed-off-by: Vadim Dvorovenko <vadimon@mail.ru>
2012-12-10 18:10:58 +08:00
Dan Poltawski
ae4e512f66 Merge branch 'MDL-36167-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE 2012-12-10 17:32:30 +08:00
Dan Poltawski
b0473b9bf0 Merge branch 'MDL-36732_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-12-10 15:18:24 +08:00
Dan Poltawski
8bd7536090 Merge branch 'MDL-36742_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-12-10 14:41:48 +08:00
Dan Poltawski
870d2fff8e Merge branch 'MDL-36549_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE 2012-12-10 14:19:10 +08:00
Dan Poltawski
66586db224 Merge branch 'MDL-36835-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE 2012-12-10 14:02:24 +08:00
Dan Poltawski
d4d6cce500 Merge branch 'MDL-36538_webdav_memory_23' of git://github.com/davosmith/moodle into MOODLE_23_STABLE 2012-12-10 13:13:11 +08:00
Dan Poltawski
6078f84d9f Merge branch 'w49_MDL-35456_m23_paypal' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-12-10 12:03:33 +08:00
Dan Poltawski
8ffe246d69 Merge branch 'MDL-35404_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-12-10 11:36:49 +08:00
Sam Hemelryk
a9269beb9c Merge branch 'MDL-30961-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE 2012-12-10 14:59:31 +13:00
Dan Poltawski
1197b6163a Merge branch 'MDL-36680_hidden_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE 2012-12-10 09:57:10 +08:00
Sam Hemelryk
e4a2de510c Merge branch 'MDL-34592_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE 2012-12-10 14:28:24 +13:00
Sam Hemelryk
15e9d4c64a Merge branch 'MDL-36608_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE 2012-12-10 14:24:10 +13:00
Sam Hemelryk
b35e30e5bc Merge branch 'MDL-36978_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE 2012-12-10 14:21:08 +13:00
Mark Nielsen
ccca91bd9e MDL-36579: Adding missing fields in mod/lti backup 2012-12-10 14:16:36 +13:00
Sam Hemelryk
1f0e0ab503 Merge branch 'MDL-36607_dndBlocks' of https://github.com/moodlerooms/moodle into MOODLE_23_STABLE 2012-12-10 14:12:24 +13:00
Mary Evans
564b28731c MDL-34592 theme_magazine: Fixes the report grader fixed column misalignment in magazine/style/core.css theme, plus fixes all CORE themes with minor adjustment to grade/report/grader/style.css 2012-12-10 00:06:03 +00:00
Sam Hemelryk
2353df33a7 Merge branch 'MDL-36433' of git://github.com/itamart/moodle into MOODLE_23_STABLE 2012-12-10 12:13:10 +13:00