Commits · 5a25566060ee3b617d119763b9053c063932b0d1 · moodle / moodle

06 Nov, 2013 1 commit
- MDL-42728 Merge English strings from the en_fix language pack · 5a255660
  Helen Foster authored Nov 05, 2013 and David Mudrák committed Nov 05, 2013
  
  5a255660
01 Nov, 2013 39 commits
- on-demand release 2.6beta+ · 5386f0bb
  Dan Poltawski authored Nov 01, 2013
  
  5386f0bb
- Merge branch 'install_master' of git://git.moodle.org/moodle-install · 4c3b5e6e
  Dan Poltawski authored Nov 01, 2013
  
  4c3b5e6e
- MDL-42492 course: Show option to move category to top level · 3b732cd6
  Rajesh Taneja authored Oct 24, 2013 and Marina Glancy committed Nov 01, 2013
```
added behat to test move category
```
  3b732cd6
- Merge branch '42619-26' of git://github.com/samhemelryk/moodle · df27570b
  Marina Glancy authored Nov 01, 2013
  
  df27570b
- MDL-42619 block_community: delete course redirect bug fix · 12ceaa55
  Sam Hemelryk authored Oct 31, 2013
  
  12ceaa55
- MDL-42102 TinyMCE: Toolbar wrapping < 480px. · a123eb58
  Damyon Wiese authored Oct 31, 2013 and Dan Poltawski committed Nov 01, 2013
```
Prevent wrap plugin from wrapping toolbars shorter than 5 buttons.
```
  a123eb58
- Merge branch 'wip-mdl-42584' of https://github.com/rajeshtaneja/moodle · 1637827d
  Marina Glancy authored Nov 01, 2013
```
Conflicts:
	lib/classes/event/user_deleted.php
```
  1637827d
- Merge branch 'MDL-42565-master' of git://github.com/ankitagarwal/moodle · 35e90397
  Marina Glancy authored Nov 01, 2013
  
  35e90397
- Merge branch 'MDL-42356-master' of git://github.com/mouneyrac/moodle · 003a81ee
  Marina Glancy authored Nov 01, 2013
```
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
```
  003a81ee
- Merge branch 'MDL-42471-master' of git://github.com/andrewnicols/moodle · d2941e88
  Marina Glancy authored Nov 01, 2013
  
  d2941e88
- Merge branch 'MDL-42351-master' of git://github.com/damyon/moodle · f5b2c9f4
  Marina Glancy authored Oct 31, 2013
```
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
```
  f5b2c9f4
- Merge branch 'MDL-41624' of git://github.com/jmvedrine/moodle · bbb430bf
  Marina Glancy authored Oct 31, 2013
  
  bbb430bf
- MDL-42102 ie9 SVG fixes · b674a3f6
  Dan Poltawski authored Oct 31, 2013
  
  b674a3f6
- Merge branch 'MDL-42102-master' of git://github.com/andrewnicols/moodle · e3944841
  Dan Poltawski authored Oct 31, 2013
```
Conflicts:
	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/ui.css
```
  e3944841
- MDL-42102 TinyMCE: Update icons · ca4e42cf
  Barbara Ramiro authored Oct 30, 2013
  
  ca4e42cf
- Merge branch 'MDL-40971_M26' of git://github.com/lazydaisy/moodle · 595d9876
  Marina Glancy authored Oct 31, 2013
  
  595d9876
- MDL-42012 TinyMCE: Remove black background on foreground color picker · 6492c72a
  Andrew Nicols authored Oct 30, 2013
  
  6492c72a
- MDL-42102 TinyMCE: Fixing dropdown positioning · 4c86dd51
  Jason Fowler authored Oct 31, 2013
  
  4c86dd51
- MDL-42300 course: improved category re-sort controls. · cda49969
  Sam Hemelryk authored Oct 15, 2013
```
* The top action now works on top level categories and has
  a better title.
* Each category has its own resort actions now.
```
  cda49969
- Merge branch 'MDL-42587' of git://github.com/aolley/moodle · 0219e541
  Marina Glancy authored Oct 31, 2013
  
  0219e541
- Merge branch 'wip-MDL-42599-master' of git://github.com/abgreeve/moodle · b53c1552
  Marina Glancy authored Oct 31, 2013
  
  b53c1552
- Merge branch 'MDL-42517-m' of git://github.com/micaherne/moodle · 3dc774b8
  Dan Poltawski authored Oct 31, 2013
  
  3dc774b8
- Merge branch 'MDL-42482_editpdf_blank_comments' of git://github.com/davosmith/moodle · d61d4c1b
  Dan Poltawski authored Oct 31, 2013
```
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
```
  d61d4c1b
- Merge branch 'wip-mdl-42594' of https://github.com/rajeshtaneja/moodle · fcdc5889
  Dan Poltawski authored Oct 31, 2013
  
  fcdc5889
- Merge branch 'MDL-41041-master' of git://github.com/FMCorz/moodle · 9b0cc9dd
  Dan Poltawski authored Oct 31, 2013
  
  9b0cc9dd
- Merge branch 'MDL-42352_editpdf_scrolling' of git://github.com/davosmith/moodle · fc74cc82
  Dan Poltawski authored Oct 31, 2013
```
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
```
  fc74cc82
- Merge branch 'MDL-42589-master' of git://github.com/damyon/moodle · e9b7148b
  Dan Poltawski authored Oct 31, 2013
  
  e9b7148b
- MDL-42589: Fix file picker display in ie9/ie10 · 4562fdc2
  Damyon Wiese authored Oct 29, 2013
```
CSS change to fix blank file picker bug in IE.
```
  4562fdc2
- Merge branch 'MDL-41664_master' of https://github.com/markn86/moodle · 51bd152e
  Dan Poltawski authored Oct 31, 2013
  
  51bd152e
- MDL-42102 TinyMCE: Correct additional icons · 6ce5fd35
  Barbara Ramiro authored Oct 30, 2013
  
  6ce5fd35
- Merge branch 'MDL-42102-master' of git://github.com/andrewnicols/moodle · d7052f74
  Dan Poltawski authored Oct 30, 2013
  
  d7052f74
- MDL-42102 tinymce: improved icons · dee6073d
  Barbara Ramiro authored Oct 30, 2013
  
  dee6073d
- Merge branch 'MDL-38734-master' of git://github.com/danpoltawski/moodle · 3b4e5a83
  Damyon Wiese authored Oct 30, 2013
  
  3b4e5a83
- ie9 svg compatibility fixes · 575d38d0
  Damyon Wiese authored Oct 30, 2013
  
  575d38d0
- Merge branch 'MDL-41092-master' of git://github.com/ankitagarwal/moodle · bb1a6000
  Damyon Wiese authored Oct 30, 2013
  
  bb1a6000
- MDL-41092 Assign: Expose SQL error in cron unit test · 4d2bd673
  Damyon Wiese authored Oct 30, 2013
  
  4d2bd673
- MDL-42236 behat: New steps to look for elements visibility · 63950e4d
  David Monllaó authored Oct 30, 2013
  
  63950e4d
- MDL-42236 Filepicker: fixing search box for repositories · 98719c48
  Jason Fowler authored Oct 30, 2013
```
Conflicts:
	theme/bootstrapbase/style/moodle.css
```
  98719c48
- Merge branch 'wip-MDL-42379-master' of git://github.com/abgreeve/moodle · 9620bceb
  Sam Hemelryk authored Oct 30, 2013
  
  9620bceb