61029 Commits

Author SHA1 Message Date
Sam Hemelryk
e6cf0a866b Merge branch 'w17_MDL-39387_m25_authdocs' of git://github.com/skodak/moodle 2013-04-29 15:00:59 +12:00
Frederic Massart
f7224e6027 MDL-39367 resource: Reformat resource settings page 2013-04-29 10:58:29 +08:00
Damyon Wiese
bd45c1aa47 Merge branch 'MDL-36024-master' of https://github.com/mackensen/moodle 2013-04-29 10:45:55 +08:00
Eloy Lafuente (stronk7)
20c9916396 MDL-27071 Allow Oracle IN() to use > 1000 items
By using a pivoting strategy, we modify the list
of params (QM and NAMED supported) into a
subquery, so the 1000 limit in Oracle (ORA-01795)
is not thrown anymore.
2013-04-29 01:22:38 +02:00
Sam Hemelryk
0c5d8ccb9a Merge branch 'w17_MDL-39336_m25_install' of git://github.com/skodak/moodle 2013-04-29 11:15:05 +12:00
Eloy Lafuente (stronk7)
9b2ebc4587 MDL-27071 Add big IN() unit tests
Let's verify how all databases perform with a big
number of parameters (10000) using IN() SQL clauses.
Both using QM and NAMED parameters.

Ideally only Oracle fails, and only it will need fixing.
2013-04-29 01:11:10 +02:00
Sam Hemelryk
036b18a297 Merge branch 'MDL-39355-m' of git://github.com/andrewnicols/moodle 2013-04-29 11:07:26 +12:00
Sam Hemelryk
5745360915 Merge branch 'MDL-39192_master' of https://github.com/markn86/moodle 2013-04-29 10:54:07 +12:00
Sam Hemelryk
1517981b38 Merge branch 'wip-MDL-39298-master' of git://github.com/abgreeve/moodle 2013-04-29 10:45:33 +12:00
Yuliya Bozhko
7e06ea6ab4 MDL-39207 badges: Generate badge assertions using user's backpack email if it is set 2013-04-29 10:15:30 +12:00
Petr Škoda
c2140b5d95 MDL-39356 add ca certificate bundles for cURL
This is necessary because PHP in Windows does not have any certificates and some *nix systems have outdated or missing ca bundles too.

The order is:
1/ dataroot/moodleorgca.crt always wins - needs to be added manually by admin
2/ php.ini setting "curl.cainfo" is next
3/ on Windows libdir/cacert.pem is used because it does not have any default cert bundles
4/ system default is the last - the previous value, ok for properly configured *nix systems
2013-04-28 20:58:58 +02:00
Eloy Lafuente (stronk7)
bae2846c2c MDL-39390 delete old moodle_database column cache
With MDL-39389 all the remaining drivers have been moved
from the in-memory, per-request ::columns cache to
the MUC (databasemeta) alternative.

That makes the old cache unused, so this is, simply about to
delete it, and warn in upgrade notes for potential sites
using custom moodle_database drivers.
2013-04-28 18:33:33 +02:00
Eloy Lafuente (stronk7)
f33d4784fe MDL-39389 add databasemeta cache to pdo_sqlite
Done in a separate commit, coz this driver is not
truly supported, but considering it as a reference
for people developing drivers... it's better to
have it supporting the databasemeta cache.
2013-04-28 18:14:17 +02:00
Eloy Lafuente (stronk7)
9043466103 MDL-39389 add databasemeta cache to ms/oci drivers 2013-04-28 18:12:38 +02:00
Petr Škoda
f869cb2326 MDL-39077 add more unit tests for get_max_upload_sizes() 2013-04-27 16:08:15 +02:00
Petr Škoda
5520fc9526 MDL-39077 fix regression in previous commit, the limit should be always included in maxbytes 2013-04-27 16:00:59 +02:00
Damyon Wiese
7adfadc6b8 MDL-39077 get_max_upload_sizes always include option for 0
Always include an option for 0 in the list of bytes even if sitebytes is not set.
2013-04-27 15:54:41 +02:00
Petr Škoda
aa95e38a0d MDL-39371 add dependency of clean theme on bootstrapbase 2013-04-27 15:27:29 +02:00
Petr Škoda
60d7078adf MDL-39387 normalise MOODLE_INTERNAL 2013-04-27 15:09:05 +02:00
Petr Škoda
a2f10958ff MDL-39387 fix /auth phpdocs 2013-04-27 15:06:40 +02:00
Petr Škoda
31ac2aef26 MDL-39386 fix phpdocs packages in enrol 2013-04-27 13:41:32 +02:00
Petr Škoda
574909efce MDL-39174 fix phpdocs packages in themes 2013-04-27 13:22:59 +02:00
Petr Škoda
8ef3d51470 MDL-39292 use consistent iconsmall in enrol instances UI 2013-04-27 12:28:54 +02:00
Mary Evans
07403fdaf4 MDL-39364 theme_clean: Changed 'simple' to 'clean'. 2013-04-26 22:18:26 +01:00
Petr Škoda
45951bbe7c MDL-39336 fix incorrect use on join() in simple theme 2013-04-26 21:33:15 +02:00
Petr Škoda
ca5d6066a7 MDL-39336 some themes may use $SITE->shortname in page layout before installation finishes 2013-04-26 21:33:15 +02:00
Petr Škoda
ec3ce3a97d MDL-39336 do not print debug output before finishing installation 2013-04-26 21:33:15 +02:00
Tim Hunt
328ac3069b MDL-39378 Improve s() performance.
These changes give about a 10% speed-up in this function. The significant changes are:
1. Simplify the if logic to remove unnecssary cases.
2. Dont pass default argument values to htmlspecialchars, just using the
   defaults is faster.
3. I can confirm that /i regex is faster than the equivalent regex without the i.

I also added more unit tests to test the edge cases.
2013-04-26 18:49:25 +01:00
Tim Hunt
0c6f9e759b MDL-39378 s(): fix bad hex regex 2013-04-26 18:38:29 +01:00
Colin Chambers
6cd22f42ca MDL-39377 Increase padding for grouped field labels in question types 2013-04-26 14:55:11 +01:00
Mary Evans
310845b92d MDL-38896 theme_bootstrapbase: Abbreviated weekdays in calendar/renderer.php + added @media css rule for calendar view. 2013-04-26 14:01:52 +01:00
Valeriy Streltsov
1977123ea5 MDL-39335: add an ord() unicode analog to textlib. 2013-04-26 12:12:03 +00:00
Charles Fulton
628e9b2011 MDL-39322 users: report correct auth method for site administrators 2013-04-26 05:11:28 -07:00
Charles Fulton
ef8a733aa6 MDL-36024 enrol: enable grade recovery for all enrol plugins 2013-04-26 05:08:23 -07:00
Tim Hunt
a72e05ce9c MDL-39351 collapsed editor had grey bars above and below. 2013-04-26 11:55:56 +01:00
Tim Hunt
cbe0a1f60a MDL-39342 stop users entering too long matching answers.
Since they lead to an ugly DB error.
2013-04-26 11:55:38 +01:00
Tim Hunt
a35ce08493 MDL-39246 quiz timer: compute a more accurate stop time. 2013-04-26 11:55:18 +01:00
Tim Hunt
15dedb1168 MDL-39246 JavaScript: store the time the page starts loading.
This helps synchronise time on the client side with time on the server.
If you wait until a js_init_call runs, you might have had to wait an
unknown number of seconds while all the JS loads. Therefore, we capture
the current time as soon as possible in <head>.

This is a bit like adding .jsenabled to <body> as soon as possible, to
reduce visual flicker.
2013-04-26 11:55:17 +01:00
Tim Hunt
9994233477 MDL-37845 multichoice qtype: Fix some display issues.
1. Better handling of multi-line choices in the correct answer display.
2. Remove dangerous CSS that is no longer needed.
2013-04-26 11:53:20 +01:00
Dan Poltawski
cf5a3296c4 on demand release 2.5beta+ 2013-04-26 10:38:16 +01:00
Dan Poltawski
bd7ed905d5 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-04-26 10:37:15 +01:00
Eloy Lafuente (stronk7)
88bcc5fabe MDL-39278 rebuild moodle.css with everything in place 2013-04-26 11:13:09 +02:00
Eloy Lafuente (stronk7)
a86103e09b Merge branch 'MDL-39278-master' of git://github.com/damyon/moodle
Conflicts:
	theme/bootstrap/style/generated.css
	theme/bootstrap/style/moodle.css
	theme/bootstrapbase/less/moodle/recess.txt
	theme/bootstrapbase/style/generated.css
2013-04-26 11:10:09 +02:00
Dan Poltawski
1c97061a35 MDL-39341 boostrapbase: fix some missing renames 2013-04-26 09:54:21 +01:00
Dan Poltawski
5df8fc6744 Merge branch 'MDL-39341-master' of git://github.com/damyon/moodle 2013-04-26 09:52:44 +01:00
Eloy Lafuente (stronk7)
e4a7816155 Merge branch 'MDL-38888-master' of git://github.com/mouneyrac/moodle 2013-04-26 10:48:38 +02:00
Jerome Mouneyrac
3fb83b41a5 MDL-38888 Publish forms display setType warning 2013-04-26 16:45:00 +08:00
Jerome Mouneyrac
487bc1b627 MDL-38440 WebService get_contents doesn't return the full text of labels 2013-04-26 15:13:03 +08:00
David Scotson
3161400447 MDL-39158 Increase form label width on wider screens 2013-04-26 13:50:04 +08:00
Frederic Massart
b9e6341579 MDL-39366 book: Section appearance in book module settings 2013-04-26 13:42:19 +08:00