Commits · e5f7cce1c1ff4febc5f4358911fb426144d1d23b · moodle / moodle · GitLab

14 Jan, 2014 34 commits
- Merge branch 'master_MDL-43222' of git://github.com/danmarsden/moodle · e5f7cce1
  Eloy Lafuente authored Jan 14, 2014
  
  e5f7cce1
- Merge branch '35597-27' of git://github.com/samhemelryk/moodle · da47e297
  Eloy Lafuente authored Jan 14, 2014
  
  da47e297
- Merge branch 'w02_MDL-43537_m27_env' of https://github.com/skodak/moodle · 1b92203e
  Eloy Lafuente authored Jan 14, 2014
  
  1b92203e
- Merge branch 'MDL-43664-master' of git://github.com/andrewnicols/moodle · 473924df
  Dan Poltawski authored Jan 14, 2014
  
  473924df
- Merge branch 'MDL-43584_master' of git://github.com/dmonllao/moodle · 718f42ae
  Damyon Wiese authored Jan 14, 2014
  
  718f42ae
- Merge branch 'm27_MDL-43577_Incorrect_Variable_Expansion' of https://github.com/scara/moodle · 824dccea
  Dan Poltawski authored Jan 14, 2014
  
  824dccea
- Merge branch 'MDL-43642_master' of git://github.com/dmonllao/moodle · 2c9c8c7f
  Dan Poltawski authored Jan 14, 2014
  
  2c9c8c7f
- Merge branch 'm27_MDL-43575_Typo_In_The_Overridden_setOption' of https://github.com/scara/moodle · 00ae4c4e
  Dan Poltawski authored Jan 14, 2014
  
  00ae4c4e
- Merge branch 'MDL-43178_forum' of https://github.com/andyjdavis/moodle · b901d0e9
  Dan Poltawski authored Jan 14, 2014
  
  b901d0e9
- Merge branch 'MDL-43531-master' of git://github.com/andrewnicols/moodle · a1ac22b8
  Damyon Wiese authored Jan 14, 2014
  
  a1ac22b8
- Merge branch 'master_MDL-41577' of git://github.com/danmarsden/moodle · 2be353c1
  Dan Poltawski authored Jan 14, 2014
  
  2be353c1
- Merge branch 'w02_MDL-43529_m27_globals' of https://github.com/skodak/moodle · 88457992
  Dan Poltawski authored Jan 14, 2014
  
  88457992
- Merge branch 'MDL-40918_master' of https://github.com/markn86/moodle · 4198f7f9
  Dan Poltawski authored Jan 14, 2014
  
  4198f7f9
- Merge branch 'w02_MDL-43511_m27_bankcache' of https://github.com/skodak/moodle · 76154981
  Damyon Wiese authored Jan 14, 2014
  
  76154981
- MDL-40313 question: build shifter after js changes · 81f7090b
  Dan Poltawski authored Jan 14, 2014
  
  81f7090b
- Merge branch 'MDL-43302-master' of git://github.com/andrewnicols/moodle · f27e462b
  Damyon Wiese authored Jan 14, 2014
  
  f27e462b
- Merge branch 'MDL-40313' of git://github.com/timhunt/moodle · 198b1fac
  Dan Poltawski authored Jan 14, 2014
  
  198b1fac
- Merge branch 'MDL-43371-master' of git://github.com/FMCorz/moodle · c98ee8cd
  Damyon Wiese authored Jan 14, 2014
  
  c98ee8cd
- Merge branch 'MDL-43460-master' of git://github.com/FMCorz/moodle · b6dc2b72
  Damyon Wiese authored Jan 14, 2014
  
  b6dc2b72
- Merge branch 'w02_MDL-43488_m27_signreq' of https://github.com/skodak/moodle · 9289d5fe
  Damyon Wiese authored Jan 14, 2014
  
  9289d5fe
- Merge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle · 961f70ad
  Damyon Wiese authored Jan 14, 2014
  
  961f70ad
- Merge branch 'MDL-35423-master' of git://github.com/andrewnicols/moodle · f8a60dfe
  Damyon Wiese authored Jan 14, 2014
```
Conflicts:
	course/yui/build/moodle-course-modchooser/moodle-course-modchooser-min.js
	course/yui/dragdrop/dragdrop.js
```
  f8a60dfe
- MDL-40056 events: Replace old add_to_log calls with new events · 0a616190
  Ankit Agarwal authored Jan 07, 2014
  
  0a616190
- MDL-40056 events: Add unit tests for new events · 25e8023d
  Ankit Agarwal authored Jan 07, 2014
  
  25e8023d
- MDL-40056 events: Created Event classes to replace add_to_log() - mod_scorm · a501fe13
  Ankit Agarwal authored Jan 07, 2014
```
Created attempt_deleted event
Created interactions_viewed event
Created report_viewed event
Created sco_launched event
Created tracks_viewed event
Created user_report_viewed event
Created course module related events
```
  a501fe13
- Merge branch 'MDL-43610-m' of git://github.com/micaherne/moodle · 49ca1e77
  Damyon Wiese authored Jan 14, 2014
  
  49ca1e77
- Merge branch 'master_MDL-42792' of git://github.com/danmarsden/moodle · 986c3f27
  Dan Poltawski authored Jan 14, 2014
  
  986c3f27
- Merge branch 'MDL-43412' of git://github.com/timhunt/moodle · 4be67945
  Dan Poltawski authored Jan 14, 2014
  
  4be67945
- MDL-43664 Javascript: Use YUI indexOf for pending_js tracking · 06acdf04
  Andrew Nicols authored Jan 13, 2014
```
Some old browsers do not support indexOf and so cannot determine whether JS
script is in progress. The YUI Y.Array module polyfills the indexOf
functionality when it does not exist.
```
  06acdf04
- MDL-33952 Assignment: Remove behat tests for mod_assignment - it is not a real activity anymore. · 1bedb6b9
  Damyon Wiese authored Jan 14, 2014
  
  1bedb6b9
- Merge branch 'MDL-43109' of https://github.com/mdikih/moodle · 295f7a61
  Eloy Lafuente authored Jan 13, 2014
  
  295f7a61
- MDL-43575 Libraries Google_CurlIO ext, typo in the overridden setOption(). · 753b71c7
  Matteo Scaramuccia authored Dec 30, 2013
  
  753b71c7
- MDL-43577 Messages Incorrect variable expansion in the message template. · f5482be6
  Matteo Scaramuccia authored Jan 05, 2014
  
  f5482be6
- Merge branch 'MDL-43395-master' of git://github.com/danpoltawski/moodle · c33eb444
  Eloy Lafuente authored Jan 13, 2014
  
  c33eb444
13 Jan, 2014 6 commits
- Merge branch 'MDL-33600-master' of git://github.com/damyon/moodle · b9da30cf
  Eloy Lafuente authored Jan 13, 2014
  
  b9da30cf
- Merge branch 'MDL-40849-master' of git://github.com/FMCorz/moodle · 06cdbf83
  Dan Poltawski authored Jan 13, 2014
  
  06cdbf83
- MDL-40849 gradingform_guide: Fixed CSS issues with Bootstrapbase · bfa0c3ab
  Frederic Massart authored Jan 07, 2014
  
  bfa0c3ab
- Merge branch 'MDL-33952-master' of git://github.com/damyon/moodle · d1426e28
  Dan Poltawski authored Jan 13, 2014
```
Conflicts:
	mod/assignment/lang/en/assignment.php
```
  d1426e28
- Merge branch '43598-43262-27' of git://github.com/samhemelryk/moodle · 8c0ddd43
  Dan Poltawski authored Jan 13, 2014
```
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js
	lib/yui/src/notification/js/dialogue.js
```
  8c0ddd43
- Merge branch 'MDL-39603-master' of git://github.com/FMCorz/moodle · dbfdd1a4
  Dan Poltawski authored Jan 13, 2014
```
Conflicts:
	theme/bootstrapbase/style/moodle.css
```
  dbfdd1a4