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

59963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
59549129b1 Merge branch 'MDL-38404-m' of https://github.com/andrewnicols/moodle 2013-03-27 23:06:46 +01:00
Eloy Lafuente (stronk7)
f3804a0c00 Merge branch 'MDL-38472-m' of https://github.com/andrewnicols/moodle 2013-03-27 22:42:33 +01:00
Eloy Lafuente (stronk7)
cb39c6136b Merge branch 'MDL-38519-m' of https://github.com/andrewnicols/moodle 2013-03-27 22:29:21 +01:00
Eloy Lafuente (stronk7)
c4b39661b9 Merge branch 'MDL-38517-m' of https://github.com/andrewnicols/moodle 2013-03-27 21:43:30 +01:00
Eloy Lafuente (stronk7)
a8cdbbe053 Merge branch 'MDL-38471-m' of https://github.com/andrewnicols/moodle 2013-03-27 18:50:34 +01:00
Damyon Wiese
604a8ed4e5 Merge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle 2013-03-27 14:11:27 +08:00
Marina Glancy
0a02b80cda MDL-38147 fixed bug with windows PHP different function behaviour 2013-03-27 17:06:27 +11:00
Marina Glancy
5e71c37ea9 MDL-38147 added comments for SQL-based course search that might not work on some DB 2013-03-27 17:05:51 +11:00
Marina Glancy
a32f163dfd MDL-38147 do not use DB->sql_length because it does not work on MSSQL 2013-03-27 16:07:29 +11:00
Aparup Banerjee
8963212472 Merge branch 'MDL-38632' of git://github.com/stronk7/moodle 2013-03-27 13:07:10 +08:00
Damyon Wiese
ddeea94a35 Merge branch 'MDL-38736-master' of git://github.com/danpoltawski/moodle 2013-03-27 12:17:47 +08:00
Damyon Wiese
5df15f2524 MDL-38717 Admin: Change setType for email to PARAM_EMAIL 2013-03-27 12:11:06 +08:00
Damyon Wiese
1b393ce91d Merge branch 'MDL-38717-master' of git://github.com/danpoltawski/moodle 2013-03-27 11:57:14 +08:00
Aparup Banerjee
cf457c2169 Merge branch 'MDL-38659' of git://github.com/stronk7/moodle 2013-03-27 10:38:31 +08:00
Dan Poltawski
8bd1829310 MDL-38736 mod_choice: fix missing param type 2013-03-27 10:19:57 +08:00
Damyon Wiese
0e2ca62e86 MDL-35876: Whitespace, indenting and more verbose upgrade.txt 2013-03-27 10:16:09 +08:00
Dan Poltawski
f6343982e1 MDL-38717 admin: missing setType on email 2013-03-27 10:14:35 +08:00
Damyon Wiese
df9bdfb000 Merge branch 'wip-MDL-35876-master' of git://github.com/phalacee/moodle 
Conflicts:
	lib/upgrade.txt
 2013-03-27 10:06:30 +08:00
Eloy Lafuente (stronk7)
3b597dd4ee Merge branch 'wip-mdl-38543' of git://github.com/deraadt/moodle 2013-03-27 02:00:02 +01:00
Eloy Lafuente (stronk7)
49ef0c56ef Merge branch 'MDL-38552-master' of git://github.com/FMCorz/moodle 2013-03-27 01:51:35 +01:00
Eloy Lafuente (stronk7)
381ffd46fc Merge branch 'MDL-38566-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/base/style/core.css
 2013-03-27 01:49:10 +01:00
Eloy Lafuente (stronk7)
18ceea60af Merge branch 'MDL-38484_master' of git://github.com/dmonllao/moodle 2013-03-27 00:47:32 +01:00
Eloy Lafuente (stronk7)
2477bb29cc Merge branch 'MDL-38531_master' of git://github.com/dmonllao/moodle 2013-03-27 00:46:05 +01:00
Eloy Lafuente (stronk7)
64a807ae44 Merge branch 'MDL-38483_master' of git://github.com/dmonllao/moodle 2013-03-27 00:43:19 +01:00
Eloy Lafuente (stronk7)
cf140de945 Merge branch 'MDL-38557' of git://github.com/timhunt/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-03-26 23:38:07 +01:00
Eloy Lafuente (stronk7)
b741fac308 Merge branch 'MDL-38651' of git://github.com/timhunt/moodle 2013-03-26 23:27:16 +01:00
Eloy Lafuente (stronk7)
d89eed6fca Merge branch 'MDL-38647' of git://github.com/timhunt/moodle 2013-03-26 23:22:25 +01:00
Eloy Lafuente (stronk7)
45679e3a9e Merge branch 'w13_MDL-38589_m25_pear' of git://github.com/skodak/moodle 2013-03-26 23:14:24 +01:00
Eloy Lafuente (stronk7)
e01812b333 Merge branch 'w13_MDL-37783_m12_testinfo' of git://github.com/skodak/moodle 2013-03-26 23:13:33 +01:00
Eloy Lafuente (stronk7)
8ef5dc58ea Merge branch 'MDL-38563-master-int' of git://github.com/FMCorz/moodle 2013-03-26 23:10:11 +01:00
Eloy Lafuente (stronk7)
4efcfaa3ae Merge branch 'w13_MDL-37742_m25_dirtyoracle' of git://github.com/skodak/moodle 
Conflicts:
	lib/upgrade.txt
 2013-03-26 23:04:48 +01:00
Petr Škoda
e788339786 MDL-37742 add debugging message when $DB->sql_empty() used 2013-03-26 22:12:17 +01:00
Eloy Lafuente (stronk7)
2ac738f8ed Merge branch 'w13_MDL-37782_m25_testtrans' of git://github.com/skodak/moodle 2013-03-26 16:09:06 +01:00
Eloy Lafuente (stronk7)
0d377c8d56 Merge branch 'w13_MDL-38671_m25_adodb' of git://github.com/skodak/moodle 2013-03-26 16:07:12 +01:00
Eloy Lafuente (stronk7)
cf20e809aa Merge branch 'MDL-38582' of git://github.com/timhunt/moodle 2013-03-26 16:03:37 +01:00
Eloy Lafuente (stronk7)
6341d977a3 MDL-38659 environment: fix incorrect feedback messages 2013-03-26 15:34:50 +01:00
Eloy Lafuente (stronk7)
d9b9ef5d4e MDL-38659 environment: verify feedback matches levels 2013-03-26 15:34:06 +01:00
Eloy Lafuente (stronk7)
38495379a8 Merge branch 'MDL-38719' 2013-03-26 13:37:13 +01:00
Eloy Lafuente (stronk7)
caa30cd625 MDL-38719 forms: detectMissingSetType() handle of repetitions. 
It seems that formslib, for repetition, relies in the type
especified by the main (non existent at the end) element, instead
of assingning a type to each repetition.

Surely a result of storing types apart from elements. :-(

With the patch, detectMissingSetType() will detect
repeated elements (name containing '[') and will
perform the verification against that main element type.
 2013-03-26 13:28:47 +01:00
Eloy Lafuente (stronk7)
f35f07e9f7 MDL-38719 forms: add some missing types. 
This just adds some missing types to different places
causing phpunit tests to fail.
 2013-03-26 12:13:40 +01:00
Aparup Banerjee
3a7e4a80ad MDL-38564 fixed whitespace 2013-03-26 17:22:22 +08:00
Aparup Banerjee
be0eacf883 Merge branch 'MDL-38564-master' of git://github.com/ankitagarwal/moodle 2013-03-26 17:20:01 +08:00
Aparup Banerjee
d54bc60b33 Merge branch 'w13_MDL-38672_m25_purifier' of git://github.com/skodak/moodle 2013-03-26 17:12:18 +08:00
Ankit Agarwal
bf6b3c7a8a MDL-38564 Adding unit tests for the functions compare_activities_by_time_asc() and compare_activities_by_time_desc() 2013-03-26 16:12:01 +08:00
Damyon Wiese
0231f91d86 Merge branch 'w13_MDL-38673_m25_flowplayer' of git://github.com/skodak/moodle 2013-03-26 16:11:47 +08:00
Damyon Wiese
3dbfd15872 Merge branch 'm25_MDL-38336_SCORM_TOC_links_when_Display_course_structure_is_on' of https://github.com/scara/moodle 2013-03-26 15:40:04 +08:00
Damyon Wiese
41fdbc0d77 MDL-38468 Filelib: Fix ordering of new mimetypes 2013-03-26 15:16:15 +08:00
Damyon Wiese
2013daeb47 Merge branch 'm25_MDL-38468_Fix_MHTML_files_delivery' of https://github.com/scara/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-03-26 15:13:35 +08:00
Damyon Wiese
96a9273343 Merge branch 'MDL-38528' of git://github.com/timhunt/moodle 2013-03-26 14:57:04 +08:00
Damyon Wiese
a847da21d0 MDL-35875: Version bump for CSS changes 2013-03-26 14:50:18 +08:00