Commits · e0e6d931f34458cf3b261c02a1c8d09a844e684d · integration / prechecker · GitLab

15 Jun, 2014 1 commit
- MDL-45936 auth_db: use core functions when creating/updating a user · e0e6d931
  Mark Nelson authored Jun 11, 2014
  
  e0e6d931
13 Jun, 2014 1 commit
- weekly release 2.8dev · 337075d1
  Eloy Lafuente authored Jun 12, 2014
  
  337075d1
12 Jun, 2014 5 commits
- Merge branch 'MDL-44871-master' of git://github.com/damyon/moodle · 02720018
  Eloy Lafuente authored Jun 12, 2014
  
  02720018
- Merge branch 'MDL-42835-master' of http://github.com/damyon/moodle · 1a32e1d4
  Eloy Lafuente authored Jun 12, 2014
  
  1a32e1d4
- MDL-45808 enrol_self: Fixed behat to observe the group key policy · c2c5d577
  Rajesh Taneja authored Jun 12, 2014 and Damyon Wiese committed Jun 12, 2014
  
  c2c5d577
- MDL-42835 Scorm: Fix for JS error because no nodes are selected in the toc. · c48c9bf0
  Damyon Wiese authored Jun 12, 2014
  
  c48c9bf0
- MDL-44871 Atto: Add missing tags to behat tests @editor and @editor_atto · d27c8d92
  Damyon Wiese authored Jun 12, 2014
  
  d27c8d92
11 Jun, 2014 15 commits
- MDL-45763 Question types: Allow saving '0' as question text. · ca4f7f61
  Damyon Wiese authored Jun 11, 2014
  
  ca4f7f61
- MDL-44871 behat: Hack to make equation editor visible · 49d82f90
  Rajesh Taneja authored Jun 11, 2014 and Damyon Wiese committed Jun 11, 2014
  
  49d82f90
- MDL-39726 backup: fix SQL syntax for Oracle · 84dc9003
  Marina Glancy authored Jun 11, 2014
  
  84dc9003
- MDL-44871 Atto behat: Use one less page load to get to profile edit page · 162e050c
  Damyon Wiese authored Jun 11, 2014
  
  162e050c
- MDL-44871 Atto: Move custom select text step to atto specific step definition. · e3adee55
  Damyon Wiese authored Jun 11, 2014
  
  e3adee55
- MDL-44871 Atto behat tests: Modified the tests to work around focus bugs with workspaces · 7d8f825b
  Damyon Wiese authored Jun 11, 2014
```
The main changes here are that the "select the text in" step was modified to select only the
first text node in the editor field, and to focus on it's parent instead of the entire editable div.

Some tests had to be modified to match the new behaviour, and another "real" bug was found in the table plugin.
```
  7d8f825b
- MDL-39726 backup: fix SQL syntax for Oracle · b9329e0c
  Marina Glancy authored Jun 11, 2014
  
  b9329e0c
- MDL-45763 question: fix SQL syntax for Oracle · 55281173
  Marina Glancy authored Jun 11, 2014
  
  55281173
- Merge branch 'm28_MDL-29708_Typo_Extra_Slashes' of https://github.com/scara/moodle · ea8541d0
  Eloy Lafuente authored Jun 11, 2014
  
  ea8541d0
- Merge branch 'MDL-45808-master' of git://github.com/FMCorz/moodle · a834119d
  Eloy Lafuente authored Jun 10, 2014
  
  a834119d
- Merge branch 'MDL-45579-master' of git://github.com/FMCorz/moodle · ffce783f
  Eloy Lafuente authored Jun 10, 2014
  
  ffce783f
- Merge branch 'MDL-45418' of git://github.com/stronk7/moodle · ed16bf37
  Eloy Lafuente authored Jun 10, 2014
  
  ed16bf37
- MDL-45943: Replacement for publisher icons · 1e2e5d83
  Barbara Ramiro authored Jun 10, 2014 and Eloy Lafuente committed Jun 10, 2014
  
  1e2e5d83
- MDL-45418 Files: Adding upgrade steps for publisher docs · b5725a97
  Jason Fowler authored May 07, 2014 and Eloy Lafuente committed Jun 10, 2014
```
Conflicts:
	lib/db/upgrade.php
	version.php
```
  b5725a97
- MDL-45418 Files: Adding publisher docs to Filetypes · 855d8a2c
  James McLean authored May 06, 2014 and Eloy Lafuente committed Jun 10, 2014
  
  855d8a2c
10 Jun, 2014 18 commits
- Merge branch 'MDL-45763-master' of git://github.com/merrill-oakland/moodle · 5adb8d86
  Marina Glancy authored Jun 10, 2014
  
  5adb8d86
- MDL-45763 question: Correct random question text if set to true or false · 516a3ddc
  Eric Merrill authored Jun 10, 2014
  
  516a3ddc
- Merge branch 'MDL-45813-scheduled_task' of git://github.com/mudrd8mz/moodle · 4422b080
  Marina Glancy authored Jun 10, 2014
  
  4422b080
- Merge branch 'MDL-20154-master' of git://github.com/merrill-oakland/moodle · 410bb9a9
  Marina Glancy authored Jun 10, 2014
  
  410bb9a9
- Merge branch '45524-28' of git://github.com/samhemelryk/moodle · 5d44ea33
  Damyon Wiese authored Jun 10, 2014
  
  5d44ea33
- MDL-44871 Behat: Add tests for Atto functionalities (some of them) · 457a9fa6
  Damyon Wiese authored May 26, 2014
  
  457a9fa6
- Merge branch 'wip-MDL45846' of git://github.com/jennymgray/moodle · 0b74d45c
  Marina Glancy authored Jun 10, 2014
  
  0b74d45c
- MDL-45245 html_writer::select_time does not respect 5th parameter "attributes" · db282ba4
  Daniel Neis Araujo authored Apr 23, 2014 and Marina Glancy committed Jun 10, 2014
  
  db282ba4
- Merge branch 'wip-MDL-44309-master' of https://github.com/deraadt/moodle · 79b1aa8a
  Damyon Wiese authored Jun 10, 2014
  
  79b1aa8a
- Merge branch 'MDL-45761-master' of https://github.com/merrill-oakland/moodle · 85083337
  Damyon Wiese authored Jun 10, 2014
  
  85083337
- Merge branch 'MDL-45767_returnInstanceid' of https://github.com/moodlerooms/moodle · dc92753a
  Damyon Wiese authored Jun 10, 2014
  
  dc92753a
- Merge branch 'MDL-45729-master' of http://github.com/damyon/moodle · 5262686e
  Damyon Wiese authored Jun 10, 2014
  
  5262686e
- Merge branch 'MDL-45763-master' of https://github.com/merrill-oakland/moodle · 2d8d99ab
  Damyon Wiese authored Jun 10, 2014
  
  2d8d99ab
- MDL-45729 assign: Fix for assign unit tests · 5ba4ca89
  Damyon Wiese authored Jun 10, 2014
```
Check the user in the params, not the $USER
```
  5ba4ca89
- Merge branch 'MDL-45789_master' of https://github.com/markn86/moodle · 3150271c
  Eloy Lafuente authored Jun 10, 2014
  
  3150271c
- Merge branch 'MDL-45804_master' of https://github.com/markn86/moodle · d1b183b9
  Eloy Lafuente authored Jun 10, 2014
  
  d1b183b9
- Merge branch 'MDL-42782-master' of git://github.com/jethac/moodle · 2975f1a0
  Eloy Lafuente authored Jun 10, 2014
```
Conflicts:
	theme/bootstrapbase/style/moodle.css
```
  2975f1a0
- Merge branch 'MDL-42835' of git://github.com/nobelium/moodle · 0a87b680
  Eloy Lafuente authored Jun 10, 2014
  
  0a87b680