58139 Commits

Author SHA1 Message Date
Petr Škoda
fba0abdc22 MDL-29996 remove legacy_filter support 2012-12-30 12:44:43 +01:00
Petr Škoda
d8e74f5be7 MDL-29996 remove unnecessary signed tricks 2012-12-30 12:44:42 +01:00
Eloy Lafuente (stronk7)
9da506c2a3 weekly on-sync release 2.5dev 2012-12-30 01:07:00 +01:00
Dan Poltawski
b20d65f271 Merge branch 'MDL-37037-master' of git://github.com/damyon/moodle 2012-12-24 12:23:03 +08:00
Dan Poltawski
5066f30bed Merge branch 'w51_MDL-37233_m25_skype' of git://github.com/skodak/moodle 2012-12-24 11:34:40 +08:00
Dan Poltawski
33950c3039 Merge branch 'wip-MDL-37263-m25' of git://github.com/samhemelryk/moodle 2012-12-24 11:22:43 +08:00
Dan Poltawski
1b5c5e5788 Merge branch 'wip-MDL-37290-m25' of git://github.com/samhemelryk/moodle 2012-12-24 10:54:51 +08:00
Dan Poltawski
51feee1f64 Merge branch 'w51_MDL-37283_m25_spell' of git://github.com/skodak/moodle 2012-12-24 10:35:33 +08:00
Sam Hemelryk
3330e65354 MDL-37290 course: fixed up navbar when editing categories 2012-12-24 13:05:56 +13:00
Sam Hemelryk
eaf750cd9a Merge branch 'wip-MDL-35833-master' of git://github.com/phalacee/moodle 2012-12-24 11:43:59 +13:00
Sam Hemelryk
bef123d608 Merge branch 'MDL-36966-master' of git://github.com/damyon/moodle 2012-12-24 11:16:26 +13:00
Sam Hemelryk
486c53f25c Merge branch 'wip-mdl-37015' of git://github.com/rajeshtaneja/moodle 2012-12-24 10:55:31 +13:00
Sam Hemelryk
296064bb9a Merge branch 'wip-MDL-35653-master' of git://github.com/abgreeve/moodle 2012-12-24 09:40:55 +13:00
Sam Hemelryk
fe0980f846 Merge branch 'master_MDL-37225_static_cache_purge' of git://github.com/brki/moodle 2012-12-24 09:34:46 +13:00
Sam Hemelryk
d1a73b2add Merge branch 'MDL-36455_master' of git://github.com/markn86/moodle 2012-12-24 09:30:35 +13:00
Petr Škoda
48d2e1117f MDL-37283 import tinymce spellchecker 2.0.6.1 2012-12-22 16:44:55 +01:00
Petr Škoda
d2fec87baf MDL-37233 do not show skype status icon on https sites
Funny that the same company that implemented the IE security warnings is unable to set up SSL on the Skype status server…
2012-12-21 17:26:36 +01:00
Sam Hemelryk
9966db51f0 MDL-37263 cache: fixed event invalidation coding error 2012-12-21 10:50:07 +13:00
Eloy Lafuente (stronk7)
0dc5a532ec weekly on-sync release 2.5dev 2012-12-20 21:13:26 +01:00
Eloy Lafuente (stronk7)
29400ba5d6 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2012-12-20 20:56:58 +01:00
Eloy Lafuente (stronk7)
92bdda9bd9 Merge branch 'w50_MDL-37171_m25_outdatedexcel' of git://github.com/skodak/moodle 2012-12-20 10:22:46 +01:00
Jason Fowler
d01176bfc9 MDL-35833 - Blocks - Adding alt and title attributes to the docked-block panel close button 2012-12-20 10:42:20 +08:00
Rajesh Taneja
e5ad278a94 MDL-37015 Resource: link in onclick should not contain html special char 2012-12-20 10:21:36 +08:00
Dan Poltawski
b93e0af3fe Revert "MDL-36704: wrap pending conditions in span tags"
This reverts commit 5e9fd83df8f2c175681fa5a81d36df5ee313cb1e.
2012-12-20 08:45:04 +08:00
AMOS bot
15da42c874 Automatically generated installer lang files 2012-12-20 00:40:36 +00:00
Tim Hunt
9645fe83ff MDL-32245 question bank: update URL after moving question between categories.
Also, improve the URL when you go to edit the questions in a category.
2012-12-20 12:12:22 +13:00
Petr Škoda
cdd651a676 MDL-37171 fix some more E_STRICT issues
Credit goes to Mark Nelson, thanks.
2012-12-19 09:54:53 +01:00
Adrian Greeve
9daabc71ea MDL-35653 - mod/wiki: Force format now lets users edit wiki pages.
Thanks to Tõnis Tartes for part of this solution.

When force format was selected in the options, trying to view the
wiki would redirect to the front page with a message saying that
you do not have permission to edit this page. Students had no way
of viewing any entries or creating the first page.

When in force format it skips a page , which would be considered
uncessary for students, but this means that the group id is not set
and this is what is causing most of the problems.

I also have included a check to see if the title is default and whether
the user has permission to view all groups. In these situations the
intermediate page is displayed.
2012-12-19 08:47:26 +08:00
AMOS bot
864f08b4d9 Automatically generated installer lang files 2012-12-19 00:41:59 +00:00
Brian King
6e89fb0309 MDL-37225 reset cachstore_static store when purging 2012-12-18 23:57:22 +01:00
Eloy Lafuente (stronk7)
917169221f Merge branch 'w50_MDL-36245_m25_convert' of git://github.com/skodak/moodle 2012-12-18 23:41:48 +01:00
Eloy Lafuente (stronk7)
421d18fd2e Merge branch 'wip-MDL-36339-master' of git://github.com/marinaglancy/moodle 2012-12-18 21:36:42 +01:00
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
Mark Nelson
bfe20414c0 MDL-36455 blocks: removed ability to add blocks to the My Moodle page that did not make sense in that context 2012-12-18 11:32:35 +08:00
Damyon Wiese
afa3e637a4 MDL-37037 Assignment Some minor refactoring of the previous patch
This just makes the control flow a bit easier to read.

I also added a continue button to take you back to the grading page.
2012-12-18 09:19:23 +08:00
Dan Poltawski
3280819b20 Merge branch 'MDL-30899_master' of git://github.com/dmonllao/moodle 2012-12-18 09:10:42 +08:00
Michael Aherne
5c77835865 MDL-37037 assign Show message if no files to download 2012-12-18 08:54:10 +08:00
AMOS bot
ecc6fc7e2d Automatically generated installer lang files 2012-12-18 00:45:13 +00: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
Raymond Wijaya
f81dc1222d MDL-36966 Assignment: Bug - Student submission appears graded by themselves.
Fix a bug when a student editing his submission after it has been graded, it changes the 'graded by' details to the student's name in the feeback summary
2012-12-18 08:39:31 +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