mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-10 10:58:38 +01:00
Code Issues Projects Releases Wiki Activity
62,189 Commits 36 Branches 523 Tags
Commit Graph

62189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Greeve
7809d1557c MDL-40638 - Administration: Update of version number to avoid alternate name fields breaking before upgrade. 
With the alteration of the user table to include the new alternate name fields anyone
upgrading from one version to another will receive errors until they run the upgrade.
Forcing a redirect if major version upgrade will bypass this issue.
 2013-07-15 15:49:26 +08:00
Damyon Wiese
07bbbcf174 weekly release 2.6dev 2013-07-12 09:46:52 +08:00
Damyon Wiese
779545e7fd Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-07-12 09:41:55 +08:00
AMOS bot
ebd69f7abe Automatically generated installer lang files 2013-07-12 00:45:55 +00:00
David Monllao
3e6899989a MDL-39815 mod_glossary: Fixing behat test 2013-07-11 09:36:32 +02:00
Frederic Massart
cfba97e9a5 MDL-40369 theme: Renaming Afterburner i/roles to i/assignroles 2013-07-11 15:59:31 +10:00
Marina Glancy
bf50508f06 MDL-37565 fixed PDW plugin to calculate number of button rows 2013-07-11 14:47:58 +10:00
Marina Glancy
51230ba88e Merge branch 'wip-MDL-31776-master-alternatenamesfix' of git://github.com/abgreeve/moodle 2013-07-10 20:16:21 +10:00
Adrian Greeve
12b4487ef3 MDL-31776 - lib: Alternate name fields - update of gradebook sql query. 2013-07-10 17:41:06 +08:00
Rajesh Taneja
117e94a050 MDL-40358 Enrolments: Fixed sql when user is suspended 2013-07-10 17:40:20 +10:00
Adrian Greeve
38dff99e64 MDL-31776 - lib: Alternate name fields - fixed up user object in question code. 2013-07-10 15:28:27 +08:00
Adrian Greeve
ec71acb798 MDL-31776 - lib: mod/forums - Fixed discussion sql query. 2013-07-10 15:26:05 +08:00
Marina Glancy
cb88ffb698 Merge branch 'MDL-38366-master' of git://github.com/FMCorz/moodle 2013-07-10 16:22:38 +10:00
Frederic Massart
c122f484c5 MDL-38366 repository_filesystem: Prevent use of empty subdir 2013-07-10 14:03:46 +08:00
Frederic Massart
a76efbcac8 MDL-38366 repository: get_option() returns proper values 
Previously, even when a specific setting had to be returned, this method
would return an empty array. Now, the behaviour is the same whether
some options or none are set: if the requested setting is not found
null is returned.
 2013-07-10 14:03:46 +08:00
Sam Hemelryk
858fc79db8 MDL-40368 tool_capability: fixed regression marking single result selected 2013-07-10 16:23:46 +12:00
Jamie Pratt
76149901a9 MDL-40449 use data generator to create random qs 2013-07-10 15:45:45 +12:00
Marina Glancy
06832223d4 Merge branch 'MDL-40354-master' of git://github.com/ankitagarwal/moodle 2013-07-10 13:15:37 +10:00
Ankit Agarwal
e481f05c0d MDL-40354 groups: Fix issues in groups_group_visible() 2013-07-10 10:50:22 +08:00
Ankit Agarwal
2d4d29da06 MDL-40354 groups:groups_get_activity_allowed_groups() should use passed userid to check capabilities 2013-07-10 10:50:22 +08:00
Ankit Agarwal
e7eb992d3a MDL-40354 groups: Add new api groups_group_visible() 2013-07-10 10:50:21 +08:00
Ankit Agarwal
f4d46f6848 MDL-40354 groups: Add unit tests for the api groups_group_visible() 2013-07-10 10:50:21 +08:00
Marina Glancy
f8be9f9e73 Merge branch 'm26_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile_2ndRound' of https://github.com/scara/moodle 2013-07-10 11:58:44 +10:00
Raymond Wijaya
bf57184c28 MDL-40093: mod/assign: Remove count of drafts in offline assignment's grading summary screen 2013-07-10 11:18:28 +10:00
Marina Glancy
9de65fffb6 Merge branch 'w28_MDL-40488_m26_admin' of https://github.com/skodak/moodle 2013-07-10 11:08:49 +10:00
Sam Hemelryk
6426d2d264 Merge branch 'wip-MDL-40593-master' of git://github.com/marinaglancy/moodle 2013-07-10 12:19:05 +12:00
Marina Glancy
9100a8f4bb Merge branch 'MDL-40441' of git://github.com/timhunt/moodle 2013-07-10 10:02:04 +10:00
Marina Glancy
9a2188812d Merge branch 'wip-mdl-40218' of git://github.com/rajeshtaneja/moodle 2013-07-10 09:58:09 +10:00
Sam Hemelryk
93b4d2658a Merge branch 'master_MDL-20867' of git://github.com/danmarsden/moodle 2013-07-10 11:07:00 +12:00
Sam Hemelryk
1be1f6be53 Merge branch 'w28_MDL-40450_m26_tinymcebuttons' of https://github.com/skodak/moodle 2013-07-10 11:02:21 +12:00
Sam Hemelryk
ccae3a612d Merge branch 'w28_MDL-40537_m26_majorupgrade' of https://github.com/skodak/moodle 2013-07-10 10:43:28 +12:00
Sam Hemelryk
4e6ad78679 Merge branch 'MDL-39815' of git://github.com/rwijaya/moodle 2013-07-10 10:35:18 +12:00
Sam Hemelryk
a8402cc115 Merge branch 'MDL-40527' of git://github.com/timhunt/moodle 2013-07-10 10:31:39 +12:00
Sam Hemelryk
a4fd82ac75 Merge branch 'MDL-40466-master' of git://github.com/FMCorz/moodle 2013-07-10 10:19:13 +12:00
Sam Hemelryk
33ed6a9d94 Merge branch 'MDL-40516-master' of git://github.com/danpoltawski/moodle 2013-07-10 10:12:44 +12:00
Sam Hemelryk
05fb99ac70 Merge branch 'master_MDL-40512' of git://github.com/danmarsden/moodle 2013-07-10 10:10:11 +12:00
Sam Hemelryk
d9734c91ee MDL-40358 enrol: whitespace clean up 2013-07-10 10:07:10 +12:00
Sam Hemelryk
fc7e5a031e Merge branch 'wip-mdl-40358' of git://github.com/rajeshtaneja/moodle 2013-07-10 09:54:38 +12:00
Sam Hemelryk
59cd82f9b7 Merge branch 'MDL-40496-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	lib/deprecatedlib.php
 2013-07-10 09:51:15 +12:00
Damyon Wiese
c6df1f5ad0 Merge branch 'MDL-39420' of git://github.com/timhunt/moodle 2013-07-09 22:43:54 +08:00
Damyon Wiese
57cf73a825 Merge branch 'MDL-36479' of git://github.com/timhunt/moodle 2013-07-09 22:28:51 +08:00
Damyon Wiese
e931954558 Merge branch 'MDL-40392' of git://github.com/stronk7/moodle 2013-07-09 21:51:41 +08:00
Marina Glancy
deabf12e31 MDL-40593 fixed SQL query to be postgres-compartible 2013-07-09 22:24:02 +10:00
Marina Glancy
f429d25d37 MDL-40472 fixed missing semicolon 2013-07-09 22:01:49 +10:00
Marina Glancy
ed2896d990 Merge branch 'MDL-40472-master' of git://github.com/damyon/moodle 2013-07-09 21:34:49 +10:00
Tim Hunt
dad5f63d3d MDL-39420 multichoice: fix layout of multi-line choices. 2013-07-09 11:56:28 +01:00
Tim Hunt
475225a1c8 MDL-40441 fix obscure notice in the quiz. 
This can only happen if you have both a user with both a real attempt
and a preview, and then edit the quiz settings.

Also clean up this code a bit.
 2013-07-09 10:43:56 +01:00
Dan Poltawski
3a1b0dd908 Merge branch 'wip-MDL-40430-master' of git://github.com/abgreeve/moodle 2013-07-09 16:57:07 +08:00
Dan Poltawski
f6455e63dd Merge branch 'wip-MDL-40429-master' of git://github.com/abgreeve/moodle 2013-07-09 16:52:52 +08:00
Dan Poltawski
58b2251be3 Merge branch 'MDL-40425-master' of git://github.com/ankitagarwal/moodle 2013-07-09 16:42:18 +08:00