Commit graph

61711 commits

Author SHA1 Message Date
AMOS bot
9693f49387 Automatically generated installer lang files 2013-05-16 00:41:17 +00:00
Mary Evans
67202e2f27 MDL-39697 theme_bootstrapbase: Updated $THEME->layouts in config.php to match those in Base theme. 2013-05-16 01:06:26 +01: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
AMOS bot
45b0d9e191 Automatically generated installer lang files 2013-05-15 00:39:20 +00: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 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
Jerome Mouneyrac
ca11d39029 MDL-31209 web service error message: Indication about the service not containg the web service function is confusing 2013-05-14 15:40:16 +08: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
Rajesh Taneja
75fd791d87 MDL-39639 Formslib: Hide calendar for datetime element on disable event 2013-05-14 11:59:05 +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
David Monllao
ca96789d77 MDL-39489 behat: Updating to 2.6 moodlehq/behat-extension tag 2013-05-14 10:13:38 +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
Kordan
8fbe204b86 MDL-39629 theme_formal_white: added support for new admin_setting_configstoredfile setting element 2013-05-13 14:20:44 +02: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
0f387618cd MDL-39640 repository: Prevent notice when editing an instance 2013-05-13 17:27:42 +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
Damyon Wiese
6693089b90 MDL-39573 theme: bootstrap - always show pre and post regions when editing 2013-05-13 14:55:29 +08:00
Sam Hemelryk
84bf8a3971 MDL-39526 cache: purged when upgrade finished 2013-05-13 14:51:26 +08:00
Mary Evans
0d57b4cbf2 MDL-39595 theme_bootstrapbase: Renamed renderers/core.php to renderers/core_renderer.php 2013-05-13 14:51:26 +08:00
Damyon Wiese
2c59e0ffaa Merge branch 'MDL-39581_master' of https://github.com/markn86/moodle 2013-05-13 14:05:30 +08:00
Damyon Wiese
509c81cf07 Merge branch 'MDL-39606-master-int' of git://github.com/FMCorz/moodle 2013-05-13 13:43:07 +08:00
Damyon Wiese
03d839c270 Merge branch 'MDL-39609-master-int' of git://github.com/FMCorz/moodle 2013-05-13 13:28:27 +08:00
Damyon Wiese
d9ffe3f945 Merge branch 'MDL-39611-master-int' of git://github.com/FMCorz/moodle 2013-05-13 13:22:32 +08:00
Damyon Wiese
8b4c865543 Merge branch 'wip-MDL-39526-m25-p2' of git://github.com/samhemelryk/moodle 2013-05-13 11:59:29 +08:00
Sam Hemelryk
55848bc3f6 Merge branch 'MDL-39595_master' of git://github.com/lazydaisy/moodle 2013-05-13 15:40:17 +12:00
Jason Fowler
bfb1c6d4d2 MDL-39608 - Bootstrap - Chaning the thresholds and width values for the Form labels 2013-05-13 10:23:51 +08:00
Frederic Massart
7d1904de1d MDL-39606 question: Fix missing setType warnings 2013-05-13 09:08:05 +08:00