Sam Hemelryk
9dae5179cb
Merge branch 'w27_MDL-22404_m22_cohortbulk' of git://github.com/skodak/moodle
2011-07-11 15:40:12 +08:00
Petr Skoda
56284322ea
MDL-22404 bulk user add to cohort
2011-07-11 09:20:45 +02:00
Sam Hemelryk
c430467ca8
Merge branch 'MDL-28195' of git://github.com/timhunt/moodle
2011-07-11 15:02:03 +08:00
Sam Hemelryk
48ae99cbaf
Merge branch 'w27_MDL-28273_m22_cohortremove' of git://github.com/skodak/moodle
2011-07-11 14:50:56 +08:00
Sam Hemelryk
3bbc7a0fc5
Merge branch 'w27_MDL-28278_m22_cohorticons' of git://github.com/skodak/moodle
2011-07-11 14:18:54 +08:00
Sam Hemelryk
42afcc172a
Merge branch 'wip-MDL-27429-master' of git://github.com/Beedell/moodle
2011-07-11 13:54:49 +08:00
Sam Hemelryk
c9d0d33174
Merge branch 'MDL-28268' of git://github.com/timhunt/moodle
2011-07-11 13:25:44 +08:00
Sam Hemelryk
ed21851b3c
Merge branch 'MDL-28192' of git://github.com/timhunt/moodle
2011-07-11 13:17:52 +08:00
Sam Hemelryk
7a5c6b98e1
Merge branch 'master_MDL-27947' of git://github.com/danmarsden/moodle
2011-07-11 11:31:13 +08:00
Sam Hemelryk
08d29fb18d
Merge branch 'MDL-27890_master' of git://github.com/stronk7/moodle
2011-07-11 11:25:21 +08:00
Sam Hemelryk
f7776c0fc8
Merge branch 'glossary_multilang_master' of git://github.com/stronk7/moodle
2011-07-11 11:14:44 +08:00
Sam Hemelryk
c75d584dcc
Merge branch 'mod_url_decode_master' of git://github.com/stronk7/moodle
2011-07-11 11:02:41 +08:00
Sam Hemelryk
8b6c283f94
Merge branch 'backup_groups_master' of git://github.com/stronk7/moodle
2011-07-11 10:53:38 +08:00
Eloy Lafuente (stronk7)
b86f930647
MDL-28048 glossary - fix double ampersand & missing string
2011-07-11 01:36:30 +02:00
Eloy Lafuente (stronk7)
bce3e3dca5
MDL-28048 glossary - add multilang support to categories
2011-07-11 01:02:06 +02:00
Eloy Lafuente (stronk7)
438606fca3
MDL-28156 restore - fix some notices restoring empty courses
2011-07-10 13:13:23 +02:00
Petr Skoda
9aa14ff4b2
MDL-28278 use icons in cohort UI
2011-07-10 10:03:42 +02:00
Eloy Lafuente (stronk7)
c8fbcaab1d
MDL-28156 restore - support restoring files without grade items
2011-07-10 00:52:45 +02:00
Eloy Lafuente (stronk7)
f70676a782
MDL-27438 backup - on course backups add course gropus and groupings
2011-07-09 19:27:23 +02:00
Petr Skoda
5121a95da2
MDL-28273 waring that removing user from cohorts may unenrol from courses
2011-07-09 16:23:36 +02:00
Eloy Lafuente (stronk7)
aef91ddfa7
MDL-27018 restore - decode links missing url->externalurl support
2011-07-09 13:33:50 +02:00
Jamie Pratt
da8cd9f4b3
MDL-28268 Missing ORDER BY when using extra answer table.
...
From OU bug #921 "Order of answer fields in Variable numeric keeps changing" Cannot
reproduce this bug on my system but hopefully this will fix the problem. I added
an ORDER BY clause to the sql for fetching answers with extra answer fields.
2011-07-09 07:26:08 +01:00
Dan Marsden
c5803aaa7f
MDL-27947 - fix TOC display on skipview - use correct org in TOC title
2011-07-09 11:40:32 +12:00
John Beedell
7cf83f47cc
MDL-27429 Adding tabindex and on keypress to the blocks show/hide icon.
2011-07-08 10:56:17 +01:00
Eloy Lafuente (stronk7)
f6f6138379
weekly release 2.2dev
2011-07-08 11:15:49 +02:00
Eloy Lafuente (stronk7)
7e1fa4f019
fix permissions
2011-07-08 11:13:19 +02:00
Eloy Lafuente (stronk7)
1f767468ac
Merge branch 'MDL-28015-workshop-sql' of git://github.com/mudrd8mz/moodle
2011-07-08 01:11:13 +02:00
Eloy Lafuente (stronk7)
4b02f9d2e9
Merge branch 'MDL-28168-custommenu' of git://github.com/mudrd8mz/moodle
2011-07-08 00:41:19 +02:00
Tim Hunt
0f83538e7e
MDL-27890 tinymce - enable 30 as min height within moodle
2011-07-07 20:01:20 +02:00
Eloy Lafuente (stronk7)
d614e55c69
MDL-NOBUG tinymce - updated instructions to cover local modifications and other minor changes
2011-07-07 18:23:01 +02:00
Eloy Lafuente (stronk7)
1fa6eab70b
MDL-27890 tinymce - allow it to be smaller
2011-07-07 17:38:44 +02:00
David Mudrak
20e7fd839a
MDL-28015 workshop - fixed unique list of columns in ORDER BY clause
...
MSSQL requires that the columns in the ORDER BY clause list must be
unique. The patch populates the list of fields by combining an array of
explicit sort definition with an array of implicit (default) sort
definition.
2011-07-07 15:17:27 +02:00
Tim Hunt
d0cfa81312
MDL-28192 local_qeupgradehelper fix typo.
2011-07-07 11:25:39 +01:00
David Mudrak
4564d58f9e
MDL-28168 Multi-language support for custom_menu reimplemented
...
This is a reimplementation of the multi-language support for the
custom_menu class. The menu items now accept the forth optional
parameter with the explicit list of languages the item is valid for. If
no languages are listed, the item is valid for any language. The caller
of the custom_menu constructor must provide the user's current language
or null if the multi-language should not be supported (all items are
valid for any language then, regardless the definition).
See the attached unit tests for the examples of usage.
2011-07-07 11:30:04 +02:00
David Mudrak
155fffe6a4
MDL-28168 Improved custom_menu constructor
...
This improves custom_menu constructor by dropping support for useless
$text parameter and replacing it with the menu definition. This makes
custom_menu instance independent on the place where the menu is defined
($CFG->custommenuitems) and can be unit-tested. Also, multiple instances
of custom_menu can be instantiated now which can be interesting in the
future.
2011-07-07 11:30:03 +02:00
David Mudrak
153a13226e
MDL-28168 Revert "MDL-27073 Support multi-language content in custom menu"
...
This reverts commit 87e0230d0a
.
2011-07-07 11:30:03 +02:00
Sun Zhigang
858d100fa3
MDL-27833 Backup - Fix can't search courses with non-latin characters during importing
...
PARAM_ALPHANUMEXT filter out all non-latin characters, including
Chinese, Japanese and etc. Use PARAM_NOTAGS instead.
2011-07-07 10:39:47 +02:00
Eloy Lafuente (stronk7)
26635fd7f9
Merge branch 'MDL-28169' of git://github.com/nebgor/moodle
2011-07-07 10:21:32 +02:00
Eloy Lafuente (stronk7)
d9aa768139
Merge branch 'w26_MDL-28163_m22_customfront' of git://github.com/skodak/moodle
2011-07-07 10:11:17 +02:00
Aparup Banerjee
c5a8abfedd
MDL-28169 Installation Added 2.1 upgrade (idiot proof) lines to upgrade scripts.
2011-07-07 11:40:38 +08:00
Eloy Lafuente (stronk7)
907cc4ceb7
Merge branch 'master_MDL-28110' of git://github.com/danmarsden/moodle
2011-07-07 03:00:42 +02:00
Eloy Lafuente (stronk7)
627e4bd4a7
Merge branch 'master_MDL-28111' of git://github.com/danmarsden/moodle
2011-07-07 02:36:28 +02:00
Eloy Lafuente (stronk7)
6eb2cf62bd
MDL-27989 whitespace fix
2011-07-07 02:21:44 +02:00
Eloy Lafuente (stronk7)
5b77684af7
Merge branch 'MDL-27989_master' of git://github.com/kordan/moodle
2011-07-07 02:19:15 +02:00
Eloy Lafuente (stronk7)
dfef3028ae
Merge branch 'MDL-26285' of git://git.luns.net.uk/moodle
2011-07-07 02:10:13 +02:00
Eloy Lafuente (stronk7)
25e2bb1b83
Merge branch 'w26_MDL-27375_m22_enrolcase' of git://github.com/skodak/moodle
2011-07-07 01:39:38 +02:00
Eloy Lafuente (stronk7)
535a635afc
Merge branch 'w26_MDL-28117_m22_dataurlhack' of git://github.com/skodak/moodle
2011-07-07 01:32:30 +02:00
Eloy Lafuente (stronk7)
482b1ea121
Merge branch 'MDL-27329' of git://git.luns.net.uk/moodle
2011-07-07 00:24:19 +02:00
Eloy Lafuente (stronk7)
4357214a49
Merge branch 'MDL-28100' of git://git.luns.net.uk/moodle
2011-07-07 00:12:19 +02:00
Eloy Lafuente (stronk7)
b274bc55d0
Merge branch 'MDL-27279' of git://git.luns.net.uk/moodle
2011-07-07 00:01:08 +02:00