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

13953 commits

Author SHA1 Message Date
Sam Hemelryk
ee2b82d8cb Merge branch 'w28_MDL-33710_m24_utfzip' of git://github.com/skodak/moodle 2012-07-11 11:27:48 +12:00
Aaron Barnes
9710fe73d1 MDL-34243 completion: get_criteria() incorrectly passing object 2012-07-10 21:07:30 +12: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
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
Aparup Banerjee
7534234322 MDL-34225 course completion : move /lib/completion/* up to /completion 2012-07-10 11:06:41 +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
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
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
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
Dan Poltawski
4e85084148 Merge branch 'MDL-18301-master' of git://github.com/FMCorz/moodle 2012-07-09 14:27:10 +08:00
Dan Poltawski
2579ac464f Merge branch 'wip-mdl-29969' of git://github.com/rajeshtaneja/moodle 2012-07-09 13:39:08 +08:00
Dan Poltawski
898a2310a5 Merge branch 'wip-MDL-34143-master' of git://github.com/marinaglancy/moodle 2012-07-09 13:05:25 +08:00
Sam Hemelryk
66dd3e5d2f MDL-32119 Fixed messy merge in upgrade code 2012-07-09 17:00:52 +12:00
Sam Hemelryk
a2a2e7fb4a Merge branch 'MDL-32119' of git://github.com/srynot4sale/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-07-09 16:02:49 +12:00
Aaron Barnes
7ba1c66592 MDL-33788 completion: SQL optimisation 2012-07-09 15:22:32 +12:00
Dan Poltawski
8081238453 Merge branch 'MDL-33890-master-2' of git://git.luns.net.uk/moodle 2012-07-09 10:02:13 +08:00
Sam Hemelryk
b4aa178e40 MDL-29538 condition: Fixed up phpunit tests after addition of user field conditions 2012-07-09 12:37:22 +12:00
Sam Hemelryk
141d3c86d3 MDL-29538 condition: Tidied up user field condition code post merge 2012-07-09 11:45:44 +12:00
Sam Hemelryk
871c06e583 Merge branch 'MDL-29538_usercond' of git://github.com/markn86/moodle 2012-07-09 11:44:39 +12:00
Sam Hemelryk
ece157e426 Merge branch 'MDL-33514' of git://github.com/danpoltawski/moodle 2012-07-09 10:22:06 +12:00
Michael Aherne
945a81a943 MDL-34205 Activity chooser default setting 2012-07-06 15:29:08 +01:00
Ruslan Kabalin
2d724607e1 MDL-33890 Make course blocks less theme dependant 
This fix checks that the empty block region is actaually the standard one, so
it can be hidden. The blocks move operating area is not resticted to page
content any more.
 2012-07-06 11:16:37 +01:00
Petr Skoda
ff22f22903 MDL-8249 do not hardcode role names and descriptions during installation 2012-07-06 08:22:45 +02:00
Petr Skoda
c52551dc3c MDL-8249 localise standard role names and descriptions if empty 2012-07-06 08:22:34 +02:00
Petr Škoda
068cf0e519 MDL-33018 support varchar_pattern_ops on unique indexes 2012-07-06 08:19:55 +02:00
Petr Škoda
661dd35d89 MDL-33018 fix borked xmldb_index contructor 
Thanks Eloy!
 2012-07-06 08:19:50 +02:00
Petr Skoda
bd991d03cf MDL-33018 add general index type hints and use PostgreSQL varchar_pattern_ops index type for context.path 
This significantly improves performance of accesslib queries,
credit for the discovery of this solution goes to Andrew Masterton from OU.
 2012-07-06 08:19:39 +02:00
Petr Škoda
efc80e2bb8 MDL-33454 import latest TinyMCE 3.5.4.1 2012-07-06 08:10:14 +02:00
Petr Skoda
63224dee44 MDL-33568 improve DB->count_records*() 
Now always returns integer and invalid queries are detected.
 2012-07-06 08:09:11 +02:00
Petr Škoda
79a471435b MDL-33617 add new index to improve perf of enrol related role_assignments 2012-07-06 08:08:45 +02:00
Petr Skoda
64ed8ca214 MDL-33712 add support for unique moodle tags in tinymce 2012-07-06 08:04:00 +02:00
Petr Skoda
6fb8ae95f5 MDL-33753 support utf-8 filename unzipping 2012-07-06 08:03:38 +02:00
Petr Skoda
79c966cf21 MDL-33710, MDL-33710 add utf-8 flag to all zip files created in moodle and unzip from storage fix 2012-07-06 08:02:42 +02:00
Petr Škoda
af225f6c9c MDL-33887 delay string fetching in PAGE->requires->string_for_js() till page footer 
This should resolve problems with language switching such as when forcing course language.
 2012-07-06 08:02:00 +02:00