Commits · d4c01301ec3ed9624e39bf75cce4ec93e54733a5 · moodle / moodle · GitLab

25 Feb, 2014 17 commits
- Merge branch 'MDL-43882_master' of git://github.com/dmonllao/moodle · d4c01301
  Dan Poltawski authored Feb 25, 2014
  
  d4c01301
- Merge branch '44255-27' of git://github.com/samhemelryk/moodle · 5c7a266e
  Damyon Wiese authored Feb 25, 2014
```
Conflicts:
	user/profile.php
```
  5c7a266e
- Merge branch 'wip-mdl-40919' of https://github.com/rajeshtaneja/moodle · 03b8d9e3
  Damyon Wiese authored Feb 25, 2014
  
  03b8d9e3
- MDL-18633 admin: Added capability string for user:viewlastip · e49b94c9
  Rajesh Taneja authored Feb 25, 2014 and Damyon Wiese committed Feb 25, 2014
  
  e49b94c9
- MDL-43882 lib: Adding info about the new performance metric · 3b635513
  David Monllaó authored Feb 25, 2014
```
The performance metric was introduced in MDL-43758.
```
  3b635513
- Merge branch '44185-27' of git://github.com/samhemelryk/moodle · a5fc3f08
  Dan Poltawski authored Feb 25, 2014
  
  a5fc3f08
- Merge branch '44315-27' of git://github.com/samhemelryk/moodle · 494afb81
  Damyon Wiese authored Feb 25, 2014
  
  494afb81
- MDL-40619 mod_quiz: Remove commented non-js behat scenario · a18c3591
  Damyon Wiese authored Feb 25, 2014
  
  a18c3591
- Merge branch 'wip-MDL-40619-master' of git://github.com/marinaglancy/moodle · fce9daa8
  Damyon Wiese authored Feb 25, 2014
  
  fce9daa8
- Merge branch 'MDL-40916_master' of https://github.com/markn86/moodle · 3d4cec64
  Dan Poltawski authored Feb 25, 2014
  
  3d4cec64
- Merge branch 'w08_MDL-42889_m27_vir' of https://github.com/skodak/moodle · 63e604f8
  Damyon Wiese authored Feb 25, 2014
  
  63e604f8
- Merge branch 'MDL-43405_master' of https://github.com/markn86/moodle · e78e671f
  Dan Poltawski authored Feb 25, 2014
  
  e78e671f
- Merge branch 'MDL-42923' of git://github.com/jleyva/moodle · b33fbd42
  Damyon Wiese authored Feb 25, 2014
```
Conflicts:
	version.php
```
  b33fbd42
- Merge branch 'MDL-43478-master-v4' of git://github.com/jamiepratt/moodle · 305b15f4
  Dan Poltawski authored Feb 25, 2014
  
  305b15f4
- MDL-38903: Version bump for lang strings · 84427252
  Damyon Wiese authored Feb 25, 2014
  
  84427252
- Merge branch 'MDL-38903-master' of git://github.com/phalacee/moodle · ed24890b
  Damyon Wiese authored Feb 25, 2014
```
Conflicts:
	theme/bootstrapbase/style/moodle.css
```
  ed24890b
- MDL-38903 File picker: making upload form with more semantic HTML · 88d366e5
  Jason Fowler authored Jan 17, 2014
  
  88d366e5
24 Feb, 2014 23 commits
- Merge branch 'MDL-43837_master' of git://github.com/dmonllao/moodle · 237243db
  Damyon Wiese authored Feb 24, 2014
  
  237243db
- MDL-44101 Javascript: Apply widget-focusonclose to some core dialogues · 29ee3cf7
  Andrew Nicols authored Feb 11, 2014 and Damyon Wiese committed Feb 24, 2014
```
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
```
  29ee3cf7
- MDL-44101 Javascript: Introduce a module to focus after widget close · 7ae6ce00
  Andrew Nicols authored Feb 11, 2014 and Damyon Wiese committed Feb 24, 2014
```
This module supports focusing on a specified Node, or attempting to
determine the Node which caused the displayed the Widget to return focus to
that location.
```
  7ae6ce00
- Merge branch 'MDL-44108_master' of git://github.com/dmonllao/moodle · dea614e4
  Damyon Wiese authored Feb 24, 2014
  
  dea614e4
- Merge branch 'MDL-44111_master' of git://github.com/dmonllao/moodle · 8c396677
  Damyon Wiese authored Feb 24, 2014
  
  8c396677
- Merge branch 'wip-MDL-44139-master' of git://github.com/ds125v/moodle · ccc29667
  Damyon Wiese authored Feb 24, 2014
```
Conflicts:
	theme/bootstrapbase/style/moodle.css
```
  ccc29667
- Merge branch '44159-27' of git://github.com/samhemelryk/moodle · 6258e288
  Damyon Wiese authored Feb 24, 2014
  
  6258e288
- Merge branch 'wip-MDL-44168-master' of git://github.com/ds125v/moodle · 28a03399
  Damyon Wiese authored Feb 24, 2014
```
Conflicts:
	theme/bootstrapbase/style/moodle.css
```
  28a03399
- Merge branch '41175-27' of git://github.com/samhemelryk/moodle · 956c7f2c
  Damyon Wiese authored Feb 24, 2014
  
  956c7f2c
- Merge branch '41176-27' of git://github.com/samhemelryk/moodle · 5bc18d29
  Damyon Wiese authored Feb 24, 2014
  
  5bc18d29
- Merge branch '41177-27' of git://github.com/samhemelryk/moodle · 801e26ed
  Damyon Wiese authored Feb 24, 2014
  
  801e26ed
- Merge branch '41178-27' of git://github.com/samhemelryk/moodle · 9383bef6
  Damyon Wiese authored Feb 24, 2014
  
  9383bef6
- MDL-40919 mod_survey: replaced add_to_log with events · 9e176aa2
  Rajesh Taneja authored Feb 21, 2014
  
  9e176aa2
- Merge branch '41179-27' of git://github.com/samhemelryk/moodle · 18bc3fae
  Damyon Wiese authored Feb 24, 2014
  
  18bc3fae
- Merge branch '44182-27' of git://github.com/samhemelryk/moodle · 5c47971b
  Damyon Wiese authored Feb 24, 2014
  
  5c47971b
- Merge branch '44183-27' of git://github.com/samhemelryk/moodle · b6865832
  Damyon Wiese authored Feb 24, 2014
  
  b6865832
- Merge branch 'MDL-44214-master' of git://github.com/andrewnicols/moodle · f08c69ab
  Damyon Wiese authored Feb 24, 2014
  
  f08c69ab
- Merge branch 'MDL-44247-master' of git://github.com/FMCorz/moodle · 2926b254
  Damyon Wiese authored Feb 24, 2014
  
  2926b254
- MDL-44264 Badges: Cleanup imports in previous commit. · 8da433f0
  Damyon Wiese authored Feb 24, 2014
  
  8da433f0
- Merge branch 'MDL-44264' of https://github.com/merrill-oakland/moodle · 9a85b4e0
  Damyon Wiese authored Feb 24, 2014
  
  9a85b4e0
- Merge branch '44279-27' of git://github.com/samhemelryk/moodle · e848a930
  Damyon Wiese authored Feb 24, 2014
  
  e848a930
- Merge branch 'MDL-44286_master' of git://github.com/dmonllao/moodle · e3eaf61d
  Damyon Wiese authored Feb 24, 2014
  
  e3eaf61d
- Merge branch 'MDL-44288' of git://github.com/timhunt/moodle · 13c12da2
  Damyon Wiese authored Feb 24, 2014
  
  13c12da2