Commit graph

14320 commits

Author SHA1 Message Date
Dan Poltawski
d0068cd007 MDL-31859 - fix trailing whitespace 2012-09-26 14:36:59 +08:00
Dan Poltawski
ac994d5a8a Merge branch 'MDL-31859' of git://github.com/Lightwork-Marking/moodle 2012-09-26 14:16:55 +08:00
Dan Poltawski
50a6106409 MDL-15471 install.xml fixup spacing 2012-09-26 12:06:20 +08:00
Dan Poltawski
bb14cc2d23 Merge branch 'wip-MDL-15471' of https://github.com/jennymgray/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-09-26 12:04:41 +08:00
Sam Hemelryk
4aede312e7 Merge branch 'wip-MDL-35276-master' of git://github.com/marinaglancy/moodle 2012-09-26 15:50:56 +12:00
Marina Glancy
923451c59f MDL-35276 fix redirect to course/section pages 2012-09-26 10:51:28 +08:00
Sam Hemelryk
d998c1a440 Merge branch 'MDL-31976-master' of git://github.com/FMCorz/moodle 2012-09-26 08:20:53 +12:00
Andrew Robert Nicols
2b42518aa7 MDL-34328 Correct usage of e.drop when catching missed drag/drop events 2012-09-25 09:27:31 +01:00
Paul Nicholls
1e78b3e66f MDL-34328: block dragdrop - disallow dragging from show/hide and dock icons
Tell the YUI drag/drop delegate that the show/hide and dock icons are not valid drag handles.  Otherwise, a drag can be initiated by showing or hiding a block (probably not from docking one, but better safe than sorry).  Not strictly related to MDL-34328, but likely to be encountered whilst testing - and closely related to another patch for MDL-34328.

Note that the "invalid" config option for the delegate takes a string - not an array - but can have multiple selectors separated by commas.
2012-09-25 09:27:31 +01:00
Paul Nicholls
6cc43fedbb MDL-34328: block dragdrop - performance rewrite
Use YUI's DragDrop delegates for block dragdrop - one per block region - rather than initialising a Drag object for each individual block.
2012-09-25 09:27:31 +01:00
Dan Poltawski
415af656b2 Merge branch 'wip-MDL-35415-master' of git://github.com/marinaglancy/moodle 2012-09-25 14:48:44 +08:00
Marina Glancy
b874d5c6b4 MDL-35415 completely remove add activity in settings (MDL-22732) 2012-09-25 14:42:25 +08:00
Dan Poltawski
6d0d5b848b Merge branch 'w39_MDL-35506_m24_pgerrorrollback' of git://github.com/skodak/moodle 2012-09-25 14:34:33 +08:00
Eloy Lafuente (stronk7)
ede30adcf9 Merge branch 'w39_MDL-35515_m24_yui371' of git://github.com/skodak/moodle 2012-09-25 00:07:35 +02:00
Sam Hemelryk
52ebfade63 Merge branch 'MDL-34607-master' of git://github.com/FMCorz/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-09-25 09:51:28 +12:00
Dan Poltawski
e00c210f55 Merge branch 'wip-MDL-32184-master' of http://github.com/phalacee/moodle 2012-09-24 15:36:10 +08:00
Dan Poltawski
7647ed4645 Merge branch 'MDL-26940-master' of git://github.com/FMCorz/moodle 2012-09-24 15:32:18 +08:00
Frederic Massart
1d2173afde MDL-31499 Javascript: Handle invalid window names in openpopup 2012-09-24 15:23:51 +08:00
Jason Fowler
0a5181a0df MDL-32184 - Course - Fixing incorrect redirect when toggling course edit while inside an activity -- Patch provided by Kanika Goyal 2012-09-24 15:04:55 +08:00
Dan Poltawski
6a02c4c916 Merge branch 'w39_MDL-35561_m24_tinymce357' of git://github.com/skodak/moodle 2012-09-24 11:57:19 +08:00
Sam Hemelryk
b39e6f59d6 Merge branch 'MDL-35312-master' of git://github.com/FMCorz/moodle 2012-09-24 15:54:04 +12:00
Dan Poltawski
078929f40c Merge branch 'MDL-35442-master' of git://git.luns.net.uk/moodle 2012-09-24 11:19:34 +08:00
Sam Hemelryk
d324d74e39 Merge branch 'MDL-30901_master' of git://github.com/dmonllao/moodle 2012-09-24 15:15:05 +12:00
Sam Hemelryk
8ea8461b3f Merge branch 'MDL-33431' of git://github.com/netspotau/moodle-mod_assign 2012-09-24 14:53:43 +12:00
Nadav Kavalerchik
1b04d0f918 MDL-35246 - Invert all action arrows in Question Bank categories management, when in RTL mode 2012-09-22 21:42:12 +03:00
Nadav Kavalerchik
9fe40de660 MDL-35481 - Invert "search option" listbox "open" arrow, when in RTL mode (page: manual user course registration ) and Personal Blog page 2012-09-22 21:05:14 +03:00
Petr Škoda
dbafb80490 MDL-35561 import latest TinyMCE 3.5.7
The previous version 3.5.6 was incorrectly stored as 3.6.0, sorry.
2012-09-21 11:34:33 +02:00
Petr Škoda
8005d4eedf MDL-35506 add pgsql workaround for automatic transaction rollback on any SQL error 2012-09-21 10:52:53 +02:00
Frederic Massart
aad982aa24 MDL-31976 Accessbility: Action icons on course page do not need title attributes 2012-09-21 11:31:19 +08:00
Frederic Massart
0f764c023e MDL-34607 Folder: Remove any sort order during upgrade 2012-09-21 10:09:54 +08:00
Frederic Massart
db232bb0f4 MDL-34607 File API: Natural sort on area tree files 2012-09-21 10:08:46 +08:00
Frederic Massart
afe27edce6 MDL-35312 Web Services: Fixed typo in capability of course update 2012-09-21 09:59:02 +08:00
David Monllao
d11f12f646 MDL-30901 user Removing user->screenreader setting 2012-09-21 09:23:32 +08:00
David Monllao
13cd661f1b MDL-30901 report_progress Removing screenreader setting usage and adding a title attribute for screen readers 2012-09-21 09:22:21 +08:00
Paul Charsley
b6b6c7acb6 MDL-31859 added get_enrolled_users_with_capability web service function 2012-09-21 09:37:06 +12:00
Petr Škoda
ee70cee844 MDL-35506 test if error in transaction forces rollback 2012-09-20 10:29:12 +02:00
Petr Škoda
414e82b1df MDL-35515 import latest and greatest YUI 3.7.1 2012-09-20 10:23:31 +02:00
Jenny Gray
7dd764b856 MDL-15471 course tagging improvements 2012-09-20 09:12:11 +01:00
Marina Glancy
7b444a96ec MDL-35001 added unit test for function convert_to_array() 2012-09-20 15:37:25 +08:00
Marina Glancy
9367fd911d MDL-35001 removed cycle detection from convert_to_array because it causes error in data 2012-09-20 15:37:25 +08:00
Damyon Wiese
f9e6212700 MDL-35375: Ensure the assignment grading table is always sorted by at least one unique column 2012-09-19 12:56:51 +08:00
Eloy Lafuente (stronk7)
5ceded2869 Merge branch 'w38_MDL-35465_m24_cohortscleanup' of git://github.com/skodak/moodle 2012-09-18 16:55:42 +02:00
Ruslan Kabalin
888ce02a82 MDL-35442 Add settings and uninstall link for local plugins 2012-09-18 09:41:26 +01:00
Dan Poltawski
7783373b99 Merge branch 'MDL-30909-master' of git://github.com/FMCorz/moodle 2012-09-18 15:07:49 +08:00
Dan Poltawski
d4c893c490 Merge branch 'wip-MDL-30912-master' of git://github.com/abgreeve/moodle 2012-09-18 12:00:40 +08:00
Eloy Lafuente (stronk7)
742b6984fc Merge branch 'w38_MDL-35129_m24_dbmigration' of git://github.com/skodak/moodle 2012-09-18 01:12:17 +02:00
Eloy Lafuente (stronk7)
5df0b25806 Merge branch 'MDL-35344-updates' of git://github.com/mudrd8mz/moodle 2012-09-17 18:02:46 +02:00
Petr Škoda
94c9db5493 MDL-35479 document unit test debugging() changes 2012-09-17 13:00:36 +02:00
Petr Škoda
a3b6e311b8 MDL-35479 some more debugging assert cleanup 2012-09-17 12:06:24 +02:00
Petr Škoda
060bb94d81 MDL-35479 fix zip packer tests to use debugging asserts 2012-09-17 12:00:02 +02:00