Dan Poltawski
|
d96fcecc86
|
Merge branch 'MDL-20609' of git://github.com/timhunt/moodle
|
2013-07-23 16:44:32 +08:00 |
|
Dan Poltawski
|
80a1b08d40
|
Merge branch 'MDL-40480' of git://github.com/timhunt/moodle
|
2013-07-23 16:41:45 +08:00 |
|
Damyon Wiese
|
0b92270b19
|
Merge branch 'MDL-38863_master' of git://github.com/dmonllao/moodle
|
2013-07-23 16:04:50 +08:00 |
|
Jamie Pratt
|
e39a2faa58
|
MDL-40729 check marks and grades from quiz attempts
compare to marks in csv file.
|
2013-07-23 16:04:13 +08:00 |
|
Frederic Massart
|
d735f3d8f3
|
MDL-32746 phpunit: Adding auth/tests to PHPUnit core suites
|
2013-07-23 16:01:45 +08:00 |
|
Jamie Pratt
|
da6bb0c506
|
MDL-40076 Build entire quiz attempts by supplying attempt
data for each question in the quiz, pulling responses
from a csv file.
|
2013-07-23 15:59:53 +08:00 |
|
Damyon Wiese
|
0070cb8bca
|
Merge branch 'MDL-40295' of git://github.com/rwijaya/moodle
|
2013-07-23 15:51:59 +08:00 |
|
David Monllao
|
a090296740
|
MDL-40672 behat: New activities data generator
|
2013-07-23 09:47:36 +02:00 |
|
David Monllao
|
72ddc05f67
|
MDL-38863 behat: Role assign generator
|
2013-07-23 09:46:39 +02:00 |
|
Jamie Pratt
|
a3c5150b2a
|
MDL-40714 pass through simulated data to sub questions
in multi-answer question type
|
2013-07-23 15:29:28 +08:00 |
|
Jamie Pratt
|
c2b051c7aa
|
MDL-40542 need to be able to select variant
in unit tests
|
2013-07-23 15:11:56 +08:00 |
|
Jamie Pratt
|
c2f2e7f008
|
MDL-40541 need to be able to select random q
in unit tests
|
2013-07-23 15:08:32 +08:00 |
|
Jamie Pratt
|
388f047345
|
MDL-40543 convert from simulated responses
to post data
|
2013-07-23 15:00:02 +08:00 |
|
Damyon Wiese
|
6064e5cc00
|
Merge branch 'MDL-32746-master' of git://github.com/FMCorz/moodle
|
2013-07-23 14:49:42 +08:00 |
|
Dan Poltawski
|
5432ccec64
|
Merge branch 'wip_MDL-40778_v2' of https://github.com/jamiepratt/moodle
|
2013-07-23 14:26:35 +08:00 |
|
Damyon Wiese
|
7ea41b4a94
|
Merge branch 'wip-MDL-39748-master' of git://github.com/phalacee/moodle
|
2013-07-23 14:16:31 +08:00 |
|
Damyon Wiese
|
683bd5b15e
|
MDL-28019 tinymce managefiles: change tabs to spaces
|
2013-07-23 14:14:08 +08:00 |
|
Marina Glancy
|
9e88661e58
|
MDL-28019 Added plugin tinymce_managefiles
|
2013-07-23 14:12:55 +08:00 |
|
Marina Glancy
|
1d94557373
|
MDL-28019 Added plugin repository_areafiles
|
2013-07-23 14:12:45 +08:00 |
|
Dan Poltawski
|
a0035108b0
|
MDL-40585 fix trailing whitespace
|
2013-07-23 13:33:49 +08:00 |
|
Dan Poltawski
|
33b6da7f59
|
Merge branch 'MDL-40585_grouped_parent_exists' of git://github.com/mr-russ/moodle
|
2013-07-23 13:33:27 +08:00 |
|
Dan Poltawski
|
151d915c54
|
Merge branch 'MDL-40719' of git://github.com/timhunt/moodle
|
2013-07-23 13:27:32 +08:00 |
|
Dan Poltawski
|
3ee8607d46
|
Merge branch 'MDL-40584' of https://github.com/mr-russ/moodle
|
2013-07-23 12:35:41 +08:00 |
|
Jason Fowler
|
7e222836f0
|
MDL-39748 - Grading Methods - Fixing input field widths for Rubrics
|
2013-07-23 12:06:38 +08:00 |
|
Frederic Massart
|
3b086e3094
|
MDL-32746 core: Implement new user_loggedin event
|
2013-07-23 11:36:35 +08:00 |
|
Dan Poltawski
|
35c1179047
|
Merge branch 'MDL-40793_profile_compare' of https://github.com/mr-russ/moodle
|
2013-07-23 10:42:02 +08:00 |
|
Damyon Wiese
|
9ced78bd3e
|
Merge branch 'wip-MDL-40648-master' of git://github.com/marinaglancy/moodle
Conflicts:
version.php
|
2013-07-23 10:37:20 +08:00 |
|
Sam Hemelryk
|
deeae9c155
|
Merge branch 'MDL-40680-master' of git://github.com/danpoltawski/moodle
|
2013-07-23 14:14:27 +12:00 |
|
Sam Hemelryk
|
18474f822b
|
Merge branch 'MDL-40666-master' of git://github.com/danpoltawski/moodle
|
2013-07-23 14:09:08 +12:00 |
|
Dan Poltawski
|
131580860b
|
Merge branch 'MDL-35674-form-dependencies' of https://github.com/andrewnicols/moodle
|
2013-07-23 10:01:59 +08:00 |
|
Sam Hemelryk
|
97ff2341b3
|
Merge branch 'master_MDL-40702' of git://github.com/danmarsden/moodle
|
2013-07-23 13:59:16 +12:00 |
|
Eloy Lafuente (stronk7)
|
4238060a9b
|
Merge branch 'wip-MDL-38707-master' of git://github.com/marinaglancy/moodle
|
2013-07-23 03:52:16 +02:00 |
|
AMOS bot
|
f8d14fc038
|
Automatically generated installer lang files
|
2013-07-23 00:39:23 +00:00 |
|
Jason Fowler
|
0ebd16d2b2
|
MDL-37869 - Course - Removing the ALT text from activity and resource icons as it duplicated the accesshide text
|
2013-07-23 08:08:24 +08:00 |
|
Sam Hemelryk
|
07724a9cee
|
Merge branch 'MDL-39695_master' of git://github.com/kordan/moodle
|
2013-07-23 12:00:59 +12:00 |
|
Sam Hemelryk
|
031ef3f871
|
Merge branch 'MDL-40670-master' of git://github.com/barbararamiro/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
|
2013-07-23 11:57:50 +12:00 |
|
Sam Hemelryk
|
092a99ef08
|
Merge branch 'MDL-40799-m' of git://github.com/andrewnicols/moodle
|
2013-07-23 11:12:39 +12:00 |
|
Sam Hemelryk
|
d0ed9d6375
|
Merge branch 'MDL-40788-m' of git://github.com/andrewnicols/moodle
|
2013-07-23 11:12:34 +12:00 |
|
Eloy Lafuente (stronk7)
|
6d0085ef24
|
Merge branch 'MDL-40123_master' of git://github.com/dmonllao/moodle
|
2013-07-23 01:09:52 +02:00 |
|
Sam Hemelryk
|
374f7b1d28
|
Merge branch 'MDL-40787-m' of git://github.com/andrewnicols/moodle
|
2013-07-23 11:07:53 +12:00 |
|
Sam Hemelryk
|
0ad4bcd102
|
Merge branch 'MDL-39770_chat' of https://github.com/andyjdavis/moodle
|
2013-07-23 11:06:08 +12:00 |
|
Eloy Lafuente (stronk7)
|
63ff2c5c2f
|
Merge branch 'MDL-39635_master' of git://github.com/dmonllao/moodle
|
2013-07-23 00:45:13 +02:00 |
|
Eloy Lafuente (stronk7)
|
f2515968d2
|
Merge branch 'wip-MDL-33563-master' of git://github.com/marinaglancy/moodle
|
2013-07-22 22:36:23 +02:00 |
|
Yuliya Bozhko
|
3752d8236d
|
MDL-39461 badges: Fix cURL expectation failed error when trying to connect to backpack
|
2013-07-23 08:21:04 +12:00 |
|
Eloy Lafuente (stronk7)
|
59af378baf
|
Merge branch 'w30_MDL-40795_m26_ajaxerrordisplay' of https://github.com/skodak/moodle
|
2013-07-22 18:56:40 +02:00 |
|
Eloy Lafuente (stronk7)
|
252e545e9f
|
Merge branch 'MDL-40626-master' of git://github.com/danpoltawski/moodle
|
2013-07-22 17:40:03 +02:00 |
|
Mark Nelson
|
888e317f2d
|
MDL-40816 backup: code cleanup on the manage backups form
|
2013-07-22 18:15:07 +08:00 |
|
Mark Nelson
|
8874895892
|
MDL-40816 backup: added missing setType calls to the manage backups form
|
2013-07-22 18:15:00 +08:00 |
|
Dan Poltawski
|
b3a570b56e
|
Merge branch 'w30_MDL-38867_m26_gspell' of https://github.com/skodak/moodle
|
2013-07-22 17:00:40 +08:00 |
|
Damyon Wiese
|
dc6b786446
|
MDL-40260 Course overview: code tidy for previous commit
Moving this check inside the following if makes it clear which code
branch it applies to.
|
2013-07-22 16:12:26 +08:00 |
|