Dan Poltawski
90762324f9
MDL-15471 - fix typo inappropriate
...
Thanks Sam for spotting it!
2012-09-26 12:06:27 +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
Jerome Mouneyrac
2650c2b03e
MDL-35636 login/token.php: confusing 'create user token' log appearing before 'token user request'
2012-09-26 11:47:23 +08:00
Marina Glancy
923451c59f
MDL-35276 fix redirect to course/section pages
2012-09-26 10:51:28 +08:00
Sam Hemelryk
c89613edaa
Merge branch 'MDL-34573_accessibility' of git://github.com/rwijaya/moodle
2012-09-26 10:20:13 +12:00
Sam Hemelryk
86d055360c
Merge branch 'wip-MDL-34476-master' of git://github.com/phalacee/moodle
2012-09-26 08:40:11 +12:00
Sam Hemelryk
38cdfab3ca
MDL-31976 course: Better alt for edit section icon
2012-09-26 08:23:55 +12: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
Paul Nicholls
a000ff6833
MDL-34328: course section "toolboxes" - performance rewrite
...
Use YUI event delegation to handle events in course section "toolboxes" (visibility and highlight toggles) rather than attaching event handlers to each individual button we care about. Also remove the (now unused) replace_button() function.
2012-09-25 09:27:31 +01:00
Paul Nicholls
de21fb1def
MDL-34328: course resource "toolboxes" - performance rewrite
...
Use YUI event delegation to handle events in course resource "toolboxes" (sets of editing icons) rather than attaching event handlers to each individual button we care about. Don't waste time setting the CSS cursor to what it already is, use .all() rather than replace_button() if we just need the node.
Section toolboxes could probably also be done this way to some extent, but the payoff may not be worth the effort - they're so minimal that they don't tend to cause issues.
2012-09-25 09:27:31 +01:00
Paul Nicholls
d2ce925279
MDL-34328: course dragdrop - performance rewrite
...
Use YUI's DragDrop delegates for course dragdrop, rather than initialising a Drag object for each individual section and each individual activity/resource. Also, clone a single drag handle for activities/resources, rather than repeatedly creating a whole new one with the same parameters for each activity/resource.
2012-09-25 09:27:31 +01:00
Aparup Banerjee
8d7f1b1530
MDL-34992 message : grouped message profile setting providers by component
2012-09-25 14:53:09 +08:00
Aparup Banerjee
d2ae1df1a3
MDL-34992 message : ordered the providers settings list.
2012-09-25 14:52:46 +08: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
Dan Poltawski
ac9f5e3fc7
Merge branch 'wip-MDL-32180-master' of git://github.com/phalacee/moodle
2012-09-25 14:27:39 +08:00
Dan Poltawski
03a1ef0cbc
Merge branch 'MDL-28616-master' of https://github.com/mackensen/moodle
2012-09-25 14:26:41 +08:00
Brian Jorgensen
d2b4684946
MDL-32180 calendar - added developer hint for a missing or unreadable calendar hook file
2012-09-25 14:12:32 +08:00
Dan Poltawski
32441f0c51
Merge branch 'MDL-34778_accessibility' of git://github.com/rwijaya/moodle
2012-09-25 13:43:25 +08:00
Dan Poltawski
6ff5f14a82
Merge branch 'wip-mdl-30918' of git://github.com/rajeshtaneja/moodle
2012-09-25 13:36:48 +08:00
Dan Poltawski
b53e0f53b9
Merge branch 'MDL-35252' of git://github.com/raymondAntonio/moodle
2012-09-25 13:14:37 +08:00
Dan Poltawski
7ce576e317
Merge branch 'MDL-34571_accessibility' of git://github.com/rwijaya/moodle
...
Conflicts:
report/log/lang/en/report_log.php
2012-09-25 13:04:54 +08:00
Raymond Wijaya
49b6109666
MDL-35437: mod_assign: Stop Moodle from giving out a notice when grading worksheets with missing columns are uploaded via 'Upload grading worksheet' option in the drop-down menu
2012-09-25 11:50:55 +08:00
Dan Poltawski
412d7c7b65
Merge branch 'MDL-35202' of git://github.com/netspotau/moodle-mod_assign
2012-09-25 11:42:57 +08:00
Dan Poltawski
86f564e5cc
Merge branch 'MDL-35321-master' of git://github.com/micaherne/moodle
2012-09-25 11:32:21 +08:00
Dan Poltawski
1abadbc38a
Merge branch 'WIP-MDL-35275' of git://github.com/nadavkav/moodle
2012-09-25 10:12:07 +08:00
Dan Poltawski
23e1c92db6
Merge branch 'MDL-35521' of https://github.com/raymondAntonio/moodle
2012-09-25 09:45:07 +08:00
Eloy Lafuente (stronk7)
e045b42621
Merge branch 'WIP-MDL-35576' of git://github.com/nadavkav/moodle
2012-09-25 01:16:35 +02:00
Eloy Lafuente (stronk7)
81feb36bf2
Merge branch 'WIP-MDL-35537' of git://github.com/nadavkav/moodle
2012-09-25 00:35:19 +02: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
dbffd9910d
Merge branch 'wip-MDL-35542-master' of git://github.com/marinaglancy/moodle
2012-09-24 14:36:43 +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
Sam Hemelryk
81a92474f2
Merge branch 'MDL-35517' of git://github.com/stronk7/moodle
2012-09-24 15:21:34 +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
Dan Poltawski
67d5121d9b
Merge branch 'MDL-35538' of git://github.com/stronk7/moodle
2012-09-24 11:11:16 +08:00
Dan Poltawski
6876aa7a86
Merge branch 'MDL-35242-master' of git://github.com/FMCorz/moodle
2012-09-24 11:08:07 +08:00
Sam Hemelryk
9c8299972d
Merge branch 'MDL-28071-master' of git://github.com/ankitagarwal/moodle
2012-09-24 15:06:25 +12:00