mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity
52,167 Commits 36 Branches 519 Tags
Commit Graph

52167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Petr Skoda
caee6e6c26 MDL-32251 E_STRICT fixes part 3 2012-03-29 15:24:30 +02:00
Petr Skoda
0bb48cc2a1 MDL-32250 import latest SimpleTest 1.1.0 2012-03-29 15:07:53 +02:00
Eloy Lafuente (stronk7)
a280078197 weekly release 2.3dev 2012-03-29 13:25:53 +02:00
Eloy Lafuente (stronk7)
db5d8b66c0 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-03-29 13:19:59 +02:00
Dan Poltawski
a4051353d1 Revert "Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle" 
This reverts commit 296c0247c6cc9e525721fc92b5a78c7146e6887d, reversing
changes made to 2511b0742a3695298d8216fe9723581c089909d7.

Conflicts:

	lib/db/upgrade.php
	version.php
 2012-03-29 16:07:30 +08:00
AMOS bot
0f78e4911c Automatically generated installer lang files 2012-03-29 00:31:42 +00:00
Eloy Lafuente (stronk7)
3f0cb423b2 Merge branch 'w13_MDL-32095_m23_strict2' of git://github.com/skodak/moodle 2012-03-28 22:49:38 +02:00
Petr Skoda
17854cb92c MDL-32095 last E_STRICT fix for now 2012-03-28 22:48:18 +02:00
Petr Skoda
b137739b5e MDL-32095 fix outputlib test to setup debug level properly 2012-03-28 22:47:57 +02:00
Petr Skoda
e63f95d7c1 MDL-12730 new debug levels (support strict) + upgrade from old ones 2012-03-28 16:39:42 +02:00
Dan Poltawski
0094c90c79 MDL-31775 lesson: fix undefined variable warnings 2012-03-27 20:01:06 +08:00
Eloy Lafuente (stronk7)
296c0247c6 Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-03-27 10:10:17 +02:00
Dan Poltawski
2511b0742a Merge branch 'MDL-32028' of git://github.com/nebgor/moodle 2012-03-27 14:46:52 +08:00
Aparup Banerjee
c2bc042330 Merge branch 'wip-mdl-31654' of git://github.com/rajeshtaneja/moodle 2012-03-27 13:22:01 +08:00
Dan Poltawski
4767d32611 Merge branch 'MDL-30235' of git://github.com/lazydaisy/moodle 2012-03-27 12:37:08 +08:00
Aparup Banerjee
5eee9f7ade Merge branch 'w13_MDL-32109_m23_fastpurify' of git://github.com/skodak/moodle 2012-03-27 10:15:18 +08:00
Aparup Banerjee
f3810b2ee2 Merge branch 'wip-MDL-32106-master' of git://github.com/marinaglancy/moodle 2012-03-27 10:10:05 +08:00
Aparup Banerjee
1cc4412c89 Merge branch 'MDL-31869_message_search_roles' of git://github.com/andyjdavis/moodle 2012-03-27 09:58:44 +08:00
Sam Hemelryk
a7cd1f5a53 Merge branch 'MDL-22510-master' of git://github.com/ankitagarwal/moodle 2012-03-27 11:03:19 +13:00
Sam Hemelryk
5dc1a544ea Merge branch 'MDL-11378-master-2' of git://git.luns.net.uk/moodle 2012-03-27 10:05:43 +13:00
Sam Hemelryk
c194925278 Merge branch 'master_MDL-32147' of git://github.com/danmarsden/moodle 2012-03-27 09:51:40 +13:00
Eloy Lafuente (stronk7)
a176999cc5 Merge branch 'MDL-32202' of git://github.com/stronk7/moodle 2012-03-26 21:36:08 +02:00
Eloy Lafuente (stronk7)
704f82e2bf MDL-32202 scorm: fix 2 invalid default="null" definitions 
Note the whole file has been changed because its previous
(manual!) commit leaded to incorrect indentation, but really
only 2 definitions have been changed:

scorm->completionstatusrequired
scorm->completionscorerequired
 2012-03-26 21:27:47 +02:00
Eloy Lafuente (stronk7)
9ee910e69c MDL-32112 mysql: change rename sql generator to pass validation 2012-03-26 19:57:58 +02:00
Eloy Lafuente (stronk7)
43616f61f1 Merge branch 'w13_MDL-32112_m23_dbman' of git://github.com/skodak/moodle 2012-03-26 19:40:58 +02:00
Petr Skoda
e807c0be4f MDL-32095 fix event handler classes to be E_STRICT compatible 2012-03-26 16:04:47 +02:00
Petr Skoda
748e96512b MDL-32095 fix backup API to be E_STRICT compatible 2012-03-26 16:04:16 +02:00
Petr Skoda
5ec6c45fd4 MDL-32095 fix backup API to be E_STRICT 2012-03-26 15:30:04 +02:00
Petr Skoda
68a7c9a696 MDL-32095 some more E_STRICT fixes 2012-03-26 11:47:15 +02:00
Dan Poltawski
9e1a4be29d Merge branch 'MDL-31775' of git://github.com/rwijaya/moodle 2012-03-26 14:39:10 +08:00
Dan Poltawski
113022e559 Merge branch 'MDL-32172' of git://github.com/rwijaya/moodle 2012-03-26 12:23:15 +08:00
Dan Poltawski
a05c669af0 Merge branch 'master_MDL-31856_choice_responses_inconsistently_displayed' of git://github.com/kanikagoyal/moodle 2012-03-26 12:09:32 +08:00
Dan Poltawski
91216d5095 Merge branch 'MDL-27710' of git://github.com/rwijaya/moodle 2012-03-26 11:28:21 +08:00
Dan Poltawski
2ce1efb8ac Merge branch 'master_MDL-32080' of git://github.com/danmarsden/moodle 2012-03-26 10:51:38 +08:00
Marina Glancy
400d228e51 MDL-32106: fixed JS bug - when html element did not exist the script stopped 2012-03-26 09:52:01 +08:00
Dan Poltawski
9efaab4949 Merge branch 'MDL-32176' of git://github.com/timhunt/moodle 2012-03-26 09:35:49 +08:00
Dan Poltawski
fdecfdb3d3 Merge branch 'MDL-32177' of git://github.com/timhunt/moodle 2012-03-26 09:26:21 +08:00
Iurii Kucherov
f38792ef05 MDL-31513 rename 'Edit service' to 'Save changes' 2012-03-26 12:11:53 +13:00
Sam Hemelryk
9491f60e44 Merge branch 'MDL-32142-master-1' of git://git.luns.net.uk/moodle 2012-03-26 12:01:29 +13:00
Sam Hemelryk
3e17de5ead Merge branch 'wip-mdl-29331' of git://github.com/rajeshtaneja/moodle 2012-03-26 11:57:39 +13:00
Rajesh Taneja
4d6f9478ed MDL-31903 course: Title on highlight and hide icon should be only added in ie 2012-03-26 11:44:50 +13:00
Rajesh Taneja
618c155a24 MDL-31903 course: Highlight icon will get iniatlised properly 2012-03-26 11:44:50 +13:00
Rajesh Taneja
f753887155 MDL-31903 course: update patch to fix course highlight icon and title toggle 2012-03-26 11:44:50 +13:00
Juho Viitasalo
730477a878 MDL-31903 course: Fixed course highlight icon and title toggle 2012-03-26 11:44:16 +13:00
Dan Poltawski
17e2b27d31 MDL-29400 assignment: Require a file to be uploaded in form 
Don't display 'File uploaded successfully' when no file uploaded for
both upload and uploadsingle
 2012-03-26 11:19:57 +13:00
Sam Hemelryk
991b3a3a9b Merge branch 'MDL-32026-master-2' of git://git.luns.net.uk/moodle 2012-03-26 11:13:54 +13:00
Sam Hemelryk
ef288bd4d3 Merge branch 'MDL-32027-master-1' of git://git.luns.net.uk/moodle 2012-03-26 11:06:34 +13:00
Sam Hemelryk
75e5bd51ea Merge branch 'w13_MDL-31685_m23_filelocking' of git://github.com/skodak/moodle 2012-03-26 10:35:48 +13:00
Sam Hemelryk
0a5bc5dd47 Merge branch 'w13_MDL-32029_m23_extdb' of git://github.com/skodak/moodle 2012-03-26 10:31:36 +13:00
Mary Evans
32837a27ca MDL-30019 theme_fusion: fix for mod-assignment-submission page by reducing font-size and page wapper padding 2012-03-25 08:16:11 +01:00