mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity
56,267 Commits 36 Branches 523 Tags
Commit Graph

56267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aparup Banerjee
47d474b66c Merge branch 'wip-MDL-30898-master' of git://github.com/phalacee/moodle 2012-09-11 11:05:25 +08:00
Sam Hemelryk
60871abb53 Merge branch 'master_MDL-34755' of git://github.com/danmarsden/moodle 2012-09-11 15:02:30 +12:00
Aparup Banerjee
2873330588 Merge branch 'wip-MDL-30818-master' of git://github.com/phalacee/moodle 2012-09-11 09:19:33 +08:00
Eloy Lafuente (stronk7)
e813835f5c Merge branch 'MDL-35134_master' of git://github.com/pauln/moodle 2012-09-11 02:50:56 +02:00
Eloy Lafuente (stronk7)
c0d716d7b9 Merge branch 'MDL-35171' of git://github.com/merrill-oakland/moodle 2012-09-11 02:44:30 +02:00
Eloy Lafuente (stronk7)
7772fed15d MDL-34338 mod_folder: delete unused $browser var. 2012-09-11 02:18:38 +02:00
Eloy Lafuente (stronk7)
caaf32f823 Merge branch 'wip-MDL-34338-master' of git://github.com/marinaglancy/moodle 2012-09-11 02:17:30 +02:00
Sam Hemelryk
6396fb3dab Merge branch 'master_MDL-35255' of git://github.com/danmarsden/moodle 2012-09-11 12:11:02 +12:00
Eloy Lafuente (stronk7)
29636a9af2 Merge branch 'MDL-34660' of git://github.com/raymondAntonio/moodle 2012-09-11 02:08:41 +02:00
Sam Hemelryk
4bf0aea9dd Merge branch 'MDL-34916_master' of git://github.com/kordan/moodle 2012-09-11 12:06:26 +12:00
Eloy Lafuente (stronk7)
50dca95dc4 Merge branch 'master_MDL-35123' of git://github.com/danmarsden/moodle 2012-09-11 02:02:49 +02:00
Eloy Lafuente (stronk7)
227b50eb43 Merge branch 'master_MDL-35208' of git://github.com/danmarsden/moodle 2012-09-11 01:56:51 +02:00
Eloy Lafuente (stronk7)
513480c22a Merge branch 'MDL-35257-master' of git://github.com/danpoltawski/moodle 2012-09-11 01:53:17 +02:00
Eloy Lafuente (stronk7)
70a491c20e Merge branch 'w37_MDL-35270_m24_oracohort' of git://github.com/skodak/moodle 2012-09-11 01:48:34 +02:00
Sam Hemelryk
20b133e7a3 MDL-34794 mod_assign: Fixed up style after integration 2012-09-11 11:34:10 +12:00
Sam Hemelryk
f28896b615 Merge branch 'MDL-34794' of git://github.com/raymondAntonio/moodle 2012-09-11 11:33:04 +12:00
Sam Hemelryk
7c4fe15b2d Merge branch 'MDL-27786-master' of git://github.com/ankitagarwal/moodle 2012-09-11 11:15:45 +12:00
Sam Hemelryk
204ce6858b Merge branch 'MDL-33374-master' of git://github.com/ankitagarwal/moodle 2012-09-11 11:10:39 +12:00
Sam Hemelryk
27b1b28552 Merge branch 'MDL-35007-master' of git://github.com/ankitagarwal/moodle 2012-09-11 11:07:29 +12:00
Eloy Lafuente (stronk7)
24543a2145 Merge branch 'MDL-35272-typo' of git://github.com/mudrd8mz/moodle 2012-09-11 01:03:06 +02:00
Sam Hemelryk
c91614ef52 Merge branch 'wip-MDL-32785-master-v3' of git://github.com/abgreeve/moodle 2012-09-11 10:38:23 +12:00
Eloy Lafuente (stronk7)
1f4cd1fcec Merge branch 'MDL-35301-master' of git://github.com/FMCorz/moodle 2012-09-10 23:45:47 +02:00
Eloy Lafuente (stronk7)
5e51915c80 Merge branch 'MDL-8307-master' of git://github.com/FMCorz/moodle 2012-09-10 23:35:12 +02:00
Eloy Lafuente (stronk7)
2c248bd416 Merge branch 'w37_MDL-35284_m24_borkedtoolbar' of git://github.com/skodak/moodle 
Conflicts:
	lib/editor/tinymce/version.php
 2012-09-10 22:13:36 +02:00
Petr Škoda
5ba3a966f6 MDL-35284 patch empty toolbar crashing TinyMCE 2012-09-10 22:10:25 +02:00
Eloy Lafuente (stronk7)
a8cdd8758b Merge branch 'w37_MDL-35318_m24_stringrevisions' of git://github.com/skodak/moodle 2012-09-10 20:39:19 +02:00
Petr Škoda
6dd4241f81 MDL-35318 fix lang revision incrementation conditions 2012-09-10 20:23:14 +02:00
Eloy Lafuente (stronk7)
e79802e04e Merge branch 'w37_MDL-35289_m24_tinymcelangs' of git://github.com/skodak/moodle 2012-09-10 16:54:43 +02:00
Eloy Lafuente (stronk7)
979b868cf1 Merge branch 'MDL-35343' of git://github.com/timhunt/moodle 2012-09-10 16:41:25 +02:00
Tim Hunt
8e8a397b16 MDL-35343 JavaScript visible in multichoice choice feedback. 
Also, Match correct answer, and calculated multi and multianswer
feedback.
 2012-09-10 13:06:47 +01:00
Aparup Banerjee
e2abebcbb2 Merge branch 'MDL-34944-master' of git://github.com/ankitagarwal/moodle 2012-09-10 17:15:00 +08:00
Aparup Banerjee
b3b79a58ee Merge branch 'MDL-35223-master' of git://github.com/ankitagarwal/moodle 2012-09-10 17:00:16 +08:00
David Monllao
0e0f3beb38 MDL-30857 block_community Removing comments hardcoded height 2012-09-10 15:01:31 +08:00
Aparup Banerjee
5ddaa60d49 Merge branch 'MDL-35264_master' of git://github.com/dmonllao/moodle 2012-09-10 14:37:40 +08:00
Aparup Banerjee
fda1d233a7 Merge branch 'MDL-27398_master' of git://github.com/dmonllao/moodle 2012-09-10 14:29:47 +08:00
Damyon Wiese
d0d4796b4a MDL-31276: Fixes for offline marking and team submissions 
Filenames in zip of all submission now contains the team group name.
 2012-09-10 14:18:42 +08:00
Damyon Wiese
df47b77f46 MDL-31276: Offline marking. Includes download/upload of csv grades. 
Also provides bulk upload/download of feedback files via zips.
 2012-09-10 14:18:32 +08:00
David Monllao
bd9cb43e09 MDL-27398 mod_chat Removing PAGE references 2012-09-10 14:09:02 +08:00
David Monllao
32b49bbd84 MDL-27398 mod_chat Adding file basic doc 2012-09-10 14:09:02 +08:00
David Monllao
24242682df MDL-27398 mod_chat Removing deprecated calls and moving dependencies 
Credit to Jorge Villalon
 2012-09-10 14:08:49 +08:00
David Monllao
e54370d7fb MDL-27398 mod_chat Adding CLI_SCRIPT to chat daemon 
Credit to Jorge Villalon
 2012-09-10 14:08:22 +08:00
Frederic Massart
20b12d5484 MDL-30829 Accessibility: Docking a block disables the accessible anchors 2012-09-10 13:34:20 +08:00
Adrian Greeve
8e73fbf5aa MDL-32785 - lib - Ignorning hard frozen fields when submitting data. 2012-09-10 11:12:10 +08:00
Eloy Lafuente (stronk7)
a306ceb1ec MDL-30018 restore: better answer matching. Credit goes to Tyler Bannister, thanks! 
On backup, contents are cleaned to be safe utf8. That was leading to
some matching problems on restore against not cleaned DB contents (for
already existing questions). This commit adds one fallback method to
perform the match against cleaned DB contents.
 2012-09-09 20:29:26 +02:00
Petr Škoda
79df150a62 MDL-35318 use new lang revision to invalidate TinyMCE lang caches 2012-09-09 12:18:32 +02:00
Petr Škoda
a46e11b5df MDL-35318 add lang revision counter and improve PHPUnit test reset 
We need this for hacks that need to find out if strings changed.
 2012-09-09 12:15:30 +02:00
Petr Škoda
29149f981c MDL-35289 use unmodified TinyMCE 2012-09-09 11:57:25 +02:00
Petr Škoda
7fc9433c87 MDL-35270 fix ambiguously defined column 
Credit goes to Sara Arjona, thanks.
 2012-09-08 10:49:00 +02:00
Jason Fowler
24eb0897cb MDL-29463 - Chat - Change socket_setopt to socket_set_options 2012-09-08 11:53:37 +08:00
Jason Fowler
5d03c9e044 MDL-30898 - Accessibility/Themes - Removing blink style selector to prevent use of blinking text 2012-09-08 11:51:26 +08:00