Commits · 4c243a24abbad9f89ec57558a651ddf72104baa7 · moodle / moodle · GitLab

24 Mar, 2015 35 commits
- Merge branch 'MDL-49622' of https://github.com/stronk7/moodle · 4c243a24
  Dan Poltawski authored Mar 24, 2015
  
  4c243a24
- Merge branch 'MDL-49354-master' of https://github.com/mtavella-netspot/moodle · fee04d20
  Dan Poltawski authored Mar 24, 2015
  
  fee04d20
- Merge branch 'master_MDL-49054' of git://github.com/danmarsden/moodle · 422c29d3
  Dan Poltawski authored Mar 24, 2015
  
  422c29d3
- Merge branch 'MDL-48918-master' of git://github.com/andrewnicols/moodle · b051a0af
  Dan Poltawski authored Mar 24, 2015
  
  b051a0af
- Merge branch 'MDL-48795' of https://github.com/apsdehal/moodle · 891b28ff
  Eloy Lafuente authored Mar 24, 2015
  
  891b28ff
- Merge branch 'wip-mdl-49374' of https://github.com/rajeshtaneja/moodle · 23137001
  Dan Poltawski authored Mar 24, 2015
  
  23137001
- Merge branch 'MDL-49070_scheduled' of https://github.com/andyjdavis/moodle · 91062d4c
  Dan Poltawski authored Mar 24, 2015
  
  91062d4c
- MDL-48969 block_quiz_results: disable on install · 52e81cd1
  Dan Poltawski authored Mar 24, 2015
  
  52e81cd1
- Merge branch 'MDL-48969_m29v9' of https://github.com/sbourget/moodle · 9569976f
  Dan Poltawski authored Mar 24, 2015
  
  9569976f
- Merge branch 'wip_MDL-49631_29_utfregex' of https://github.com/skodak/moodle · bd65120b
  Dan Poltawski authored Mar 24, 2015
  
  bd65120b
- Merge branch 'MDL-46746-master' of git://github.com/merrill-oakland/moodle · db8a3b2e
  Dan Poltawski authored Mar 24, 2015
```
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
```
  db8a3b2e
- MDL-49444 phpunit: add missing suite definition · 37ccb211
  Dan Poltawski authored Mar 24, 2015
  
  37ccb211
- Merge branch 'MDL-49565-master' of git://github.com/merrill-oakland/moodle · 44a7e27b
  Dan Poltawski authored Mar 24, 2015
  
  44a7e27b
- Merge branch 'MDL-49337-master' of git://github.com/jleyva/moodle · 6f27fbb4
  David Monllaó authored Mar 24, 2015
```
Conflicts:
	lib/db/services.php
```
  6f27fbb4
- MDL-49337 webservices: Unit tests for mod_data_get_databases_by_courses · 067b3fda
  Juan Leyva authored Mar 05, 2015
  
  067b3fda
- MDL-49337 webservices: Include the new WS in the mobile app service · a090259e
  Juan Leyva authored Mar 05, 2015
  
  a090259e
- MDL-49337 webservices: mod_data services file definition · 5c438daa
  Juan Leyva authored Mar 05, 2015
  
  5c438daa
- MDL-49337 webservices: New WS mod_data_get_databases_by_courses · 2ab34819
  Juan Leyva authored Mar 05, 2015
  
  2ab34819
- Merge branch 'MDL-49444-master' of git://github.com/jleyva/moodle · 636c609b
  David Monllaó authored Mar 24, 2015
  
  636c609b
- Merge branch 'wip_MDL-49327_2.9_guide_getinstance' of https://github.com/nixorv/moodle · e8d14e46
  Dan Poltawski authored Mar 24, 2015
```
Conflicts:
	grade/grading/form/guide/tests/guide_test.php
```
  e8d14e46
- MDL-49444 webservices: Added new function to the mobile service · 25c49a85
  Juan Leyva authored Mar 09, 2015
  
  25c49a85
- MDL-49444 webservices: Tests for update_activity_completion_status · 1490586e
  Juan Leyva authored Mar 09, 2015
  
  1490586e
- MDL-49444 webservices: New WS update_activity_completion_status · b9d17109
  Juan Leyva authored Mar 09, 2015
  
  b9d17109
- Merge branch 'MDL-49558_master' of git://github.com/nadavkav/moodle · 890d8dbf
  David Monllaó authored Mar 24, 2015
  
  890d8dbf
- Merge branch 'MDL-49430_m29v4' of git://github.com/sbourget/moodle · a2be9de1
  David Monllaó authored Mar 24, 2015
```
Conflicts:
	mod/lesson/version.php
```
  a2be9de1
- Merge branch 'MDL-49470_master-refine' of git://github.com/dmonllao/moodle · 019e26db
  David Monllaó authored Mar 24, 2015
  
  019e26db
- MDL-49470 mod_lesson: Adding text space + unit test refinement · bedf3a0a
  David Monllaó authored Mar 24, 2015
  
  bedf3a0a
- MDL-49470 Lesson: Add page moved event · 14cdeb7b
  Stephen Bourget authored Mar 18, 2015 and David Monllaó committed Mar 24, 2015
```
Conflicts:
	mod/lesson/version.php
```
  14cdeb7b
- Merge branch 'MDL-49555-master' of git://github.com/FMCorz/moodle · 6c6539dd
  David Monllaó authored Mar 24, 2015
  
  6c6539dd
- Merge branch 'MDL-47003-master' of git://github.com/merrill-oakland/moodle · b6f7863e
  David Monllaó authored Mar 24, 2015
  
  b6f7863e
- Merge branch 'MDL-48718-master' of git://github.com/jleyva/moodle · 6ae45106
  Eloy Lafuente authored Mar 24, 2015
  
  6ae45106
- Merge branch 'MDL-43770-master' of https://github.com/lucisgit/moodle · 20e955a1
  Eloy Lafuente authored Mar 24, 2015
  
  20e955a1
- Merge branch 'wip-MDL-35482-master' of git://github.com/satrun77/moodle · e448df5e
  Eloy Lafuente authored Mar 24, 2015
  
  e448df5e
- Merge branch 'MDL-32285_master' of https://github.com/nadavkav/moodle · 0b8cb023
  Eloy Lafuente authored Mar 24, 2015
  
  0b8cb023
- MDL-49327 marking guide: Added condition on definitionid. · ea33260c
  Nikita Kalinin authored Mar 02, 2015
  
  ea33260c
23 Mar, 2015 5 commits
- Merge branch 'wip_MDL-49327_2.9_guide_getinstance' of https://github.com/nixorv/moodle · c1f4001b
  Dan Poltawski authored Mar 23, 2015
  
  c1f4001b
- Merge branch 'MDL-48443-master' of git://github.com/jleyva/moodle · 51a1d6bb
  Dan Poltawski authored Mar 23, 2015
  
  51a1d6bb
- Merge branch 'wip-mdl-49432' of https://github.com/rajeshtaneja/moodle · 07eb5a1f
  Dan Poltawski authored Mar 23, 2015
  
  07eb5a1f
- Merge branch 'MDL-35280_m29v2' of https://github.com/sbourget/moodle · 6b578e96
  Dan Poltawski authored Mar 23, 2015
  
  6b578e96
- Merge branch 'master_MDL-48419' of https://github.com/danmarsden/moodle · 68d52a73
  Dan Poltawski authored Mar 23, 2015
  
  68d52a73