Commit graph

61523 commits

Author SHA1 Message Date
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
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
Frederic Massart
7d1904de1d MDL-39606 question: Fix missing setType warnings 2013-05-13 09:08:05 +08:00
Sam Hemelryk
24dedb9680 MDL-39526 cache: purged when upgrade finished 2013-05-13 10:20:40 +12:00
AMOS bot
4b5cc94427 Automatically generated installer lang files 2013-05-12 00:36:56 +00:00
Mary Evans
57662549d7 MDL-39630 theme_afterburner: Improving the way course/category listings display. 2013-05-11 13:28:19 +01:00
AMOS bot
beccabce25 Automatically generated installer lang files 2013-05-11 00:38:22 +00:00
Eloy Lafuente (stronk7)
2d5303cbe7 Moodle release 2.5rc1 2013-05-10 17:29:20 +02:00
Eloy Lafuente (stronk7)
e477f1e45f fix permissions 2013-05-10 17:23:55 +02:00
Eloy Lafuente (stronk7)
3e81c83e68 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-05-10 17:17:43 +02:00
Eloy Lafuente (stronk7)
6382f49fb1 Merge branch 'MDL-39518-master' of git://github.com/damyon/moodle 2013-05-10 13:17:16 +02:00
Eloy Lafuente (stronk7)
9d5ec39453 Merge branch 'wip-MDL-39575-m25' of git://github.com/samhemelryk/moodle 2013-05-10 12:06:38 +02:00
Frederic Massart
914077b4a8 MDL-39611 url: Fix setType warnings in module settings 2013-05-10 15:49:39 +08:00
Frederic Massart
ff273b68ff MDL-39609 grade: Notice during import and calculation 2013-05-10 15:28:58 +08:00
Damyon Wiese
727b8d54e4 MDL-39518: Change hardcoded string MOOCH to Moodle.net 2013-05-10 14:38:46 +08:00
Frederic Massart
3514319719 MDL-39604 course: Reformat section edit form 2013-05-10 13:52:50 +08:00
Sam Hemelryk
1168a5f2e3 MDL-39575 install: better handling of database creation error.
Implemented better handling of DML exceptions.
Added translation for cannotcreatedb exception.
2013-05-10 17:28:39 +12:00
Sam Hemelryk
8b5647b8d7 Merge branch 'MDL-39602-master' of git://github.com/damyon/moodle 2013-05-10 16:41:15 +12:00
Sam Hemelryk
635d8bc84b Merge branch 'MDL-39488' of git://github.com/rwijaya/moodle 2013-05-10 16:23:26 +12:00
Frederic Massart
381ab8e1a3 MDL-39599 course: Fix setType warning in conditional access 2013-05-10 12:17:01 +08:00
Frederic Massart
188c04b0a8 MDL-39579 form: Type can be set on repeated elements in a group 2013-05-10 12:05:43 +08:00
Damyon Wiese
969eaa3eca MDL-39602 cache: Move the includes for default stores
Putting them inside the function get_default_stores ensures
that they will be included from anywhere that calls get_default_stores.
2013-05-10 11:53:45 +08:00
Mark Nelson
edc4670b4c MDL-39581 forms: prevent calendar popup from changing multiple date elements 2013-05-10 11:22:07 +08:00
Rossiani Wijaya
89aa433fbd MDL-39488: Lesson Module: Fixed the potential variable overwritting for answers 2013-05-10 11:14:52 +08:00
Damyon Wiese
1248133f7c Merge branch 'MDL-39535_master' of https://github.com/markn86/moodle 2013-05-10 10:30:51 +08:00
Damyon Wiese
dec909fcdd Merge branch 'MDL-38757-master-int' of git://github.com/FMCorz/moodle 2013-05-10 09:35:44 +08:00
Eloy Lafuente (stronk7)
da2cff35c5 Merge branch 'MDL-38885-master-int' of git://github.com/FMCorz/moodle 2013-05-10 03:16:09 +02:00