61351 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
c9e54743ec MDL-39753 Add 2.5.0 upgrade line 2013-05-20 15:33:19 +02:00
Dan Poltawski
ef78682e44 Merge branch 'w18_MDL-39374_m26_folderlog' of git://github.com/skodak/moodle 2013-05-20 17:58:09 +08:00
Damyon Wiese
b346553fda Merge branch 'MDL-38498-master' of git://github.com/FMCorz/moodle 2013-05-20 16:11:59 +08:00
Dan Poltawski
9e95723c60 Merge branch 'MDL-39719-master' of git://github.com/FMCorz/moodle 2013-05-20 16:08:51 +08:00
Frederic Massart
29ebdddd22 MDL-38498 repository: Unit tests for repository::check_capability() 2013-05-20 15:57:01 +08:00
Dan Poltawski
d6aec96dd5 Merge branch 'MDL-27748' of git://github.com/timhunt/moodle 2013-05-20 15:46:49 +08:00
Dan Poltawski
7ae324cb35 Merge branch 'MDL-39728' of git://github.com/timhunt/moodle 2013-05-20 15:28:31 +08:00
Dan Poltawski
b04bfcfc54 Merge branch 'wip-MDL-36020-master' of git://github.com/troylee/moodle 2013-05-20 12:42:17 +08:00
Damyon Wiese
e872912d1c Merge branch 'MDL-39363-master' of git://github.com/ankitagarwal/moodle 2013-05-20 12:12:23 +08:00
Damyon Wiese
e8dc568b12 Merge branch 'MDL-39528_master' of git://github.com/dmonllao/moodle 2013-05-20 12:03:36 +08:00
Dan Poltawski
2f75633c6f Merge branch 'MDL-39630_master' of git://github.com/lazydaisy/moodle 2013-05-20 12:01:01 +08:00
Dan Poltawski
02f92b2d86 Merge branch 'MDL-39198_master' of git://github.com/kordan/moodle 2013-05-20 11:47:50 +08:00
Dan Poltawski
22c8aeb018 Merge branch 'MDL-38369-master' of git://github.com/FMCorz/moodle 2013-05-20 10:25:08 +08:00
Frederic Massart
4cc4ca963c MDL-39719 course: Pointing to wrong category string in requests 2013-05-20 09:15:08 +08:00
Tim Hunt
0a5aa9c610 MDL-27748 question: grade options should be localised.
question_bank::fraction_options should use format_float to display
decimal pionts correctly.
2013-05-19 23:39:23 +01:00
Tim Hunt
d4a666029d MDL-39728 List all the classes in question/type/questionbase.php
This should make it easier for people to understand the type hierarchy.
2013-05-18 09:16:05 +01:00
Damyon Wiese
2d1ad229da Merge branch 'MDL-28250-25' of git://github.com/danpoltawski/moodle
Conflicts:
	version.php
2013-05-17 11:36:09 +08:00
Damyon Wiese
6fadab94f0 Merge branch 'w18_MDL-39678_m26_yui' of git://github.com/skodak/moodle 2013-05-16 15:53:48 +08:00
David Monllao
870349ee67 MDL-39528 behat: Avoid modal window suite failure
Catching JS alerts/confirms exceptions and
auto-accepting them before each test run to
avoid chained scenarios failures.
2013-05-16 10:11:40 +08:00
Petr Škoda
b046b96a88 MDL-39678 fix YUI 20130515 vulnerability 2013-05-15 21:57:23 +02:00
Petr Škoda
d6c60a7d16 MDL-39374 log only real folder edits
Credit goes to Florian Zillner, thanks.
2013-05-15 21:34:03 +02:00
Dan Poltawski
82198dec8b MDL-28250 license: upgrade old versions of cc-nc
The url was incorectly defined in previous versions
2013-05-15 11:22:13 +01:00
Wojciech Galiszek
8243f3ebb5 MDL-28250 license: Correct cc-nc url 2013-05-15 10:45:36 +01:00
Eloy Lafuente (stronk7)
5e1bdaca7a NOBUG: Adjust backup release for 2.6dev 2013-05-14 12:07:02 +02:00
Eloy Lafuente (stronk7)
e2637d1da3 weekly release 2.6dev 2013-05-14 11:32:14 +02:00
Eloy Lafuente (stronk7)
b222cfb79b Moodle release 2.5 v2.5.0 2013-05-14 11:27:22 +02:00
Eloy Lafuente (stronk7)
ff291e488d Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-05-14 11:18:14 +02:00
Damyon Wiese
5a378479a0 Merge branch 'MDL-39664' of git://github.com/nebgor/moodle 2013-05-14 15:25:46 +08:00
Damyon Wiese
a9dcf2db60 Merge branch 'MDL-39641-master-int' of git://github.com/FMCorz/moodle 2013-05-14 15:08:25 +08:00
Aparup Banerjee
4cf0c17d18 MDL-39664 fixed up is_array test (reverting the whole line basically prior to MDL-39664 changes) 2013-05-14 15:02:24 +08:00
Damyon Wiese
d458718f59 Merge branch 'MDL-39191_master' of git://github.com/kordan/moodle 2013-05-14 14:16:05 +08:00
Damyon Wiese
c938b909ba Merge branch 'MDL-39664' of git://github.com/nebgor/moodle 2013-05-14 13:33:25 +08:00
Aparup Banerjee
c713414319 MDL-39664 added http redirect limitation to 5. rephrased certificate use in message log. 2013-05-14 13:23:14 +08:00
Aparup Banerjee
6053036976 MDL-39664 mdeploy follows redirects now. 2013-05-14 13:14:28 +08:00
Aparup Banerjee
cb97a97794 MDL-39664 allowed mdeploy to follow redirection (http 302) and added some extra logging info 2013-05-14 11:56:05 +08:00
Troy Lee
62af3fe42b MDL-36020 overview/report: fix quiz regrade session lock 2013-05-14 10:46:13 +08:00
Frederic Massart
a8655ae728 MDL-39601 user: Missing setType in user filters 2013-05-14 09:16:46 +08:00
AMOS bot
2c2532533b Automatically generated installer lang files 2013-05-14 00:37:43 +00:00
AMOS bot
a1327196ee Merge branch 'master' into install_master 2013-05-14 00:37:41 +00:00
Sam Hemelryk
f000edba16 Merge branch 'MDL-39573-master' of git://github.com/damyon/moodle 2013-05-14 09:15:54 +12:00
Dan Poltawski
2a7a5cfa4c Merge branch 'MDL-39599-master-int' of git://github.com/FMCorz/moodle 2013-05-13 13:51:12 +01:00
Dan Poltawski
3f461e9322 Merge branch 'MDL-39579-master-int' of git://github.com/FMCorz/moodle 2013-05-13 13:09:14 +01:00
Eloy Lafuente (stronk7)
1e374df88d on demand release 2.5rc1+ 2013-05-13 12:40:21 +02:00
Eloy Lafuente (stronk7)
522b5faf60 Merge branch 'MDL-39642-en_fix' of git://github.com/mudrd8mz/moodle
Conflicts:
	lang/en/badges.php
2013-05-13 12:07:55 +02:00
Frederic Massart
989a58d0f4 MDL-38369 repository: Remove output before redirect 2013-05-13 17:33:04 +08:00
Frederic Massart
157fd8aaef MDL-39641 repository: Correct check for uniqueness of the name 2013-05-13 17:12:37 +08:00
Damyon Wiese
e1559b58e8 Merge branch 'MDL-39604-master-int' of git://github.com/FMCorz/moodle 2013-05-13 16:43:49 +08:00
Helen Foster
9f3e096899 MDL-39642 Merge English strings from the en_fix language pack 2013-05-13 09:58:43 +02:00
Damyon Wiese
826cf99fb8 Merge branch 'MDL-39189_master' of git://github.com/totara/openbadges 2013-05-13 15:10:49 +08:00
Damyon Wiese
a02e36d682 Merge branch 'MDL-39209_master' of git://github.com/totara/openbadges 2013-05-13 14:59:37 +08:00