66681 Commits

Author SHA1 Message Date
Damyon Wiese
956c7f2c39 Merge branch '41175-27' of git://github.com/samhemelryk/moodle 2014-02-24 15:15:00 +08:00
Damyon Wiese
5bc18d295a Merge branch '41176-27' of git://github.com/samhemelryk/moodle 2014-02-24 15:13:00 +08:00
Damyon Wiese
801e26ed64 Merge branch '41177-27' of git://github.com/samhemelryk/moodle 2014-02-24 15:10:53 +08:00
Damyon Wiese
9383bef658 Merge branch '41178-27' of git://github.com/samhemelryk/moodle 2014-02-24 15:08:33 +08:00
Damyon Wiese
18bc3faef9 Merge branch '41179-27' of git://github.com/samhemelryk/moodle 2014-02-24 14:51:08 +08:00
Damyon Wiese
5c47971b4a Merge branch '44182-27' of git://github.com/samhemelryk/moodle 2014-02-24 14:49:10 +08:00
Damyon Wiese
b68658325b Merge branch '44183-27' of git://github.com/samhemelryk/moodle 2014-02-24 14:46:16 +08:00
Damyon Wiese
f08c69aba2 Merge branch 'MDL-44214-master' of git://github.com/andrewnicols/moodle 2014-02-24 14:41:29 +08:00
Damyon Wiese
2926b25492 Merge branch 'MDL-44247-master' of git://github.com/FMCorz/moodle 2014-02-24 14:32:49 +08:00
Damyon Wiese
8da433f045 MDL-44264 Badges: Cleanup imports in previous commit. 2014-02-24 13:48:18 +08:00
Damyon Wiese
9a85b4e053 Merge branch 'MDL-44264' of https://github.com/merrill-oakland/moodle 2014-02-24 13:40:47 +08:00
Damyon Wiese
e848a930d2 Merge branch '44279-27' of git://github.com/samhemelryk/moodle 2014-02-24 13:37:52 +08:00
Damyon Wiese
e3eaf61db1 Merge branch 'MDL-44286_master' of git://github.com/dmonllao/moodle 2014-02-24 13:29:58 +08:00
Damyon Wiese
13c12da2e5 Merge branch 'MDL-44288' of git://github.com/timhunt/moodle 2014-02-24 13:27:12 +08:00
Damyon Wiese
b80210fcd2 MDL-18633 User: Fixed calls to html_writer on user/profile page. 2014-02-24 13:19:17 +08:00
Damyon Wiese
164ad1a30a Merge branch 'MDL-18633' of https://github.com/danielneis/moodle 2014-02-24 13:16:41 +08:00
Damyon Wiese
1ed6bd87a2 Merge branch 'MDL-44006-m' of https://github.com/micaherne/moodle 2014-02-24 12:30:55 +08:00
Damyon Wiese
25de7d88e7 Merge branch 'MDL-44269_master' of git://github.com/lazydaisy/moodle 2014-02-24 11:42:51 +08:00
Damyon Wiese
aeacaa141e Merge branch '44217-27' of git://github.com/samhemelryk/moodle 2014-02-24 11:13:38 +08:00
Damyon Wiese
0721fb9113 Merge branch 'MDL-34319_master' of https://github.com/markn86/moodle 2014-02-24 11:08:03 +08:00
Sam Hemelryk
24c7fd007a MDL-44217 theme_bootstrapbase: darkend link colour by 5% for accessibility 2014-02-24 16:07:02 +13:00
Damyon Wiese
89ede7e12d Merge branch 'MDL-41767-master' of git://github.com/FMCorz/moodle 2014-02-24 09:57:15 +08:00
David Monllao
67ecac8933 MDL-44286 behat: Updating to our custom Syn library 2014-02-21 10:17:59 +08:00
Sam Hemelryk
854859e1b0 MDL-42279 user: fixed typo in user_get_user_details_courses 2014-02-21 08:34:49 +13:00
Sam Hemelryk
1d2fa3af5a MDL-44279 user: added unit test to trigger known bug 2014-02-21 08:34:49 +13:00
Sam Hemelryk
5cdcfcb988 MDL-44183 mod_workshop: unified @package use 2014-02-21 08:33:40 +13:00
Sam Hemelryk
da9bddbeeb MDL-44182 mod_survey: unified @package use 2014-02-21 08:33:36 +13:00
Tim Hunt
dfcaa2450c MDL-44288 qtype_calculatedsimple fix validation notice.
The notice happend if you clicked Save changes before Find the wild
cards {x..} present in the correct answer formulas.
2014-02-20 13:01:47 +00:00
Eloy Lafuente (stronk7)
ec4c8161a4 weekly release 2.7dev 2014-02-20 12:43:03 +01:00
Eloy Lafuente (stronk7)
1a561214af Merge branch 'install_master' of git://git.moodle.org/moodle-install 2014-02-20 12:42:59 +01:00
Mary Evans
e11558bca3 MDL-44269 theme_clean: Change location of navbar (breadcumb) to below logo. 2014-02-19 22:03:38 +00:00
Damyon Wiese
d4e5757992 MDL-44118 question engine: Fix bad merge conflict resolution (again)
This time for sure (sorry).
2014-02-19 10:03:37 +08:00
Damyon Wiese
0d7e83c4e4 MDL-44118 question engine: Fix bad merge conflict resolution
Version numbers were out of order in upgrade file (my bad).
2014-02-19 09:35:57 +08:00
Damyon Wiese
6071a209fe Merge branch 'MDL-44118_2' of git://github.com/timhunt/moodle
Conflicts:
	version.php
2014-02-19 09:08:42 +08:00
Eloy Lafuente (stronk7)
a7bf707974 Merge branch '44213-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:33:20 +01:00
Eloy Lafuente (stronk7)
88f1b3d6b7 Merge branch '44211-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:32:25 +01:00
Eloy Lafuente (stronk7)
86252eb6df Merge branch '44210-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:31:13 +01:00
Eloy Lafuente (stronk7)
8817802bfd Merge branch '44209-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:30:43 +01:00
Eloy Lafuente (stronk7)
6030ef565f Merge branch '44208-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:28:53 +01:00
Eloy Lafuente (stronk7)
bf9c946eef MDL-44207 theme_nimble: fix incorrect tab. 2014-02-19 01:23:59 +01:00
Eloy Lafuente (stronk7)
22e4df8e63 Merge branch '44207-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:23:04 +01:00
Eloy Lafuente (stronk7)
faefe571c5 Merge branch '44206-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:21:16 +01:00
Eloy Lafuente (stronk7)
6151f9de4c Merge branch '44205-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:20:10 +01:00
Eloy Lafuente (stronk7)
bb0949467e Merge branch '44204-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:19:43 +01:00
Eloy Lafuente (stronk7)
5f88a2fc11 Merge branch '44203-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:19:04 +01:00
Eloy Lafuente (stronk7)
360a0b4480 Merge branch '44202-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:12:57 +01:00
Eloy Lafuente (stronk7)
361d13c04a Merge branch '44201-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:11:46 +01:00
Eloy Lafuente (stronk7)
f02613d6d6 Merge branch '44200-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:11:06 +01:00
Eloy Lafuente (stronk7)
c753d76879 Merge branch '44199-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:08:58 +01:00
Eloy Lafuente (stronk7)
0919e70204 Merge branch '44198-27' of git://github.com/samhemelryk/moodle 2014-02-19 01:08:23 +01:00