mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-07 09:23:31 +02:00
Code Issues Projects Releases Wiki Activity
60,031 Commits 36 Branches 529 Tags
Commit Graph

15472 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
51cae58998 Merge branch 'MDL-38689_master' of git://github.com/dmonllao/moodle 2013-04-02 02:41:44 +02:00
Eloy Lafuente (stronk7)
3e27548431 Merge branch 'MDL-38620_master' of git://github.com/dmonllao/moodle 2013-04-02 02:26:54 +02:00
Eloy Lafuente (stronk7)
12879418e9 Merge branch 'MDL-38823_master' of git://github.com/dmonllao/moodle 
Conflicts:
	mod/forum/tests/behat/behat_mod_forum.php
 2013-04-02 01:47:40 +02:00
Eloy Lafuente (stronk7)
23726a43d4 Merge branch 'MDL-38805_master' of git://github.com/dmonllao/moodle 2013-04-02 01:45:43 +02:00
Eloy Lafuente (stronk7)
62eb5c466e MDL-38547 behat: coding style fixes. 2013-04-01 22:40:50 +02:00
Eloy Lafuente (stronk7)
54e48dc32d Merge branch 'MDL-38547_master' of git://github.com/dmonllao/moodle 2013-04-01 22:32:06 +02:00
Eloy Lafuente (stronk7)
c57c57c575 Merge branch 'MDL-38499_master' of git://github.com/dmonllao/moodle 2013-04-01 22:23:58 +02:00
Eloy Lafuente (stronk7)
0251a62500 Merge branch 'MDL-38486_master' of git://github.com/dmonllao/moodle 2013-04-01 22:17:12 +02:00
Eloy Lafuente (stronk7)
68adfee6d4 Merge branch 'MDL-38788_master' of git://github.com/dmonllao/moodle 2013-04-01 13:17:20 +02:00
Eloy Lafuente (stronk7)
b216376811 Merge branch 'MDL-38787_master' of git://github.com/dmonllao/moodle 2013-04-01 13:12:08 +02:00
David Monllao
7bc7625e04 MDL-38823 behat: Make default form field manage different HTML elements 2013-04-01 17:51:54 +08:00
David Monllao
3a4d76ac3d MDL-38805 behat: Externalized behat_form_field loader 2013-04-01 12:32:25 +08:00
David Monllao
cd7ea8f0cc MDL-38788 behat: Generic form elements interaction compatibile with JS disabled 2013-04-01 11:18:33 +08:00
David Monllao
eff79d5378 MDL-38787 behat: Move to the new Javascript-based test class manager 2013-03-28 16:59:18 +08:00
David Monllao
60054942ec MDL-38689 behat: Steps definitions to compare DOM nodes position inside the DOM 2013-03-28 14:41:41 +08:00
Damyon Wiese
9ee29404be Fix permissions 2013-03-28 14:36:33 +08:00
David Monllao
e62f1b3b63 MDL-38620 behat: Modified upload_users.csv fixture 
Including course and group enrolments
 2013-03-28 11:19:09 +08:00
Eloy Lafuente (stronk7)
113f9a68bd Merge branch 'MDL-38520-m' of https://github.com/andrewnicols/moodle 2013-03-27 23:38:33 +01:00
Eloy Lafuente (stronk7)
9b79c017f9 Merge branch 'MDL-38473-m' of https://github.com/andrewnicols/moodle 2013-03-27 23:20:18 +01:00
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
David Monllao
b918f9f7bf MDL-38499 behat: Steps definitions for section visibility management 2013-03-27 16:00:54 +08:00
David Monllao
18c84063e3 MDL-38486 behat: Course's topics highlighting steps definitions 2013-03-27 15:46:03 +08: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
cf457c2169 Merge branch 'MDL-38659' of git://github.com/stronk7/moodle 2013-03-27 10:38:31 +08:00
Damyon Wiese
0e2ca62e86 MDL-35876: Whitespace, indenting and more verbose upgrade.txt 2013-03-27 10:16:09 +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)
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)
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)
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)
d9b9ef5d4e MDL-38659 environment: verify feedback matches levels 2013-03-26 15:34:06 +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
d54bc60b33 Merge branch 'w13_MDL-38672_m25_purifier' of git://github.com/skodak/moodle 2013-03-26 17:12:18 +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
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
d0fd9726d1 Merge branch 'MDL-30438_b' of git://github.com/rwijaya/moodle 2013-03-26 14:29:57 +08:00
Damyon Wiese
0c241b980a Merge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	lib/upgrade.txt
 2013-03-26 14:22:11 +08:00