58099 Commits

Author SHA1 Message Date
Dan Poltawski
86575fa709 Merge branch 'MDL-36704-master' of git://github.com/sammarshallou/moodle 2012-12-18 14:57:43 +08:00
Dan Poltawski
033b07895c Merge branch 'MDL-37014_webdav_folders' of git://github.com/davosmith/moodle 2012-12-18 14:52:27 +08:00
Dan Poltawski
22898af76f MDL-36259 - change case of table alias to match definition 2012-12-18 14:27:46 +08:00
Dan Poltawski
3ab43c0502 Merge branch 'MDL-36259' of git://github.com/timhunt/moodle 2012-12-18 14:25:52 +08:00
Dan Poltawski
3280819b20 Merge branch 'MDL-30899_master' of git://github.com/dmonllao/moodle 2012-12-18 09:10:42 +08:00
Damyon Wiese
64220210de MDL-35740 Assignment: Change the assignment index page to use a renderer.
This also cleans up the patch to prevent students from seeing the number of submissions for the assignment.
2012-12-18 08:44:53 +08:00
Raymond Wijaya
0c631fbef6 MDL-35740 Assignment: Hide the number of assignment submissions for all students that was visible to all students through the activities block 2012-12-18 08:44:53 +08:00
Eloy Lafuente (stronk7)
cbef51f54b Merge branch 'MDL-36842' of git://github.com/timhunt/moodle 2012-12-18 00:17:51 +01:00
Eloy Lafuente (stronk7)
7039c823dc Merge branch 'w50_MDL-37171_m25_outdatedexcel' of git://github.com/skodak/moodle 2012-12-18 00:13:45 +01:00
Sam Hemelryk
9674194eec Merge branch 'w50_MDL-36475_m25_zindexesgrrr' of git://github.com/skodak/moodle 2012-12-18 10:43:00 +13:00
Sam Hemelryk
2ea5e39ea3 Merge branch 'MDL-36490_master' of git://github.com/lazydaisy/moodle 2012-12-18 10:40:46 +13:00
Sam Hemelryk
03765b2e9d Merge branch 'MDL-37035' of git://github.com/adrianfish/moodle 2012-12-18 10:32:10 +13:00
Sam Hemelryk
d135b55323 Merge branch 'w50_MDL-37111_m25_forumsinglefirst' of git://github.com/skodak/moodle 2012-12-18 10:24:53 +13:00
Sam Hemelryk
a483113178 Merge branch 'MDL-37176' of git://github.com/stronk7/moodle 2012-12-18 10:12:37 +13:00
Sam Hemelryk
bdd7b01a33 Merge branch 'MDL-35530' of git://github.com/rwijaya/moodle 2012-12-18 10:07:28 +13:00
Jason Fowler
c8d1e4aa8c MDL-35056 - Backup/Restore - Converting the 'Unmet Dependencies' Message to be a Developer Debug message to make moodle less confusing to the average user 2012-12-18 09:58:53 +13:00
Sam Hemelryk
46b553787c Merge branch 'MDL-32245' of git://github.com/timhunt/moodle 2012-12-18 09:51:42 +13:00
Sam Hemelryk
ac546d63a3 MDL-36812 grader_report: Fixed whitespace on integration 2012-12-18 09:47:37 +13:00
Sam Hemelryk
a202ead124 Merge branch 'WIP-MDL-36812-master' of git://github.com/nadavkav/moodle 2012-12-18 09:46:35 +13:00
Sam Hemelryk
740f635b79 Merge branch 'MDL-29733_master' of git://github.com/andyjdavis/moodle 2012-12-18 09:42:26 +13:00
Tim Hunt
4475b0ff63 MDL-36842 quiz: update accessrule upgrade.txt file in master. 2012-12-17 17:02:21 +00:00
Adrian Fish
2a457227e2 MDL-37035 Pass user locale after course locale. 2012-12-17 10:25:38 +00:00
David Monllao
9e8961e76f MDL-30899 moodle-enrol-notification Overridding default footer padding 2012-12-17 15:39:19 +08:00
Dan Poltawski
62347c883b Merge branch 'w50_MDL-36493_m25_mysql' of git://github.com/skodak/moodle 2012-12-17 15:28:39 +08:00
Dan Poltawski
0b10485a03 Merge branch 'MDL-37114' of git://github.com/timhunt/moodle 2012-12-17 15:25:22 +08:00
Dan Poltawski
f136e27f15 Merge branch 'MDL-37034-CategoryNavigationKey' of https://github.com/iamandrew/moodle 2012-12-17 15:21:31 +08:00
Dan Poltawski
a03b106cc2 MDL-36597 - bump version number 2012-12-17 13:52:22 +08:00
Dan Poltawski
dfa45f7ddc Merge branch 'w50_MDL-36597_m25_courselang' of git://github.com/skodak/moodle 2012-12-17 13:51:32 +08:00
Dan Poltawski
efda4a8340 Merge branch 'MDL-29334_master' of git://github.com/markn86/moodle 2012-12-17 13:47:44 +08:00
Dan Poltawski
8ca70aff14 Merge branch 'wip-mdl-36736' of git://github.com/rajeshtaneja/moodle 2012-12-17 12:08:57 +08:00
Dan Poltawski
9199e53de2 Merge branch 'wip-MDL-25928-m25' of git://github.com/samhemelryk/moodle 2012-12-17 12:05:05 +08:00
Dan Poltawski
bfcbbc9833 Merge branch 'wip-MDL-35874-master' of git://github.com/phalacee/moodle 2012-12-17 11:52:55 +08:00
Dan Poltawski
00a9fa5d9a Merge branch 'wip-MDL-35979-master' of git://github.com/phalacee/moodle 2012-12-17 11:48:32 +08:00
Dan Poltawski
06ae410844 Merge branch 'MDL-37078-master' of git://github.com/sammarshallou/moodle 2012-12-17 11:36:57 +08:00
Dan Poltawski
a8103b1c07 Merge branch 'MDL-37165-master' of git://github.com/damyon/moodle 2012-12-17 11:30:27 +08:00
Sam Hemelryk
6a1273cbc7 MDL-25928 course: Fixed course info on the combo list to be a popup 2012-12-17 16:03:06 +13:00
Petr Škoda
75427a824c MDL-37171 fix multiple spreadsheet related PHP4isms 2012-12-15 12:36:40 +01:00
Petr Škoda
83be0dfd57 MDL-36475 tweak zIndexes once more
The expected ranges are now:
* 0-1000 for normal code
* 5000-5999 for TinyMCE
* 7000-8999 for filepicker and filemanager

This patch fixes also incorrect location of "MDL-25736 - French spellchecker fixes." modification reminder.
2012-12-15 11:46:46 +01:00
Joseph Rezeau
26efb4888f MDL-37114 quiz form validation: feedback boundaries.
The feedback boundaries must either be a number or a percentage.
We were not correctly validating the non-percentage case.
2012-12-15 10:44:51 +00:00
Thanh Le
31f4086460 MDL-36259 course short names: ensure it displays when enabled in admin
Fixed 5 Moodle pages that does not display the course short name even if "Display extended course names" setting is on.  In fixing this, search.php also included related minor code to change to minimise DB calls to improve performance.
2012-12-15 10:44:34 +00:00
Petr Škoda
57160c25d7 MDL-36493 improve timeout handling in mysql upgrade
Credit goes to Mark Nielsen, thanks.
2012-12-15 11:43:52 +01:00
Petr Škoda
801ae0f4d8 MDL-36493 improve performance of mysql unsigned/lob upgrade 2012-12-15 11:43:52 +01:00
Tim Hunt
e4ca11842b MDL-32245 question bank: fix coding style in categories.php 2012-12-15 10:41:00 +00:00
Thanh Le
87bee3bcfa MDL-32245 question bank: fix moving categories between contexts. 2012-12-15 10:40:59 +00:00
Petr Škoda
a11aa38e80 MDL-37111 copy first post files in single type forum using intro options
This patch also removed the delete button from the first post in single
discussion type forum.

Edit button in the first post leads to the forum edit page now, this should
prevent other problems throwing first post and intro out of sync.
2012-12-15 11:23:42 +01:00
Petr Škoda
dbfe415028 MDL-36597 strip '_utf8' from all course.lang fields 2012-12-15 11:13:10 +01:00
Eloy Lafuente (stronk7)
c50c84bbae MDL-37176 timezones: updated to 2012j 2012-12-14 20:06:56 +01:00
Eloy Lafuente (stronk7)
20751863e3 weekly on-sync release 2.5dev 2012-12-14 13:33:07 +01:00
Damyon Wiese
0c7b691035 MDL-37165 Assignment: Oracle fix for count_submissions_with_status (and friends).
Oracle does not like the use of AS after a join.
2012-12-14 15:10:06 +08:00
Eloy Lafuente (stronk7)
04e56da75f Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle 2012-12-13 10:31:59 +01:00