Commit graph

16864 commits

Author SHA1 Message Date
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
Andrew Robert Nicols
2c0b7d164c MDL-38756 JavaScript: Handle missing jsrev during installation
During installation, jsrev is unset so unavailable for the cache checks.
The installation sets the initial jsrev value and this is updated
periodically, unless it is set to -1 for JS developer.

During installation, we shouldn't really use any caches so if jsrev is
unset, then we should act as though it is set to developer.
2013-03-27 13:13:01 +00:00
David Monllao
b918f9f7bf MDL-38499 behat: Steps definitions for section visibility management 2013-03-27 16:00:54 +08:00
Dan Poltawski
37836c19fb MDL-38738 portfolio: missing PARAM_TEXT 2013-03-27 15:57:35 +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
Jason Platts
17ff23d743 MDL-37942 Images with non-alphanumeric chars in file name won't export 2013-03-26 15:11:20 +00: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
Frederic Massart
c55cd6ac64 MDL-38691 form: Styling for show more/less toggle 2013-03-26 17:20:58 +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
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
Jason Fowler
6671fa735a MDL-35876 - Blocks - Adding verbose move here descriptions to blocks for accessibility 2013-03-26 14:21:38 +08:00
Damyon Wiese
8af0dffb50 Merge branch 'MDL-34311-master' of git://github.com/danpoltawski/moodle
Conflicts:
	course/moodleform_mod.php
	lib/upgrade.txt
2013-03-26 13:46:29 +08:00
Damyon Wiese
37e50e9316 Merge branch 'MDL-38598-master-int' of git://github.com/FMCorz/moodle 2013-03-26 13:28:57 +08:00
Marina Glancy
290af25434 MDL-38147 fixed small bug on changed categories cache 2013-03-26 14:09:00 +11:00
Petr Škoda
f22f1cafd2 MDL-38627 force byteserving abort on error
It is weird, but Chrome PDF viewer keeps retrying byteserving requests for anything but 407. This commit also normalises response headers on all error pages.
2013-03-25 16:06:02 +01:00
Damyon Wiese
3b5539af5e Merge branch 'MDL-38668' of git://github.com/stronk7/moodle 2013-03-25 15:51:01 +08:00
Damyon Wiese
8b18c1bae5 Merge branch 'w13_MDL-38675_m25_tcpdf' of git://github.com/skodak/moodle 2013-03-25 15:36:25 +08:00
Damyon Wiese
8aae16fb41 MDL-38654 Deprecating gdversion setting: Fix typo for new install 2013-03-25 14:06:00 +08:00
Damyon Wiese
35f155519e Merge branch 'w13_MDL-38654_m25_gdversion' of git://github.com/skodak/moodle
Conflicts:
	lang/en/admin.php
2013-03-25 14:02:31 +08:00
Damyon Wiese
2e0b17051c Merge branch 'w13_MDL-15727_m25_jquery' of git://github.com/skodak/moodle 2013-03-25 12:27:32 +08:00
Rossiani Wijaya
3bd18935d7 MDL-30438 Lesson Module: fixed input text editable capability after checking/unchecking unmask option 2013-03-25 11:47:05 +08:00
Damyon Wiese
e909c7c390 Merge branch 'MDL-38044-master' of git://github.com/FMCorz/moodle 2013-03-25 11:30:36 +08:00
Rossiani Wijaya
41e2a9591f MDL-30438 Lesson Module: improve password field to disabled when password protect is set to no. 2013-03-25 11:26:50 +08:00
Marina Glancy
93c544bdb0 MDL-38147 Added functions coursecat::search_courses(), get_courses()
Also search_courses_count(), get_courses_count();
Added unittests
2013-03-25 13:23:38 +11:00