Commit graph

14059 commits

Author SHA1 Message Date
Sam Hemelryk
55f8a9c766 Merge branch 'MDL-36609_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE 2012-11-26 14:57:57 +13:00
Dan Poltawski
bbeafdbed1 Merge branch 'w47_MDL-36547_m23_sectiongen' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-11-21 15:34:22 +08:00
Dan Poltawski
c41d292bce Merge branch 'MDL-35675-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-11-21 12:02:58 +08:00
Dan Poltawski
728b702f4e Merge branch 'MDL-36022-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE 2012-11-20 16:04:19 +08:00
Dan Poltawski
a91c6103f3 Merge branch 'MDL-30731-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-11-20 15:31:38 +08:00
Dan Poltawski
0299d83bc0 Merge branch 'MDL-36646_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-11-20 15:12:00 +08:00
Frederic Massart
ac247b4e84 MDL-30731 calendar: Fixed display of images in event descriptions 2012-11-20 14:59:23 +08:00
Dan Poltawski
e81c1ad987 Merge branch 'MDL-30871-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-11-20 11:47:26 +08:00
Mark Nelson
302808a37f MDL-36609 javascript: ensure HTML element exists before attempting to perform JS functionality 2012-11-19 15:43:12 +08:00
Petr Škoda
2ded89d564 MDL-36547 fix section handling in precreate_course_module() 2012-11-17 09:06:12 +01:00
Petr Škoda
996db2f7ac MDL-36547 add test for section number when generating modules 2012-11-17 09:06:11 +01:00
Frederic Massart
0b674ddb42 MDL-26660 libraries: Improved XML validation before parsing 2012-11-16 12:14:04 +08:00
Tim Hunt
877b243fed MDL-36646 unit tests should not assume number of contexts. 2012-11-15 14:36:32 +00:00
Dan Poltawski
153f5eb3c7 MDL-36061 - remove master-only unit tests 2012-11-15 15:19:28 +08:00
Dan Poltawski
f73a131980 Merge branch 'MDL-36061_userid_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE 2012-11-15 14:32:59 +08:00
Andrew Davis
168a941104 MDL-36061 core_grade: added some unit tests related to refresh_grades() 2012-11-15 11:19:34 +08:00
Matt Switlik
76ab64b07e MDL-36061 gradebook: grade_item->refresh_grades doesn't propagate $userid 2012-11-15 11:19:20 +08:00
Dan Poltawski
83ee1d4a43 Merge branch 'MDL-26660-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-11-14 10:33:54 +08:00
Aparup Banerjee
b459897d8f MDL-24736 anotating tinymce changes to readme 2012-11-14 09:41:34 +08:00
Aparup Banerjee
4093331bad Merge branch 'wip_23_mdl-25736_tinymce_spellchecker_frech_issues' of https://github.com/iarenaza/moodle into MOODLE_23_STABLE 2012-11-14 09:13:30 +08:00
Dan Poltawski
5ac25e0ccb MDL-30545 messaging - remove DISTINCT from union statement 2012-11-13 22:35:35 +08:00
Dan Poltawski
675ea3231c MDL-30545 - messagelib: use $DB->sql_concat() 2012-11-13 15:09:14 +08:00
Dan Poltawski
1f5205b344 MDL-30545 tests - use mod_assignment data generator
mod_assign doens't exist yet..!
2012-11-13 14:13:37 +08:00
Petr Škoda
95f6a022ca MDL-30545/ MDL-36199 reset plugin manager singletons 2012-11-13 14:08:28 +08:00
Dan Poltawski
3517201801 Merge branch 'MDL-30545_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-11-13 13:22:47 +08:00
Iñaki Arenaza
6cd89c8fd2 MDL-25736 TinyMce Spellchecker French issues
GoogleSpell checker already returns data un UTF8, so there's no need
to use utf8_encode (in fact, using it completely mangles the string).

All credit goes to David Quintal for finding the issue and proposing
the fix.
2012-11-10 20:02:03 +01:00
Mark Nelson
d8e550e4ac MDL-33791 Portfolio: Fixed security issue with passing file paths. 2012-11-08 00:26:40 +01:00
Dan Poltawski
e4224a5ae1 Merge branch 'MDL-36346_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE 2012-11-07 09:27:53 +08:00
Paul Nicholls
c4851e8085 MDL-36346 - YUI2 SWF vulnerability, part 2 2012-11-07 14:09:20 +13:00
Andrew Davis
84fad57f1c MDL-35762 core_grade: altered the code that determines whether an activity is visible on the user report 2012-11-06 16:42:00 +01:00
Dan Poltawski
cb2829dea3 Merge branch 'MDL-36346_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE 2012-11-06 16:20:14 +08:00
David Mudrák
77283f1812 MDL-36266 Improve update notification message subject 2012-11-06 11:59:48 +08:00
Paul Nicholls
c43e6006e7 MDL-36346 - YUI2 SWF vulnerability 2012-11-06 14:55:48 +13:00
Dan Poltawski
aafded3f42 Merge branch 'MDL-36023-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE 2012-11-06 09:36:08 +08:00
Frederic Massart
9e5fea4d2d MDL-35675 forms: Remove constrain to viewport for popup calendar 2012-11-05 16:43:22 +08:00
Didier Raboud
0e892b8b65 MDL-35675 forms: Popup calendar is not constrained any more 2012-11-05 16:43:22 +08:00
Dan Poltawski
906ad7d27a Merge branch 'MDL-33621_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE 2012-11-05 11:12:41 +08:00
Dan Poltawski
0d79d96566 Merge branch 'w42_MDL-35469_m23_geckover' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-11-02 12:07:16 +08:00
Andrew Robert Nicols
1438358686 MDL-36022 AJAX Remove shim on chooser dialogues 2012-10-31 16:39:36 +00:00
Dan Poltawski
881d1d8aed Merge branch 'MDL-28235-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-10-31 13:42:23 +08:00
Frederic Massart
9740e053f2 MDL-28235 form: Removed reference to unexisting close button in help popup 2012-10-31 13:00:12 +08:00
Frederic Massart
b27daf9e73 MDL-28235 form: Removed close icon of help icon popups 2012-10-31 13:00:08 +08:00
Frederic Massart
d0d6d5fc72 MDL-28235 form: Help button popup close accessibility improved
AMOS BEGIN
 CPY [close,editor],[close,form]
AMOS END
2012-10-31 13:00:08 +08:00
Sam Hemelryk
3b6796e0f4 Merge branch 'MDL-28235-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-10-30 17:36:45 +13:00
Frederic Massart
440dec9c27 MDL-30871 enrol: Flat file does not fail when notifications are enabled 2012-10-30 11:03:44 +08:00
Dan Poltawski
c64d22325e Merge branch 'MDL-36015_23' of git://git.catalyst.net.nz/moodle-r2 into MOODLE_23_STABLE 2012-10-30 10:19:26 +08:00
Frederic Massart
1dfcc6eade MDL-26660 libraries: Do not try to parse non-valid XML 2012-10-30 09:23:40 +08:00
Sam Hemelryk
3b5513528e Merge branch 'MDL-36103_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-10-30 12:51:44 +13:00
Dan Poltawski
6b0ada1e6e Merge branch 'm23_MDL-35215' of git://github.com/totara/moodle into MOODLE_23_STABLE 2012-10-29 15:33:53 +08:00
Dan Poltawski
9416bcf43d Merge branch 'wip-MDL-36075_MOODLE_23_STABLE' of git://github.com/jason-platts/moodle into MOODLE_23_STABLE 2012-10-29 14:57:24 +08:00