Damyon Wiese
425a634b58
MDL-37527 Assignment - Change query for print_overview so it uses an index (postgres)
...
Reported by Mark Neilsen.
2013-01-16 13:20:27 +08:00
Dan Poltawski
7acc743f06
Merge branch 'MDL-36553' of git://github.com/rwijaya/moodle
2013-01-16 13:19:36 +08:00
Dan Poltawski
222f608433
Merge branch 'wip-MDL-36968-int' of git://github.com/marinaglancy/moodle
2013-01-16 13:16:40 +08:00
Rossiani Wijaya
b3e02098a4
MDL-36553: Admin settings: remove border attribute from HTML settings table
2013-01-16 13:15:40 +08:00
Marina Glancy
a3f66bdeac
MDL-36968 Move function print_recent_activity() to the block recent_activity
2013-01-16 16:13:04 +11:00
Dan Poltawski
0883d08fd0
Merge branch 'w02_MDL-37187_m25_flatfile' of git://github.com/skodak/moodle
2013-01-16 11:53:00 +08:00
Dan Poltawski
50ac16b8d0
Merge branch 'MDL-31484_anonymous_user_clash' of git://github.com/davosmith/moodle
2013-01-16 11:45:22 +08:00
Dan Poltawski
856df69f3d
Merge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle
2013-01-16 11:39:03 +08:00
Frederic Massart
212dac2724
MDL-36708 files: Fixed missing key in array
2013-01-16 11:28:14 +08:00
Dan Poltawski
0f94289c1d
Merge branch 'MDL-33688_dndupload_progress' of git://github.com/davosmith/moodle
...
Conflicts:
files/renderer.php
lib/outputrenderers.php
2013-01-16 11:18:18 +08:00
Dan Poltawski
47ee9f9100
Merge branch 'w02_MDL-35899_m25_cohortsort' of git://github.com/skodak/moodle
2013-01-16 11:09:21 +08:00
Dan Poltawski
cb598688a8
Merge branch 'w02_MDL-37175_m25_paypalmanage' of git://github.com/skodak/moodle
2013-01-16 10:54:55 +08:00
Dan Poltawski
82420bbb91
Merge branch 'w02_MDL-37184_m25_editenrol' of git://github.com/skodak/moodle
2013-01-16 10:19:57 +08:00
Dan Poltawski
a201b57657
Merge branch 'MDL-36412-master' of git://github.com/sammarshallou/moodle
2013-01-16 09:54:26 +08:00
Rajesh Taneja
3ac4ad0050
MDL-37339 Administration: Unique custom profile should not be checked if it's empty.
...
Currently we have two options for custom profile fields 'Unique' and 'Required'
If value s not entered for unique and not required field then we should allow
duplicate empty values. If value is entered then we should check for unique input.
In case field is unique and required then it should be always checked as required
field can't be empty.
2013-01-16 09:44:32 +08:00
Eloy Lafuente (stronk7)
3431860f54
Merge branch 'w02_MDL-36988_m25_switchrole' of git://github.com/skodak/moodle
2013-01-16 02:27:48 +01:00
Sam Hemelryk
759a302454
MDL-37536 cache: fixed typo
2013-01-16 14:22:58 +13:00
Eloy Lafuente (stronk7)
0c198a1b59
Merge branch 'w02_MDL-37429_m25_zippacker' of git://github.com/skodak/moodle
...
Conflicts:
lib/upgrade.txt
2013-01-16 02:22:26 +01:00
Eloy Lafuente (stronk7)
06d78e8209
Merge branch 'MDL-36257-master' of git://git.luns.net.uk/moodle
2013-01-16 02:05:27 +01:00
Eloy Lafuente (stronk7)
becb4de707
Merge branch 'w02_MDL-37019_m25_metadef' of git://github.com/skodak/moodle
2013-01-16 01:58:08 +01:00
AMOS bot
e62c59c8c3
Automatically generated installer lang files
2013-01-16 00:43:42 +00:00
Eloy Lafuente (stronk7)
a932fa439f
MDL-35775 Whitespace fix.
2013-01-16 01:30:19 +01:00
Eloy Lafuente (stronk7)
91d5e08aa3
Merge branch 'MDL-35775-master' of git://github.com/micaherne/moodle
2013-01-16 01:28:53 +01:00
Eloy Lafuente (stronk7)
a91350609e
Merge branch 'wip-MDL-34344-m25' of git://github.com/samhemelryk/moodle
...
Conflicts:
lib/db/caches.php
2013-01-16 01:08:26 +01:00
Sam Hemelryk
3909faf45a
MDL-23504 admin: fixed whitespace issue
2013-01-16 12:00:37 +13:00
Sam Hemelryk
e265716f69
Merge branch 'wip-mdl-23504' of git://github.com/rajeshtaneja/moodle
2013-01-16 11:06:39 +13:00
Sam Hemelryk
ec16ef1f85
Merge branch 'wip-MDL-35818-master' of git://github.com/phalacee/moodle
2013-01-16 11:03:39 +13:00
Sam Hemelryk
00ba185d52
Merge branch 'wip-MDL-36967-master' of git://github.com/marinaglancy/moodle
...
Conflicts:
lib/deprecatedlib.php
2013-01-16 11:01:16 +13:00
Eloy Lafuente (stronk7)
d9b9d22fa1
Merge branch 'MDL-37173-m' of git://github.com/andrewnicols/moodle
2013-01-15 21:56:13 +01:00
Eloy Lafuente (stronk7)
493d8f781c
Merge branch 'MDL-37354-master' of git://github.com/mouneyrac/moodle
...
Conflicts:
message/tests/externallib_test.php
2013-01-15 21:50:31 +01:00
Eloy Lafuente (stronk7)
563bcc2322
Merge branch 'MDL-31726' of git://github.com/colchambers/moodle
2013-01-15 21:44:38 +01:00
Petr Škoda
aae028d9e3
MDL-36988 cleanup role switching
...
This patch uses local URLs in parameters because it is more compatible
with various security hacks. Session key is not added automatically to
return url for safety reasons - we do not want to execute some random
action again. POST pages are now returned to course page too.
2013-01-15 21:44:20 +01:00
Petr Škoda
59e7cc03d7
MDL-37184 document new general enrolment editing page
2013-01-15 21:29:10 +01:00
Petr Škoda
3cb856c744
MDL-37429 document zip packer improvements
2013-01-15 20:45:36 +01:00
Eloy Lafuente (stronk7)
ee5c647e84
Merge branch 'MDL-31616' of git://github.com/timhunt/moodle
2013-01-15 20:14:03 +01:00
Eloy Lafuente (stronk7)
dcb21e6cc1
Merge branch 'wip-mdl-37062' of git://github.com/rajeshtaneja/moodle
2013-01-15 20:04:21 +01:00
Eloy Lafuente (stronk7)
fcdc9b7717
NOBUG: 1 more whitespace, was hurting my eyes all the time.
2013-01-15 19:20:17 +01:00
Eloy Lafuente (stronk7)
3af9d77c1d
MDL-33117 Whitespace fixes
2013-01-15 19:09:57 +01:00
Andrew Robert Nicols
d7d68b03ee
MDL-37426 Fix JSHint issues for moodle-core-formchangechecker
2013-01-15 17:34:04 +00:00
Eloy Lafuente (stronk7)
0943a0ce11
Merge branch 'MDL-34883_unit_tests' of git://github.com/andyjdavis/moodle
2013-01-15 18:21:12 +01:00
Eloy Lafuente (stronk7)
ceda80962c
Merge branch 'MDL-37395-master' of git://github.com/sammarshallou/moodle
2013-01-15 18:17:12 +01:00
Eloy Lafuente (stronk7)
62a9604677
Merge branch 'MDL-36553' of git://github.com/rwijaya/moodle
2013-01-15 18:12:20 +01:00
Eloy Lafuente (stronk7)
ada893d339
Merge branch 'MDL-36554' of git://github.com/rwijaya/moodle
2013-01-15 18:02:26 +01:00
Eloy Lafuente (stronk7)
dfcb38a1c7
Merge branch 'wip-MDL-37207-master' of git://github.com/marinaglancy/moodle
2013-01-15 18:00:17 +01:00
Ben Johnson
7536464d61
MDL-36421 SCORM: fix SCORM course format new window popups
2013-01-15 21:42:56 +13:00
Dan Poltawski
a9081ce630
MDL-37313 question: fix trailing whitespace
2013-01-15 16:36:14 +08:00
Dan Poltawski
12576d356a
Merge branch 'MDL-37313' of git://github.com/jmvedrine/moodle
2013-01-15 16:35:17 +08:00
Dan Poltawski
2773aa41de
Merge branch 'MDL-30070-master' of git://github.com/FMCorz/moodle
2013-01-15 16:04:57 +08:00
Frederic Massart
d6731600c8
MDL-30070 message: Web Services for contact list
2013-01-15 16:04:00 +08:00
Rossiani Wijaya
c316c3944e
MDL-35817 Login: set page focus to error message for login error
2013-01-15 15:45:15 +08:00