Commits · 6258e288aeeaddbeb726b6a4a7a87bdcd8b490c5 · moodle / moodle · GitLab

24 Feb, 2014 24 commits
- Merge branch '44159-27' of git://github.com/samhemelryk/moodle · 6258e288
  Damyon Wiese authored Feb 24, 2014
  
  6258e288
- Merge branch 'wip-MDL-44168-master' of git://github.com/ds125v/moodle · 28a03399
  Damyon Wiese authored Feb 24, 2014
```
Conflicts:
	theme/bootstrapbase/style/moodle.css
```
  28a03399
- Merge branch '41175-27' of git://github.com/samhemelryk/moodle · 956c7f2c
  Damyon Wiese authored Feb 24, 2014
  
  956c7f2c
- Merge branch '41176-27' of git://github.com/samhemelryk/moodle · 5bc18d29
  Damyon Wiese authored Feb 24, 2014
  
  5bc18d29
- Merge branch '41177-27' of git://github.com/samhemelryk/moodle · 801e26ed
  Damyon Wiese authored Feb 24, 2014
  
  801e26ed
- Merge branch '41178-27' of git://github.com/samhemelryk/moodle · 9383bef6
  Damyon Wiese authored Feb 24, 2014
  
  9383bef6
- Merge branch '41179-27' of git://github.com/samhemelryk/moodle · 18bc3fae
  Damyon Wiese authored Feb 24, 2014
  
  18bc3fae
- Merge branch '44182-27' of git://github.com/samhemelryk/moodle · 5c47971b
  Damyon Wiese authored Feb 24, 2014
  
  5c47971b
- Merge branch '44183-27' of git://github.com/samhemelryk/moodle · b6865832
  Damyon Wiese authored Feb 24, 2014
  
  b6865832
- Merge branch 'MDL-44214-master' of git://github.com/andrewnicols/moodle · f08c69ab
  Damyon Wiese authored Feb 24, 2014
  
  f08c69ab
- Merge branch 'MDL-44247-master' of git://github.com/FMCorz/moodle · 2926b254
  Damyon Wiese authored Feb 24, 2014
  
  2926b254
- MDL-44264 Badges: Cleanup imports in previous commit. · 8da433f0
  Damyon Wiese authored Feb 24, 2014
  
  8da433f0
- Merge branch 'MDL-44264' of https://github.com/merrill-oakland/moodle · 9a85b4e0
  Damyon Wiese authored Feb 24, 2014
  
  9a85b4e0
- Merge branch '44279-27' of git://github.com/samhemelryk/moodle · e848a930
  Damyon Wiese authored Feb 24, 2014
  
  e848a930
- Merge branch 'MDL-44286_master' of git://github.com/dmonllao/moodle · e3eaf61d
  Damyon Wiese authored Feb 24, 2014
  
  e3eaf61d
- Merge branch 'MDL-44288' of git://github.com/timhunt/moodle · 13c12da2
  Damyon Wiese authored Feb 24, 2014
  
  13c12da2
- MDL-18633 User: Fixed calls to html_writer on user/profile page. · b80210fc
  Damyon Wiese authored Feb 24, 2014
  
  b80210fc
- Merge branch 'MDL-18633' of https://github.com/danielneis/moodle · 164ad1a3
  Damyon Wiese authored Feb 24, 2014
  
  164ad1a3
- Merge branch 'MDL-44006-m' of https://github.com/micaherne/moodle · 1ed6bd87
  Damyon Wiese authored Feb 24, 2014
  
  1ed6bd87
- Merge branch 'MDL-44269_master' of git://github.com/lazydaisy/moodle · 25de7d88
  Damyon Wiese authored Feb 24, 2014
  
  25de7d88
- Merge branch '44217-27' of git://github.com/samhemelryk/moodle · aeacaa14
  Damyon Wiese authored Feb 24, 2014
  
  aeacaa14
- Merge branch 'MDL-34319_master' of https://github.com/markn86/moodle · 0721fb91
  Damyon Wiese authored Feb 24, 2014
  
  0721fb91
- MDL-44217 theme_bootstrapbase: darkend link colour by 5% for accessibility · 24c7fd00
  Sam Hemelryk authored Feb 19, 2014
  
  24c7fd00
- Merge branch 'MDL-41767-master' of git://github.com/FMCorz/moodle · 89ede7e1
  Damyon Wiese authored Feb 24, 2014
  
  89ede7e1
21 Feb, 2014 6 commits
- MDL-44286 behat: Updating to our custom Syn library · 67ecac89
  David Monllaó authored Feb 20, 2014
  
  67ecac89
- MDL-42279 user: fixed typo in user_get_user_details_courses · 854859e1
  Sam Hemelryk authored Feb 20, 2014
  
  854859e1
- MDL-44279 user: added unit test to trigger known bug · 1d2fa3af
  Sam Hemelryk authored Feb 20, 2014
  
  1d2fa3af
- MDL-44183 mod_workshop: unified @package use · 5cdcfcb9
  Sam Hemelryk authored Feb 16, 2014
  
  5cdcfcb9
- MDL-44182 mod_survey: unified @package use · da9bddbe
  Sam Hemelryk authored Feb 16, 2014
  
  da9bddbe
- MDL-44159 mod_wiki: unify @package use · 593b8385
  Sam Hemelryk authored Feb 14, 2014
  
  593b8385
20 Feb, 2014 4 commits
- MDL-44288 qtype_calculatedsimple fix validation notice. · dfcaa245
  Tim Hunt authored Feb 20, 2014
```
The notice happend if you clicked Save changes before Find the wild
cards {x..} present in the correct answer formulas.
```
  dfcaa245
- weekly release 2.7dev · ec4c8161
  Eloy Lafuente authored Feb 20, 2014
  
  ec4c8161
- Merge branch 'install_master' of git://git.moodle.org/moodle-install · 1a561214
  Eloy Lafuente authored Feb 20, 2014
  
  1a561214
- MDL-44269 theme_clean: Change location of navbar (breadcumb) to below logo. · e11558bc
  Mary Evans authored Feb 19, 2014
  
  e11558bc
19 Feb, 2014 6 commits
- MDL-44118 question engine: Fix bad merge conflict resolution (again) · d4e57579
  Damyon Wiese authored Feb 19, 2014
```
This time for sure (sorry).
```
  d4e57579
- MDL-44118 question engine: Fix bad merge conflict resolution · 0d7e83c4
  Damyon Wiese authored Feb 19, 2014
```
Version numbers were out of order in upgrade file (my bad).
```
  0d7e83c4
- Merge branch 'MDL-44118_2' of git://github.com/timhunt/moodle · 6071a209
  Damyon Wiese authored Feb 19, 2014
```
Conflicts:
	version.php
```
  6071a209
- Merge branch '44213-27' of git://github.com/samhemelryk/moodle · a7bf7079
  Eloy Lafuente authored Feb 19, 2014
  
  a7bf7079
- Merge branch '44211-27' of git://github.com/samhemelryk/moodle · 88f1b3d6
  Eloy Lafuente authored Feb 19, 2014
  
  88f1b3d6
- Merge branch '44210-27' of git://github.com/samhemelryk/moodle · 86252eb6
  Eloy Lafuente authored Feb 19, 2014
  
  86252eb6