mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-03 07:19:09 +01:00
Code Issues Projects Releases Wiki Activity
64,868 Commits 36 Branches 523 Tags
1ddbe7815d
Commit Graph

64868 Commits

Author SHA1 Message Date
Damyon Wiese
1ddbe7815d Merge branch 'wip-MDL-42318-master' of https://github.com/marinaglancy/moodle 2013-11-05 11:06:23 +08:00
Ray Morris
82d305fafa MDL-42265 make Browse Users list scrollable for smaller screens 2013-11-05 10:49:20 +08:00
Damyon Wiese
6655b6102a MDL-42402 EditPDF: Fix the styles again 
More fixes for the vertical alignment of the images in the toolbar buttons and the dropdowns.
 2013-11-05 10:30:11 +08:00
Andrew Nicols
4816e19a6f MDL-42464 mod_chat: Correct use of amp; in session link 2013-11-05 09:50:33 +08:00
Damyon Wiese
9995aa3852 Merge branch 'w45_MDL-42512_m26_filtermess' of https://github.com/skodak/moodle 2013-11-05 09:31:41 +08:00
Dan Poltawski
24a922e953 Merge branch 'MDL-42273-master' of git://github.com/ankitagarwal/moodle 2013-11-04 23:40:33 +08:00
Dan Poltawski
dcc08e55b5 Merge branch 'MDL-42363_master' of git://github.com/dmonllao/moodle 2013-11-04 23:34:18 +08:00
Dan Poltawski
a28c6b440e Merge branch 'wip-MDL-42270_master_2' of git://github.com/gjb2048/moodle 2013-11-04 22:54:09 +08:00
Dan Poltawski
5e70fc1f9c Merge branch 'MDL-42548' of git://github.com/timhunt/moodle 2013-11-04 22:34:27 +08:00
Dan Poltawski
efe938fca5 Merge branch 'MDL-42464-master' of git://github.com/andrewnicols/moodle 2013-11-04 22:31:55 +08:00
Dan Poltawski
4a17894ac5 Merge branch 'MDL-42592_master' of https://github.com/markn86/moodle 2013-11-04 22:27:49 +08:00
Dan Poltawski
2c7b23a239 Merge branch 'MDL-42453_master' of git://github.com/lazydaisy/moodle 2013-11-04 22:17:19 +08:00
Dan Poltawski
c6cb4f8ec8 MDL-42533 conditionlib: Add clarifying comments 2013-11-04 22:04:01 +08:00
Dan Poltawski
07ba528bd4 Merge branch 'MDL-42533-master' of git://github.com/FMCorz/moodle 2013-11-04 21:51:57 +08:00
Dan Poltawski
6db9f41419 Merge branch 'MDL-42355_editpdf_deselect_comment' of git://github.com/davosmith/moodle 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
 2013-11-04 20:10:24 +08:00
Dan Poltawski
22379484fd Merge branch 'wip-mdl-41849' of https://github.com/rajeshtaneja/moodle 2013-11-04 19:35:01 +08:00
Dan Poltawski
81da82f5f3 Merge branch '42350-26' of git://github.com/samhemelryk/moodle 2013-11-04 17:21:29 +08:00
Jerome Mouneyrac
066ef320af 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 2013-11-04 17:17:58 +08:00
Jerome Mouneyrac
68c13c6804 MDL-42331 Automate MDLQA-5258 - A teacher can add and allocate a course badge 2013-11-04 17:15:44 +08:00
Damyon Wiese
b50bd4bcad Merge branch 'w45_MDL-42525_m26_plugininfoperf' of https://github.com/skodak/moodle 2013-11-04 16:44:54 +08:00
Dan Poltawski
28cc8d4b43 Merge branch 'wip-mdl-42537' of https://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/upgrade.txt
 2013-11-04 16:39:39 +08:00
Jason Fowler
73b80792e9 MDL-42631 Filepicker: swap the alt attribute to a title attribute to help usability 2013-11-04 16:34:02 +08:00
Rajesh Taneja
5540b2caf3 MDL-41849 Quiz: Quiz send mail from noreply user 
Mails should be send by noreply user and not admin user
 2013-11-04 16:29:55 +08:00
Dan Poltawski
71fbce4410 Merge branch 'MDL-42551' of git://github.com/stronk7/moodle 2013-11-04 16:21:25 +08:00
Jerome Mouneyrac
844d74d788 MDL-42330 Automate MDLQA-5257 - An admin can award a site badge 2013-11-04 16:18:32 +08:00
Marina Glancy
8be0ca758c Merge branch 'MDL-42604-master' of git://github.com/ankitagarwal/moodle 2013-11-04 19:16:23 +11:00
Dan Poltawski
db6767ae47 Merge branch 'w45_MDL-42044_m26_zipaddon' of https://github.com/skodak/moodle 2013-11-04 16:14:04 +08:00
rwijaya
4bbacb8607 MDL-42147 filepicker: fixed dialog box css issue on IE9. 
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
 2013-11-04 16:06:21 +08:00
Rajesh Taneja
d61d3e82d0 MDL-42537 calendar: locale charset on windows will come from calendartype 
date_format_string() will now convert date on windows based on calendar type used
 2013-11-04 15:54:19 +08:00
Ankit Agarwal
e5eff0b626 MDL-42287 behat: Use string from scorm content, instead of scorm structure 2013-11-04 15:52:42 +08:00
Damyon Wiese
2bd27878db MDL-42350 assign: Test group submission + drafts 2013-11-04 15:50:26 +08:00
Sam Hemelryk
7a47babb9e MDL-42350 mod_assign: fixed display of submission button 2013-11-04 15:50:25 +08:00
Dan Poltawski
32bf2cfc64 MDL-42111 fix trailing whitespace 2013-11-04 15:35:19 +08:00
Dan Poltawski
466fa368b5 Merge branch 'MDL-42111' of git://github.com/rwijaya/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-04 15:32:34 +08:00
Petr Škoda
372154ff15 MDL-42512 finally fix the indentation of filter management page 2013-11-04 08:28:51 +01:00
Petr Škoda
137f573cfd MDL-42512 fix and cleanup filter management page 2013-11-04 08:24:28 +01:00
Damyon Wiese
f6015bbf02 Merge branch 'MDL-34654-master' of git://github.com/sammarshallou/moodle 2013-11-04 15:22:43 +08:00
Dan Poltawski
b763a03ddb Merge branch 'MDL-42494-workshop-exception' of git://github.com/mudrd8mz/moodle 2013-11-04 14:51:16 +08:00
Marina Glancy
23f13c5304 Merge branch 'MDL-42429_master' of https://github.com/markn86/moodle 2013-11-04 17:27:57 +11:00
Sam Hemelryk
8e23283cbb Merge branch 'wip-MDL-42577-master' of git://github.com/marinaglancy/moodle 2013-11-04 14:24:46 +08:00
Marina Glancy
197ab6efef Merge branch 'MDL-42566_master' of https://github.com/markn86/moodle 2013-11-04 17:22:45 +11:00
Dan Poltawski
afc33a9ad1 MDL-42286 fix trailing whitespace 2013-11-04 14:14:30 +08:00
Dan Poltawski
fa5b21216f Merge branch 'MDL-42286_behat' of https://github.com/andyjdavis/moodle 2013-11-04 14:13:27 +08:00
Sam Hemelryk
acdb2159fb Merge branch 'MDL-42648_M26' of git://github.com/lazydaisy/moodle 2013-11-04 14:00:30 +08:00
Frederic Massart
37b6c65dfe MDL-41807 repository_filesystem: Coding style clean up 2013-11-04 13:35:04 +08:00
Frederic Massart
5df695d221 MDL-41807 repository_filesystem: Prevent access to parent directories 2013-11-04 13:34:59 +08:00
Damyon Wiese
e45910aff3 Merge branch 'MDL-42489-master' of git://github.com/ankitagarwal/moodle 2013-11-04 13:17:15 +08:00
Marina Glancy
753ce05b8c Merge branch 'MDL-42617' of git://github.com/jleyva/moodle 2013-11-04 16:14:35 +11:00
Damyon Wiese
d04bea30da Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle 2013-11-04 13:11:42 +08:00
Marina Glancy
ad5a1a5d48 Merge branch 'MDL-42633-master' of git://github.com/ankitagarwal/moodle 2013-11-04 15:59:27 +11:00