Commits · 3ec7ea98a124b497b6b068836d9f5bd0fcf7b17d · moodle / moodle · GitLab

05 Nov, 2013 3 commits
- MDL-42706 mod_book: Undefined CFG in pluginfile function · 3ec7ea98
  Frederic Massart authored Nov 05, 2013
  
  3ec7ea98
- MDL-42464 mod_chat: Correct use of amp; in session link · 4816e19a
  Andrew Nicols authored Nov 05, 2013 and Dan Poltawski committed Nov 05, 2013
  
  4816e19a
- Merge branch 'w45_MDL-42512_m26_filtermess' of https://github.com/skodak/moodle · 9995aa38
  Damyon Wiese authored Nov 05, 2013
  
  9995aa38
04 Nov, 2013 37 commits
- Merge branch 'MDL-42273-master' of git://github.com/ankitagarwal/moodle · 24a922e9
  Dan Poltawski authored Nov 04, 2013
  
  24a922e9
- Merge branch 'MDL-42363_master' of git://github.com/dmonllao/moodle · dcc08e55
  Dan Poltawski authored Nov 04, 2013
  
  dcc08e55
- Merge branch 'wip-MDL-42270_master_2' of git://github.com/gjb2048/moodle · a28c6b44
  Dan Poltawski authored Nov 04, 2013
  
  a28c6b44
- Merge branch 'MDL-42548' of git://github.com/timhunt/moodle · 5e70fc1f
  Dan Poltawski authored Nov 04, 2013
  
  5e70fc1f
- Merge branch 'MDL-42464-master' of git://github.com/andrewnicols/moodle · efe938fc
  Dan Poltawski authored Nov 04, 2013
  
  efe938fc
- Merge branch 'MDL-42592_master' of https://github.com/markn86/moodle · 4a17894a
  Dan Poltawski authored Nov 04, 2013
  
  4a17894a
- Merge branch 'MDL-42453_master' of git://github.com/lazydaisy/moodle · 2c7b23a2
  Dan Poltawski authored Nov 04, 2013
  
  2c7b23a2
- MDL-42533 conditionlib: Add clarifying comments · c6cb4f8e
  Dan Poltawski authored Nov 04, 2013
  
  c6cb4f8e
- Merge branch 'MDL-42533-master' of git://github.com/FMCorz/moodle · 07ba528b
  Dan Poltawski authored Nov 04, 2013
  
  07ba528b
- Merge branch 'MDL-42355_editpdf_deselect_comment' of git://github.com/davosmith/moodle · 6db9f414
  Dan Poltawski authored Nov 04, 2013
```
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
```
  6db9f414
- Merge branch 'wip-mdl-41849' of https://github.com/rajeshtaneja/moodle · 22379484
  Dan Poltawski authored Nov 04, 2013
  
  22379484
- Merge branch '42350-26' of git://github.com/samhemelryk/moodle · 81da82f5
  Dan Poltawski authored Nov 04, 2013
  
  81da82f5
- MDL-42332 Automate MDLQA-5260 and MDLQA-5261 - A badge can be awarded based on... · 066ef320
  Jerome Mouneyrac authored Oct 24, 2013 and Dan Poltawski committed Nov 04, 2013
```
MDL-42332 Automate MDLQA-5260 and MDLQA-5261 - A badge can be awarded based on activity and course completion + add i_trigger_cron behat step
```
  066ef320
- MDL-42331 Automate MDLQA-5258 - A teacher can add and allocate a course badge · 68c13c68
  Jerome Mouneyrac authored Oct 22, 2013 and Dan Poltawski committed Nov 04, 2013
  
  68c13c68
- Merge branch 'w45_MDL-42525_m26_plugininfoperf' of https://github.com/skodak/moodle · b50bd4bc
  Damyon Wiese authored Nov 04, 2013
  
  b50bd4bc
- Merge branch 'wip-mdl-42537' of https://github.com/rajeshtaneja/moodle · 28cc8d4b
  Dan Poltawski authored Nov 04, 2013
```
Conflicts:
	lib/upgrade.txt
```
  28cc8d4b
- MDL-42631 Filepicker: swap the alt attribute to a title attribute to help usability · 73b80792
  Jason Fowler authored Nov 01, 2013
  
  73b80792
- MDL-41849 Quiz: Quiz send mail from noreply user · 5540b2ca
  Rajesh Taneja authored Nov 04, 2013
```
Mails should be send by noreply user and not admin user
```
  5540b2ca
- Merge branch 'MDL-42551' of git://github.com/stronk7/moodle · 71fbce44
  Dan Poltawski authored Nov 04, 2013
  
  71fbce44
- MDL-42330 Automate MDLQA-5257 - An admin can award a site badge · 844d74d7
  Jerome Mouneyrac authored Oct 21, 2013 and Dan Poltawski committed Nov 04, 2013
  
  844d74d7
- Merge branch 'MDL-42604-master' of git://github.com/ankitagarwal/moodle · 8be0ca75
  Marina Glancy authored Nov 04, 2013
  
  8be0ca75
- Merge branch 'w45_MDL-42044_m26_zipaddon' of https://github.com/skodak/moodle · db6767ae
  Dan Poltawski authored Nov 04, 2013
  
  db6767ae
- MDL-42147 filepicker: fixed dialog box css issue on IE9. · 4bbacb86
  rwijaya authored Nov 04, 2013 and Damyon Wiese committed Nov 04, 2013
```
This patch fix the following issue repository icon size, dialog title bar background color and rounded corner for dialog box.

Conflicts:

	theme/bootstrapbase/style/moodle.css
```
  4bbacb86
- MDL-42537 calendar: locale charset on windows will come from calendartype · d61d3e82
  Rajesh Taneja authored Nov 01, 2013
```
date_format_string() will now convert date on windows based on calendar type used
```
  d61d3e82
- MDL-42287 behat: Use string from scorm content, instead of scorm structure · e5eff0b6
  Ankit Agarwal authored Nov 04, 2013 and Dan Poltawski committed Nov 04, 2013
  
  e5eff0b6
- MDL-42350 assign: Test group submission + drafts · 2bd27878
  Damyon Wiese authored Nov 04, 2013
  
  2bd27878
- MDL-42350 mod_assign: fixed display of submission button · 7a47babb
  Sam Hemelryk authored Oct 31, 2013
  
  7a47babb
- MDL-42111 fix trailing whitespace · 32bf2cfc
  Dan Poltawski authored Nov 04, 2013
  
  32bf2cfc
- Merge branch 'MDL-42111' of git://github.com/rwijaya/moodle · 466fa368
  Dan Poltawski authored Nov 04, 2013
```
Conflicts:
	theme/bootstrapbase/style/moodle.css
```
  466fa368
- MDL-42512 finally fix the indentation of filter management page · 372154ff
  Petr Škoda authored Nov 04, 2013
  
  372154ff
- MDL-42512 fix and cleanup filter management page · 137f573c
  Petr Škoda authored Oct 24, 2013
  
  137f573c
- Merge branch 'MDL-34654-master' of git://github.com/sammarshallou/moodle · f6015bbf
  Damyon Wiese authored Nov 04, 2013
  
  f6015bbf
- Merge branch 'MDL-42494-workshop-exception' of git://github.com/mudrd8mz/moodle · b763a03d
  Dan Poltawski authored Nov 04, 2013
  
  b763a03d
- Merge branch 'MDL-42429_master' of https://github.com/markn86/moodle · 23f13c53
  Marina Glancy authored Nov 04, 2013
  
  23f13c53
- Merge branch 'wip-MDL-42577-master' of git://github.com/marinaglancy/moodle · 8e23283c
  Sam Hemelryk authored Nov 04, 2013
  
  8e23283c
- Merge branch 'MDL-42566_master' of https://github.com/markn86/moodle · 197ab6ef
  Marina Glancy authored Nov 04, 2013
  
  197ab6ef
- MDL-42286 fix trailing whitespace · afc33a9a
  Dan Poltawski authored Nov 04, 2013
  
  afc33a9a