moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 11:56:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55069 commits 37 branches 544 tags 1.3 GiB
Commit graph

12496 commits

Author SHA1 Message Date
Sam Hemelryk
3222f6eca1 Merge branch 'w12_MDL-31857_m23_phpunit' of git://github.com/skodak/moodle 2012-03-22 10:44:04 +13:00
Petr Skoda
5bd4040866 MDL-31857basic phpunit support 
Thanks Eloy Lafuente, Tim Hunt and Sam Hemelryk for valuable feedback and ideas.
 2012-03-21 10:31:37 +01:00
Dan Poltawski
0a4660484c Merge branch 'master_MDL-27469' of git://github.com/danmarsden/moodle 
Conflicts:
	mod/scorm/version.php
    mod/scorm/db/upgrade.php
 2012-03-21 11:38:09 +08:00
Aparup Banerjee
5599f2062c Merge branch git://github.com/phalacee/moodle.git wip-MDL-30482-master 
- resolved conflicts
 - fixed up tab --> spaces
 2012-03-21 10:50:51 +08:00
Jason Fowler
c3963fbd9b MDL-30482 - Glossary - Adding capability to other areas using glossary 2012-03-21 10:22:53 +08:00
Aparup Banerjee
d7de3f2682 Merge branch 'wip-MDL-17327-master-v2' of git://github.com/abgreeve/moodle 2012-03-21 10:02:18 +08:00
adrian@moodle.com
72d4340a0e MDL-17327 - data - improved the sql query for very large advanced searches 2012-03-21 09:41:48 +08:00
Aaron Barnes
94db27498d MDL-27469 scorm: Add extra activity completion conditions 2012-03-21 09:48:38 +13:00
Sam Hemelryk
bc4340ca9c Merge branch 'MDL-32065-master-1' of git://git.luns.net.uk/moodle 2012-03-21 09:24:58 +13:00
Rossiani Wijaya
e053583fc7 MDL-31266 Lesson module: Improve feedback so that the responses are concatenated instead of overwritten 2012-03-20 21:56:18 +08:00
Rossiani Wijaya
49ef5d4c7f MDL-31775 Lesson Module: fixed start at last page seen bug 2012-03-20 17:32:58 +08:00
Aparup Banerjee
0e5c50e29a MDL-29848 glossary: fixed whitespace 2012-03-20 16:12:02 +08:00
Aparup Banerjee
aa4edcf614 Merge branch 'MDL-29848-master' of https://github.com/mackensen/moodle 2012-03-20 16:06:40 +08:00
Sam Hemelryk
ef844d0a15 Merge branch 'w12_MDL-32094_m23_phpstrict' of git://github.com/skodak/moodle 2012-03-20 16:47:17 +13:00
Sam Hemelryk
0ca579f2cd MDL-11047 mod_quiz: bumped version in upgrade after conflict resolution 2012-03-20 16:46:19 +13:00
Sam Hemelryk
270bdf5265 Merge branch 'MDL-11047' of git://github.com/mackensen/moodle 
Conflicts:
	mod/quiz/version.php
 2012-03-20 14:04:04 +13:00
Sam Hemelryk
b896c12bca Merge branch 'w12_MDL-32079_m23_folderrev' of git://github.com/skodak/moodle 2012-03-20 11:34:21 +13:00
Sam Hemelryk
f7dbc2814c Merge branch 'MDL-32064' of git://github.com/timhunt/moodle 2012-03-20 10:37:38 +13:00
Sam Hemelryk
47def74bb8 Merge branch 'wip-mdl-26674' of git://github.com/rajeshtaneja/moodle 2012-03-19 20:06:40 +13:00
Rajesh Taneja
476aea8d8b MDL-26674 wiki2.0: cleaned wiki event logging patch 2012-03-19 11:15:06 +08:00
Diane Villemure
b7921fc458 MDL-26674 wiki2.0: Fixed wiki activity log 2012-03-19 10:20:18 +08:00
Petr Skoda
fabbf4398b MDL-32094 some nasty quickforms hacks that should help with E_STRICT 
Note: we have stopped tracking our QuickForms hacks long ago.
 2012-03-18 18:39:37 +01:00
Petr Skoda
f20edd5208 MDL-32094 fix various E_STRICT compatibility problems 2012-03-18 18:37:24 +01:00
Petr Skoda
0ed6f71232 MDL-32094 fix E_STRICT issues in lesson API 
It is not possible to change method signatures in PHP...
 2012-03-18 18:36:04 +01:00
Petr Skoda
e7755fc627 MDL-32094 fix E_STRICT issues in assignment 2012-03-18 18:32:17 +01:00
Tim Hunt
ff3b7c85db MDL-32064 quiz navigation: JS form submit must fire submit event handlers. 2012-03-16 14:55:16 +00:00
Petr Skoda
60791f18cf MDL-32079 folder revision must be incremented after any file change 2012-03-16 10:11:07 +01:00
Dan Marsden
c1b81ff623 MDL-32080 SCORM - remove old css 2012-03-16 13:16:05 +13:00
Tim Hunt
0f0c0228b0 MDL-19125 module restrictions: document change in mod/upgrade.txt 2012-03-15 17:13:54 +00:00
Tim Hunt
88eca3cd26 MDL-19125 module restrictions: addinstance capabilities for all mods 2012-03-15 17:13:43 +00:00
Charles Fulton
33c8d37b6f MDL-11047 quiz: enable sequential navigation 2012-03-15 10:09:27 -07:00
Andrew Robert Nicols
536328fb0a MDL-32065 Allow feedback images to be themed 2012-03-15 11:48:21 +00:00
Aparup Banerjee
42c8e4d66d Merge branch 'master_MDL-31942' of git://github.com/danmarsden/moodle 2012-03-13 15:51:53 +08:00
Sam Hemelryk
c8c00cee80 MDL-29745 Fixed white space 2012-03-13 16:36:37 +13:00
Sam Hemelryk
a28c6b40fe Merge branch 'scorm_graph_report' of git://github.com/ankitagarwal/moodle 2012-03-13 16:35:15 +13:00
Aparup Banerjee
f3c5d3102d Merge branch 'MDL-30867' of git://github.com/rwijaya/moodle 2012-03-13 11:26:42 +08:00
Aparup Banerjee
6a0d8209d1 MDL-31910 Quiz : fixed whitespace 2012-03-13 10:15:05 +08:00
M Kassaei
137d60b66f MDL-31910 Quiz : Error on Manual Grading report 2012-03-13 10:13:27 +08:00
Ankit Agarwal
e2f6cb436a MDL-22895 scorm: Fixed up issues with graph report 2012-03-13 09:31:01 +08:00
Sam Hemelryk
db6d54c337 Merge branch 'MDL-31808-master-1' of git://git.luns.net.uk/moodle 2012-03-13 14:10:00 +13:00
Sam Hemelryk
fd9dbadb15 Merge branch 'MDL-31917-master-1' of git://git.luns.net.uk/moodle 2012-03-13 14:04:44 +13:00
Sam Hemelryk
595dc849dd Merge branch 'MDL-31919-master-2' of git://git.luns.net.uk/moodle 2012-03-13 14:00:41 +13:00
Eloy Lafuente (stronk7)
b20bb8454a Merge branch 'w11_MDL-31985_m23_lobsizes' of git://github.com/skodak/moodle 2012-03-13 00:15:59 +01:00
Sam Hemelryk
80fa598515 Merge branch 'MDL-31702' of git://github.com/timhunt/moodle 2012-03-13 10:34:03 +13:00
Sam Hemelryk
3108b6412c Merge branch 'MDL-31362_unused_constant' of git://github.com/andyjdavis/moodle 2012-03-13 10:10:36 +13:00
Ankit Kumar Agarwal
e61a71379c MDL-29745 SCORM Introducing new Graphs report for scorm module 2012-03-12 15:02:26 +08:00
Sam Hemelryk
fe0979ea3d Merge branch 'master_MDL-31888' of git://github.com/danmarsden/moodle 
Conflicts:
	mod/scorm/styles.css
 2012-03-12 17:29:39 +13:00
Sam Hemelryk
52cbd9cbd2 MDL-27304 mod_wiki: Fixed up phpdocs for globals 2012-03-12 17:20:37 +13:00
Sam Hemelryk
2774a46792 Merge branch 'MDL-27304-master' of https://github.com/mackensen/moodle 2012-03-12 17:20:01 +13:00
Charles Fulton
2d20d5488a MDL-31664 fix invalid boolean to string comparison 2012-03-12 17:02:38 +13:00