Damyon Wiese
b0da618b61
MDL-37337 Assignment: Restructure assignment settings screen to make it "wieldy"
2013-02-15 11:26:21 +08:00
Eloy Lafuente (stronk7)
9e7e1b1c9e
MDL-38040 Clean core from CRLFs
2013-02-15 02:13:32 +01:00
Damyon Wiese
1dd6835d8c
weekly release 2.5dev
2013-02-14 13:46:04 +08:00
Damyon Wiese
f22bc6d963
Fix permissions
2013-02-14 13:43:58 +08:00
Damyon Wiese
082685e2de
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
2013-02-14 13:37:48 +08:00
AMOS bot
ca3ee769e1
Automatically generated installer lang files
2013-02-14 00:49:54 +00:00
Dan Poltawski
583b20abd7
Merge branch 'MDL-37883-master' of git://github.com/damyon/moodle
2013-02-13 15:47:27 +08:00
Damyon Wiese
7688a3191c
MDL-37883 Assignment Grade import/export. Additional fix to prevent different grade rounding on export.
2013-02-13 15:33:10 +08:00
Damyon Wiese
6e59159387
Merge branch 'MDL-37750_master-add-seconds' of git://github.com/dmonllao/moodle
2013-02-13 15:04:51 +08:00
David Monllao
cd65dc3220
MDL-37750 behat: More time for AJAX-related actions
...
When we want to assert against data coming
from an AJAX request with 1 second we don't
have enough time to ensure the elements are
loaded
2013-02-13 13:19:56 +08:00
Dan Poltawski
733c17694d
MDL-30637 - fix padding on show/collapse arrow
2013-02-13 11:44:26 +08:00
AMOS bot
731bea1b3b
Automatically generated installer lang files
2013-02-13 00:45:39 +00:00
Eloy Lafuente (stronk7)
6033723098
Merge branch 'MDL-37598-abort-after-config' of git://github.com/mudrd8mz/moodle
2013-02-12 22:49:05 +01:00
Eloy Lafuente (stronk7)
fe4a6d3c38
Merge branch 'MDL-37953_master' of https://github.com/markn86/moodle
2013-02-12 10:12:01 +01:00
Eloy Lafuente (stronk7)
7fe9a7863a
Merge branch 'MDL-37787_master' of git://github.com/dmonllao/moodle
2013-02-12 10:07:58 +01:00
Eloy Lafuente (stronk7)
a3cdb2ba7e
MDL-37893 Take rid of old comment.
2013-02-12 10:03:29 +01:00
Eloy Lafuente (stronk7)
b57f62c497
Merge branch 'MDL-37893-grouped-empty' of git://github.com/mudrd8mz/moodle
2013-02-12 10:02:23 +01:00
Dan Poltawski
6065652f24
Merge branch 'wip-MDL-37976-master' of git://github.com/marinaglancy/moodle
2013-02-12 16:13:48 +08:00
Dan Poltawski
6af8e417c3
Merge branch 'wip-mdl-37633' of git://github.com/rajeshtaneja/moodle
...
Conflicts:
mod/forum/db/upgrade.php
mod/forum/version.php
2013-02-12 15:48:33 +08:00
Dan Poltawski
5c70d6505a
Merge branch 'MDL-37768_master' of git://github.com/dmonllao/moodle
2013-02-12 15:44:17 +08:00
Dan Poltawski
2b8741aaa6
Merge branch 'MDL-32076_unlimited2' of git://github.com/andyjdavis/moodle
2013-02-12 15:08:53 +08:00
Rajesh Taneja
afd5e85ca8
MDL-37633 Forum: Allow fronpage user to have forum:allowforcesubscribe capability by default
2013-02-12 14:57:47 +08:00
Damyon Wiese
147f592742
Merge branch 'MDL-37873_master' of git://github.com/dmonllao/moodle
...
Conflicts:
course/tests/behat/add_activities.feature
2013-02-12 14:48:40 +08:00
Damyon Wiese
f49ec42973
Merge branch 'MDL-37750_master-fix' of git://github.com/dmonllao/moodle
2013-02-12 14:47:50 +08:00
Damyon Wiese
2262c52122
Merge branch 'MDL-37012-master' of git://github.com/mouneyrac/moodle
2013-02-12 14:39:20 +08:00
Damyon Wiese
5926f85960
Merge branch 'wip-mdl-20131' of git://github.com/rajeshtaneja/moodle
2013-02-12 14:15:29 +08:00
David Monllao
333cb91fbf
MDL-37750 behat: Removing (now) collapsed elements
2013-02-12 14:06:51 +08:00
Dan Poltawski
26f94655d5
Merge branch 'MDL-37883-master' of git://github.com/damyon/moodle
2013-02-12 13:47:37 +08:00
Dan Poltawski
4dea0a7719
Merge branch 'MDL-37074-master' of git://github.com/damyon/moodle
2013-02-12 13:39:07 +08:00
Tim Hunt
b4be77c570
MDL-37924 quiz settings: change wrong 'fix' => 'adv'.
2013-02-12 13:36:54 +08:00
Damyon Wiese
6904688967
Merge branch 'MDL-37654_master' of https://github.com/markn86/moodle
2013-02-12 13:09:18 +08:00
Damyon Wiese
7339d6c0e9
Merge branch 'MDL-37164_message_self' of git://github.com/andyjdavis/moodle
2013-02-12 12:12:44 +08:00
Damyon Wiese
dad4fa26e7
Merge branch 'MDL-37828_master' of git://github.com/lazydaisy/moodle
2013-02-12 11:40:40 +08:00
Rajesh Taneja
390ef41e02
MDL-20131 Glossary: Fixed courseid typo
2013-02-12 10:57:10 +08:00
Dan Poltawski
501bdad2b9
Merge branch 'wip-MDL-34798_master-2' of git://github.com/gjb2048/moodle
2013-02-12 10:34:07 +08:00
Mark Nelson
8076010d37
MDL-37953 mod_forum: using named parameters to build SQL statement
2013-02-12 10:31:10 +08:00
Damyon Wiese
234fdc206c
Merge branch 'MDL-5875-master' of git://github.com/FMCorz/moodle
...
Conflicts:
version.php
2013-02-12 10:09:26 +08:00
Marina Glancy
2333bfa7e8
MDL-37976 fixed missing global
2013-02-12 12:59:35 +11:00
Dan Poltawski
008a6514ae
Merge branch 'MDL-37952' of git://github.com/stronk7/moodle
2013-02-12 09:45:38 +08:00
Dan Poltawski
08eef1a4bd
Merge branch 'MDL-37886_master' of git://github.com/dmonllao/moodle
2013-02-12 09:43:50 +08:00
Damyon Wiese
87c9271514
MDL-37831: Version bump for js changes.
2013-02-12 09:34:02 +08:00
Damyon Wiese
82708d0615
Merge branch 'MDL-37831_filepicker_buttons' of git://github.com/davosmith/moodle
2013-02-12 09:15:23 +08:00
Eloy Lafuente (stronk7)
e8e6802225
Merge branch 'MDL-37943' of git://github.com/timhunt/moodle
2013-02-12 01:20:56 +01:00
Eloy Lafuente (stronk7)
ce9c323635
Merge branch 'MDL-37686-master' of git://github.com/FMCorz/moodle
2013-02-12 01:16:48 +01:00
Eloy Lafuente (stronk7)
625d5f8164
Merge branch 'MDL-37896' of git://github.com/timhunt/moodle
2013-02-12 01:13:18 +01:00
Eloy Lafuente (stronk7)
ef1a4d20d4
Merge branch 'MDL-37919-phpunit-exception' of git://github.com/mudrd8mz/moodle
2013-02-12 01:07:43 +01:00
Eloy Lafuente (stronk7)
9a061c3285
Merge branch 'MDL-35037' of git://github.com/danpoltawski/moodle
2013-02-12 00:59:39 +01:00
Eloy Lafuente (stronk7)
65412c365d
Merge branch 'MDL-37961-master' of git://github.com/FMCorz/moodle
2013-02-12 00:43:38 +01:00
Eloy Lafuente (stronk7)
e196517bf5
Merge branch 'wip-MDL-35832-master' of git://github.com/phalacee/moodle
2013-02-11 23:31:38 +01:00
David Mudrák
55834476c4
MDL-37598 Proceed full setup in YUI serving files if needed
...
When serving Moodle YUI files, including just moodlelib.php is not enough
any more. We need the full setup in order to use MUC.
Please note that cookies are disabled in these two scripts. This may make
cache_store::MODE_SESSION caches unavailable. We do not expect they will
be needed here.
2013-02-11 16:35:16 +01:00