Commits · 3a528d4e7608a15f4d02157bf4b6ebf4fa3fff60 · moodle / moodle · GitLab

05 Apr, 2014 1 commit
- MDL-44948 add tool_qeupgradehelper to the list of deleted plugins. · 3a528d4e
  Tim Hunt authored Apr 04, 2014
  
  3a528d4e
03 Apr, 2014 5 commits
- weekly release 2.7dev · 1a727e12
  Marina Glancy authored Apr 03, 2014
  
  1a727e12
- MDL-44747 editor_atto: Improved configuration error messages · 52329a32
  Frederic Massart authored Apr 03, 2014 and Marina Glancy committed Apr 03, 2014
  
  52329a32
- MDL-44832 behat: Fixed behat test · ae8c220f
  Rajesh Taneja authored Apr 03, 2014 and Marina Glancy committed Apr 03, 2014
  
  ae8c220f
- MDL-44720 modinfo: whitespace fix · fc755767
  Eloy Lafuente authored Apr 02, 2014
  
  fc755767
- Merge branch 'wip-MDL-44720-master' of git://github.com/marinaglancy/moodle · 6b8798de
  Eloy Lafuente authored Apr 02, 2014
  
  6b8798de
02 Apr, 2014 34 commits
- Merge branch 'master_MDL-44753' of https://github.com/danmarsden/moodle · c8afcb2e
  Damyon Wiese authored Apr 02, 2014
  
  c8afcb2e
- MDL-44590 course: fix deprecated behat step use · 00f74dfd
  Dan Poltawski authored Apr 02, 2014
  
  00f74dfd
- MDL-44753 SCORM: make correct selection of first sco - also fixes MDL-44896 · e067e6f0
  Dan Marsden authored Apr 02, 2014
  
  e067e6f0
- Merge branch 'MDL-44739-master-fixup' of git://github.com/FMCorz/moodle · bc348632
  Marina Glancy authored Apr 02, 2014
  
  bc348632
- MDL-44739 theme_more: Force default settings to be set · c682844a
  Frederic Massart authored Apr 02, 2014
  
  c682844a
- Merge branch 'MDL-42891-master' of git://github.com/ankitagarwal/moodle · ac32e428
  Marina Glancy authored Apr 02, 2014
  
  ac32e428
- MDL-42891 adminstration: update strings and display for login fails · 2b0c88e2
  Ankit Agarwal authored Apr 02, 2014
  
  2b0c88e2
- Merge branch 'MDL-32729-im' of git://github.com/andrewnicols/moodle · e070ffd8
  Sam Hemelryk authored Apr 02, 2014
  
  e070ffd8
- MDL-32729 Question: Load all hidden fields from the source form · 5c1af530
  Andrew Nicols authored Apr 02, 2014
  
  5c1af530
- Merge branch 'MDL-30085_grade_ws' of git://github.com/jleyva/moodle · c790670d
  Eloy Lafuente authored Apr 02, 2014
  
  c790670d
- Merge branch 'MDL-44749-master' of git://github.com/andrewnicols/moodle · a5af7087
  Marina Glancy authored Apr 02, 2014
  
  a5af7087
- MDL-32729 Question: Correct button selection when openin qbank chooser · f87b2232
  Andrew Nicols authored Apr 02, 2014
```
Some browsers do not bubble form submission events to the window, and we
had more than one form on the page in certain conditions. We need to select
all of the forms on a page and then test the action.
```
  f87b2232
- MDL-44749 atto_collapse: Skip button inclusion if it will impact UX · 9ad87e79
  Andrew Nicols authored Mar 25, 2014
```
Do not show the collapse button if:
* it's specified after the cut-off and would therefore be unusable; or
* the total number of groups matches the number of groups to display anyway.
```
  9ad87e79
- Merge branch 'MDL-41063' of git://github.com/jmvedrine/moodle · 0123472c
  Marina Glancy authored Apr 02, 2014
  
  0123472c
- Merge branch 'MDL-31262' of git://github.com/timhunt/moodle · 2e20fc37
  Eloy Lafuente authored Apr 02, 2014
  
  2e20fc37
- Merge branch 'master_MDL-44753' of git://github.com/danmarsden/moodle · cc7c745c
  Marina Glancy authored Apr 02, 2014
  
  cc7c745c
- MDL-24408 Whitespace fix. · 96eead3f
  Eloy Lafuente authored Apr 02, 2014
  
  96eead3f
- Merge branch 'MDL-24408_2' of https://github.com/oasychev/moodle · bfa5acac
  Eloy Lafuente authored Apr 02, 2014
  
  bfa5acac
- Merge branch 'wip-MDL-34012-master' of git://github.com/marinaglancy/moodle · 6faa5178
  Eloy Lafuente authored Apr 02, 2014
  
  6faa5178
- Merge branch 'wip-MDL-43398-master' of git://github.com/marinaglancy/moodle · b224448a
  Eloy Lafuente authored Apr 02, 2014
  
  b224448a
- Merge branch 'w14_MDL-44843_m27_localedash' of https://github.com/skodak/moodle · 05557612
  Eloy Lafuente authored Apr 02, 2014
  
  05557612
- Merge branch 'wip-MDL-41102-master' of git://github.com/marinaglancy/moodle · bd032a64
  Eloy Lafuente authored Apr 02, 2014
  
  bd032a64
- Merge branch 'w14_MDL-44824_m27_subplugins' of https://github.com/skodak/moodle · 3ed2a4b2
  Sam Hemelryk authored Apr 02, 2014
  
  3ed2a4b2
- Merge branch 'MDL-42816-master' of https://github.com/StudiUM/moodle · 57c92af7
  Eloy Lafuente authored Apr 02, 2014
  
  57c92af7
- Merge branch 'MDL-28261-master' of git://github.com/andrewnicols/moodle · 929e3248
  Eloy Lafuente authored Apr 02, 2014
  
  929e3248
- Merge branch 'MDL-44000-master' of git://github.com/damyon/moodle · e154e9d8
  Eloy Lafuente authored Apr 02, 2014
```
Conflicts:
	lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
```
  e154e9d8
- MDL-44753 SCORM: add check during SCORM restore to make sure valid launch sco is set · c87a50cb
  Dan Marsden authored Mar 26, 2014
  
  c87a50cb
- Merge branch 'MDL-44832-master' of git://github.com/damyon/moodle · 067573bd
  Sam Hemelryk authored Apr 02, 2014
  
  067573bd
- Merge branch 'MDL-44719-master' of git://github.com/FMCorz/moodle · de878a38
  Sam Hemelryk authored Apr 02, 2014
```
Conflicts:
	lib/deprecatedlib.php
```
  de878a38
- Merge branch 'MDL-44756_help' of https://github.com/andyjdavis/moodle · 8412561a
  Sam Hemelryk authored Apr 02, 2014
  
  8412561a
- Merge branch 'MDL-44772-master' of git://github.com/FMCorz/moodle · 53361c30
  Sam Hemelryk authored Apr 02, 2014
```
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
```
  53361c30
- Merge branch 'MDL-44762-master' of git://github.com/FMCorz/moodle · 3b07cc1c
  Sam Hemelryk authored Apr 02, 2014
  
  3b07cc1c
- Merge branch 'MDL-44834-master' of git://github.com/FMCorz/moodle · 9b1a4cde
  Sam Hemelryk authored Apr 02, 2014
```
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
```
  9b1a4cde
- Merge branch 'MDL-32729-master' of git://github.com/andrewnicols/moodle · 0ea11b7c
  Sam Hemelryk authored Apr 02, 2014
```
Conflicts:
	theme/bootstrapbase/style/moodle.css
```
  0ea11b7c