moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
60847 commits 37 branches 540 tags 1.3 GiB
Commit graph

60847 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
ac8b3d845e Merge branch 'MDL-39276_clean' of git://github.com/lazydaisy/moodle 2013-04-25 00:27:03 +02:00
Eloy Lafuente (stronk7)
e4083853c4 MDL-39138 theme_bootstrap: whitespace line 2013-04-25 00:01:32 +02:00
Eloy Lafuente (stronk7)
4017b1f76a Merge branch 'wip-MDL-39138-master' of git://github.com/ds125v/moodle 
Conflicts:
	theme/bootstrap/style/generated.css
 2013-04-25 00:00:23 +02:00
Eloy Lafuente (stronk7)
274511f0cb Merge branch 'MDL-35364' of git://github.com/timhunt/moodle 2013-04-24 23:35:46 +02:00
Mary Evans
109cdf6bd8 MDL-39276 theme_clean: Renamed Simple theme to Clean theme. 2013-04-24 21:35:15 +01:00
Dan Poltawski
ba26ed9cac Merge branch 'MDL-39283' of git://github.com/jmvedrine/moodle 2013-04-24 14:33:00 +01:00
David Scotson
68ce389682 MDL-39138 theme_bootstrap: Revert Settings/Nav styles 2013-04-24 14:01:34 +01:00
Dan Poltawski
088c2616ec Merge branch 'wip-MDL-39297-master' of git://github.com/marinaglancy/moodle 2013-04-24 11:47:08 +01:00
Dan Poltawski
a461c6d444 Merge branch 'MDL-38415-master' of git://github.com/FMCorz/moodle 2013-04-24 11:39:08 +01:00
Dan Poltawski
f1b0908b8a MDL-38597 forum: fix incompetent programmer error ;-) 
Shameful, Fred!
 2013-04-24 10:02:41 +01:00
Dan Poltawski
6f0fdc9bb2 Merge branch 'MDL-38597-master-int' of git://github.com/FMCorz/moodle 2013-04-24 09:57:22 +01:00
Dan Poltawski
c1ae8606bd Merge branch 'MDL-38572-master' of git://github.com/FMCorz/moodle 2013-04-24 09:53:25 +01:00
Damyon Wiese
de17527022 MDL-32946: Be consistent with use of alt/title. 
Re: Block dock/undock links.
 2013-04-24 16:10:43 +08:00
Damyon Wiese
11b6045b09 Merge branch 'wip-MDL-32946-master' of git://github.com/phalacee/moodle 2013-04-24 16:10:30 +08:00
Dan Poltawski
9da8c53295 Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle 2013-04-24 09:08:23 +01:00
Dan Poltawski
e6c91f99ec Merge branch 'MDL-38892' of git://github.com/rwijaya/moodle 2013-04-24 08:16:37 +01:00
Damyon Wiese
7d45396306 Merge branch 'MDL-34939-master' of https://github.com/lucisgit/moodle 2013-04-24 15:01:35 +08:00
Rossiani Wijaya
819b1de681 MDL-38892 data module: Fixed action setType to use PARAM_ALPHANUM 2013-04-24 13:49:09 +08:00
Jason Fowler
473327030e MDL-32946 - Blocks - Improving image alts for accessibility. 2013-04-24 13:06:22 +08:00
Damyon Wiese
a6e22a88c7 Merge branch 'wip-MDL-39326-m25' of git://github.com/samhemelryk/moodle 2013-04-24 12:53:16 +08:00
Damyon Wiese
c65bf47276 Merge branch 'wip-mdl-38851' of git://github.com/rajeshtaneja/moodle 2013-04-24 11:39:13 +08:00
Rajesh Taneja
81dd294f06 MDL-38851 Admin: Fixed setType notice for cache 2013-04-24 11:18:30 +08:00
Rajesh Taneja
ac31413e95 MDL-38851 Admin: Fixed setType notice for webservice 2013-04-24 11:18:30 +08:00
Sam Hemelryk
c31978b8ff MDL-39326 css: removed unused chunk array search 2013-04-24 14:02:57 +12:00
Sam Hemelryk
13b0140a87 MDL-39326 css: no passed the no svg key to chunking when required 2013-04-24 14:02:52 +12:00
Eloy Lafuente (stronk7)
14559e1849 MDL-38972 xmldb: amend comments. 2013-04-24 02:09:34 +02:00
Eloy Lafuente (stronk7)
01159be8de Merge branch 'w16_MDL-38972_m25_oraindex' of git://github.com/skodak/moodle 2013-04-24 02:02:20 +02:00
Eloy Lafuente (stronk7)
bdeda339b4 Merge branch 'wip-MDL-38441-m25' of git://github.com/samhemelryk/moodle 2013-04-23 23:41:47 +02:00
Davo Smith
c23ff8e3a5 MDL-39219 mod_scorm - make sure YUI JSON module is loaded 2013-04-23 18:58:09 +01:00
Dan Poltawski
89275dcf80 Merge branch 'MDL-37784' of git://github.com/jmvedrine/moodle 2013-04-23 13:00:30 +01:00
Dan Poltawski
88dbfc453e Merge branch 'MDL-39296-master' of git://github.com/ankitagarwal/moodle 2013-04-23 12:50:44 +01:00
Petr Škoda
cc1e433286 MDL-39306 fix course search regression 
Oracle handling of NULLs is totally wrong and crazy!
 2013-04-23 12:36:50 +02:00
Jean-Michel Vedrine
b31d6664e6 MDL-39283 GIFT and XML question export broken for unsupported qtypes 
Do no write any data to the export for unsupported qtypes
 2013-04-23 09:42:53 +02:00
Frederic Massart
fbe9f668b2 MDL-38597 forum: Reformat the module settings form 2013-04-23 14:52:09 +08:00
Jean-Michel Vedrine
dc5133edca MDL-37784 Adaptive no penalty display wrong penalty info 
Adaptive Mode tells students they have been penalized even when set to no penalties
 2013-04-23 08:30:42 +02:00
Rajesh Taneja
962b1bafc4 MDL-38851 Admin: Fixed setType notice for portfolio 2013-04-23 14:17:39 +08:00
Damyon Wiese
a4fea69fde MDL-34933 Fix bad merge (grr) 2013-04-23 12:15:17 +08:00
Ankit Agarwal
647a3fc81c MDL-39296 scorm reports: Fix undefined variables in graphs report 2013-04-23 12:03:00 +08:00
Marina Glancy
28b93e2d5a MDL-39297 fixed mistype in tag name label 2013-04-23 12:45:22 +10:00
Frederic Massart
dfb38e43f7 MDL-38415 course: Renaming course overview files to course summary files 2013-04-23 10:12:23 +08:00
Frederic Massart
e158614134 MDL-38415 admin: Reorder default course settings 2013-04-23 10:12:23 +08:00
Frederic Massart
169a974df7 MDL-38415 course: Heavy redesign of the course settings form 2013-04-23 10:12:23 +08:00
Frederic Massart
aec15827b5 MDL-38415 course: Reformat edit form 
AMOS BEGIN
 MOV [availability_help,core],[visible_help,core]
 MOV [category_help,core],[coursecategory_help,core]
AMOS END
 2013-04-23 10:12:23 +08:00
Rossiani Wijaya
2e0ba150b3 MDL-38892 data module: Fixed setType warning 2013-04-23 09:57:58 +08:00
Damyon Wiese
b0c4e47499 Merge branch 'MDL-34933_master' of https://github.com/mchurchward/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-04-23 09:20:05 +08:00
Damyon Wiese
3e8e66f454 Merge branch 'wip-MDL-39294-m25' of git://github.com/samhemelryk/moodle 2013-04-23 08:59:10 +08:00
Sam Hemelryk
7376692527 Merge branch 'MDL-39281-master' of git://github.com/danpoltawski/moodle 2013-04-23 10:17:03 +12:00
Sam Hemelryk
0153e4e686 MDL-39294 cache: added missing setType calls to admin forms 2013-04-23 09:41:40 +12:00
Tim Hunt
4a7cc24808 MDL-35364 shorten text: don't return invalid HTML. 
I also broke the unit tests into more, smaller, named tests, so that
when things start failing, more tests are run, and it is clearer what
the problem is.

In a couple of cases, I adjusted the $ideal lenght in the test. A
careful counting of the characters in the test input (added as comments)
suggests that the new values make for better tests.
 2013-04-22 19:21:40 +01:00
Dan Poltawski
fe5bb43ae5 Merge branch 'MDL-39264-master-int' of git://github.com/FMCorz/moodle 2013-04-22 17:23:43 +01:00