mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
54,959 Commits 36 Branches 519 Tags
Commit Graph

54959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
904673dd20 weekly release 2.4dev 2012-07-12 15:54:31 +08:00
Dan Poltawski
24ffa77f30 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-07-12 15:49:21 +08:00
Sam Hemelryk
bd1fdb6a1b Revert "MDL-33575 choice module: add label to checkbox element when privacy of results is set to publish full results" 
This reverts commit 440821205aa03cf1a415f491296a0022abe64a8b.
 2012-07-12 18:20:48 +12:00
AMOS bot
8be8a390da Automatically generated installer lang files 2012-07-12 00:32:21 +00:00
Dan Poltawski
7e1afba2ae Merge branch 'w28_MDL-33753_m24_utfunzip' of git://github.com/skodak/moodle 2012-07-11 17:12:57 +08:00
Petr Škoda
00f744d2b1 MDL-33753 fix sloppy refactoring regression in zip tweaking 2012-07-11 11:10:19 +02:00
Dan Poltawski
ae5cf02259 Merge branch 'w28_MDL-8249_m24_roletranslations' of git://github.com/skodak/moodle 2012-07-11 16:34:15 +08:00
Petr Škoda
ef7090522d MDL-8249 improve custom role strings 
Credit goes to Michael de Raadt.
 2012-07-11 10:29:04 +02:00
Petr Škoda
d3c0f41160 MDL-8249 fix participant page role selection 
Thanks Michael de Raadt for spotting this regression.
 2012-07-11 10:27:14 +02:00
Dan Poltawski
f04615e67b Merge branch 'w28_MDL-34175_m24_admin' of git://github.com/skodak/moodle 2012-07-11 14:51:55 +08:00
Petr Škoda
f5bd1603e2 MDL-34175 one more hardcoded /admin/ in mnet 2012-07-11 08:47:26 +02:00
Dan Poltawski
94a9c8cae1 Merge branch 'w28_MDL-33454_m24_tinymce3541' of git://github.com/skodak/moodle 2012-07-11 14:45:41 +08:00
Petr Škoda
9177036440 MDL-33454 add forgotten TinyMCE min_height setting name change 2012-07-11 08:41:06 +02:00
Sam Hemelryk
37038fa8e1 Merge branch 'w28_MDL-33753_m24_utfunzip' of git://github.com/skodak/moodle 2012-07-11 11:33:02 +12:00
Sam Hemelryk
ee2b82d8cb Merge branch 'w28_MDL-33710_m24_utfzip' of git://github.com/skodak/moodle 2012-07-11 11:27:48 +12:00
AMOS bot
5818b36e68 Automatically generated installer lang files 2012-07-10 20:33:13 +02:00
Dan Poltawski
06dd4335aa Merge branch 'w28_MDL-33712_m24_extratags' of git://github.com/skodak/moodle 2012-07-10 15:55:58 +08:00
Dan Poltawski
c94068f215 Merge branch 'wip-MDL-33950-master' of git://github.com/marinaglancy/moodle 2012-07-10 14:56:46 +08:00
Dan Poltawski
2c0c3379fc Merge branch 'MDL-30844-master' of https://github.com/FMCorz/moodle 2012-07-10 14:47:35 +08:00
Dan Poltawski
f5d7fe4c9e MDL-34159 - add comment lost from previous commit 2012-07-10 12:59:06 +08:00
Dan Poltawski
4afbd0c834 Merge branch 'w28_MDL-34159_m24_wherelist' of git://github.com/skodak/moodle 2012-07-10 12:52:14 +08:00
Sam Hemelryk
f0d6e53c11 Merge branch 'w28_MDL-33617_m24_roleenrolindex' of git://github.com/skodak/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-07-10 15:47:33 +12:00
Sam Hemelryk
e9c614276b Merge branch 'MDL-34237' of git://github.com/danpoltawski/moodle 2012-07-10 15:26:58 +12:00
Dan Poltawski
00142ce553 MDL-34237 - fix version number mistake 2012-07-10 11:20:33 +08:00
Sam Hemelryk
af0c360f48 Merge branch 'w28_MDL-33887_m24_jsstrings' of git://github.com/skodak/moodle 2012-07-10 15:07:47 +12:00
Dan Poltawski
b445f75019 Merge branch 'MDL-34156-master' of git://github.com/micaherne/moodle 2012-07-10 10:53:16 +08:00
Sam Hemelryk
e977b391b7 Merge branch 'w28_MDL-34057_m24_styledebug' of git://github.com/skodak/moodle 2012-07-10 14:50:40 +12:00
Sam Hemelryk
8f19a94304 Merge branch 'w28_MDL-34101_m24_newaccountprev' of git://github.com/skodak/moodle 2012-07-10 14:42:28 +12:00
Dan Poltawski
4b9e493b0a Merge branch 'w28_MDL-34147_m24_cygwin' of git://github.com/skodak/moodle 2012-07-10 10:31:16 +08:00
Dan Poltawski
315e968209 MDL-8249 - tests: fix breaking unit tests 2012-07-10 10:17:47 +08:00
Dan Poltawski
029be094ab MDL-8249 - tests: fix trailing whitespace 2012-07-10 10:17:33 +08:00
Dan Poltawski
e1980f8bb9 Merge branch 'w28_MDL-8249_m24_roletranslations' of git://github.com/skodak/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-07-10 09:43:23 +08:00
Dan Poltawski
c4f48b552f Merge branch 'MDL-34171' of git://github.com/timhunt/moodle 2012-07-10 09:24:56 +08:00
Dan Poltawski
b40eca11d9 Merge branch 'w28_MDL-33018_m24_pgindex2' of git://github.com/skodak/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-07-10 09:17:23 +08:00
Sam Hemelryk
2e87278cbd Merge branch 'w28_MDL-34155_m24_visibilitydefault' of git://github.com/skodak/moodle 2012-07-10 12:51:50 +12:00
Dan Poltawski
db296214d9 Merge branch 'w28_MDL-34010_m24_mysqldiag' of git://github.com/skodak/moodle 2012-07-10 08:49:22 +08:00
Sam Hemelryk
1ef3f066ee Merge branch 'w28_MDL-34175_m24_admin' of git://github.com/skodak/moodle 2012-07-10 12:43:48 +12:00
Dan Poltawski
a87425aba8 Merge branch 'w28_MDL-33568_m24_recordcounts' of git://github.com/skodak/moodle 2012-07-10 08:38:41 +08:00
Dan Poltawski
5c509b058e Merge branch 'master_MDL-34198' of git://github.com/danmarsden/moodle 2012-07-10 08:34:18 +08:00
Sam Hemelryk
3bfe07a5ad Merge branch 'wip-MDL-33444-master' of git://github.com/marinaglancy/moodle 2012-07-10 12:27:47 +12:00
Sam Hemelryk
77c3ccccd2 Merge branch 'wip-MDL-34139-master' of git://github.com/marinaglancy/moodle 2012-07-10 12:22:19 +12:00
Sam Hemelryk
3ea910c83f Merge branch 'w28_MDL-33454_m24_tinymce3541' of git://github.com/skodak/moodle 2012-07-10 12:16:26 +12:00
Sam Hemelryk
5958b17eb0 Merge branch 'MDL-29470-master' of git://github.com/FMCorz/moodle 2012-07-10 12:13:03 +12:00
Sam Hemelryk
3aed38eb7d Merge branch 'MDL-32297-master' of git://github.com/FMCorz/moodle 2012-07-10 12:03:00 +12:00
Sam Hemelryk
3b37c5ceb9 Merge branch 'MDL-34107_filename_dot' of git://github.com/davosmith/moodle 2012-07-10 11:47:20 +12:00
Sam Hemelryk
0f36bce51e Merge branch 'MDL-34061' of git://github.com/danpoltawski/moodle 2012-07-10 11:40:18 +12:00
Sam Hemelryk
68a5f9c7ab Merge branch 'MDL-27800-23' of https://github.com/mackensen/moodle 2012-07-10 11:32:09 +12:00
Dan Poltawski
4e85084148 Merge branch 'MDL-18301-master' of git://github.com/FMCorz/moodle 2012-07-09 14:27:10 +08:00
Dan Poltawski
423c96868d Merge branch 'MDL-32057' of git://github.com/aolley/moodle 2012-07-09 14:14:07 +08:00
Dan Poltawski
13ce630719 Merge branch 'w28_MDL-34046_m24_stalefiles' of git://github.com/skodak/moodle 2012-07-09 13:50:09 +08:00