Dan Poltawski
b1ffa78675
Merge branch 'wip-MDL-34398-m25-integration' of git://github.com/samhemelryk/moodle
2013-01-17 10:36:10 +08:00
Dan Poltawski
b630c53591
Merge branch 'MDL-37374' of git://github.com/timhunt/moodle
2013-01-17 10:22:55 +08:00
Marina Glancy
cf003abc92
MDL-37085 bug fix in link for module subtypes. Thanks to Andrew Nicols
2013-01-17 14:51:25 +13:00
Sam Hemelryk
e17dbeeb1a
MDL-34398 groups: implemented caching of group information.
2013-01-17 09:24:58 +13:00
Sam Hemelryk
11fbebb029
MDL-36035 course: fixed typo in function name
2013-01-17 09:15:26 +13:00
Eloy Lafuente (stronk7)
937ad8c626
Merge branch 'MDL-37555' of git://github.com/stronk7/moodle
2013-01-16 20:52:47 +01:00
Tim Hunt
67cc80197f
MDL-31616 blocks: ensure showinsubcontexts is only 0 or 1 in the DB.
2013-01-16 19:16:09 +01:00
Eloy Lafuente (stronk7)
c6523d2f94
MDL-37555 Apply realpath() 2 CFG->phpunit_dataroot
2013-01-16 16:15:56 +01:00
Eloy Lafuente (stronk7)
460ab53860
NOBUG: mini-bump to help cache definitions.
2013-01-16 15:57:46 +01:00
Tim Hunt
a8e577debb
MDL-37374 questions: fix property_exists calls.
2013-01-16 11:13:53 +00:00
Damyon Wiese
cb5b486040
MDL-37547 Assignment: Add unit tests for mod/assign/lib.php
2013-01-16 16:36:19 +08:00
Rajesh Taneja
1a9d21dc21
MDL-32526 Course: After creating course user should be redirected to newly created course
...
After creating a new course if user has capability to enrol users then
enrol user page should be visible else user should see newly created course
2013-01-16 16:16:43 +08:00
Marina Glancy
aa2b293e8e
MDL-37207 modchoosertoggle: added checks that user can update course
2013-01-16 15:51:02 +08:00
Dan Poltawski
c5c50786f6
Merge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle
2013-01-16 14:17:40 +08:00
Marina Glancy
db82b13050
MDL-37085 changed echo to return - little bug fix
2013-01-16 17:14:51 +11:00
Dan Poltawski
ac6486e36f
Merge branch 'wip-MDL-37536-m25' of git://github.com/samhemelryk/moodle
2013-01-16 13:51:58 +08:00
Dan Poltawski
f2c87dd530
Merge branch 'MDL-37546-master' of github.com:damyon/moodle
2013-01-16 13:49:34 +08:00
Damyon Wiese
f93fdcef86
MDL-37546 Assignment fix assign_get_recent_mod_activity code cleanup regression.
2013-01-16 13:48:15 +08:00
David Monllao
3f7211f45a
MDL-37458 testing lock externalization
2013-01-16 13:43:25 +08:00
Sam Hemelryk
20a3199397
Merge branch 'wip-mdl-35873' of git://github.com/rajeshtaneja/moodle
2013-01-16 18:22:04 +13:00
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