Commit graph

61260 commits

Author SHA1 Message Date
Sam Hemelryk
a91f5ccb86 Merge branch 'MDL-39365-master' of git://github.com/ankitagarwal/moodle 2013-04-30 09:36:50 +12:00
Sam Hemelryk
8e8a39aea0 Merge branch 'MDL-39398-master' of git://github.com/FMCorz/moodle 2013-04-30 09:31:54 +12:00
Tim Hunt
42d8287083 MDL-39354 put back a bit of margin on checkboxes. 2013-04-29 19:13:13 +01:00
Dan Poltawski
a10393e19f Merge branch 'MDL-39378' of git://github.com/timhunt/moodle 2013-04-29 17:00:53 +01:00
Dan Poltawski
d727e9d66a Revert "MDL-39278 - test change to less which is ungenerated"
This reverts commit 0da03bf4e2.
2013-04-29 14:33:07 +01:00
Dan Poltawski
0da03bf4e2 MDL-39278 - test change to less which is ungenerated
My sincere apologies for polluting the history this way, but this
is the best way we can be sure.

TO BE CLEAR: this commit will shorlty be reverted.
2013-04-29 14:23:51 +01:00
Dan Poltawski
4eaa353245 Merge branch 'MDL-39158-master' of git://github.com/damyon/moodle 2013-04-29 14:20:39 +01:00
Dan Poltawski
e947caf4a1 Merge branch 'MDL-39389' of git://github.com/stronk7/moodle 2013-04-29 14:15:23 +01:00
Dan Poltawski
1f65889ab3 Merge branch 'MDL-39390' of git://github.com/stronk7/moodle 2013-04-29 14:12:37 +01:00
Frederic Massart
b0b79f8ab2 MDL-39368 url: Remove advanced parameters from settings form 2013-04-29 19:27:53 +08:00
Frederic Massart
9cf26d0890 MDL-39368 url: Renaming sections of the settings form 2013-04-29 19:27:47 +08:00
Frederic Massart
99433e4d6d MDL-39398 message: Prevent notice when sending Jabber messages
Not tracking the presence prevents a notice to be displayed during disconnect(),
where the the jabber server attempts to subscribe to $CFG->jabberusername presence.
As the server name does not include a resource identifier (stillwit@jabber.org/resource),
an explode('/') fails.
2013-04-29 19:14:12 +08:00
Dan Poltawski
fcb6d4aac8 Merge branch 'MDL-27071' of git://github.com/stronk7/moodle 2013-04-29 10:27:29 +01:00
Damyon Wiese
883e6a77ce Merge branch 'w17_MDL-39356_m25_cacert' of git://github.com/skodak/moodle 2013-04-29 16:05:08 +08:00
Damyon Wiese
9b77b2011d Merge branch 'MDL-39342' of git://github.com/timhunt/moodle 2013-04-29 15:35:40 +08:00
Petr Škoda
51a230af6a MDL-39402 add missing theme dependencies 2013-04-29 09:20:57 +02:00
Damyon Wiese
b38218cfb0 Merge branch 'w17_MDL-39371_m25_cleandep' of git://github.com/skodak/moodle 2013-04-29 14:52:40 +08:00
Mark Nelson
34e2987118 MDL-39303 mod_forum: prevent user from submitting when post threshold reached 2013-04-29 14:44:04 +08:00
Damyon Wiese
b7098909c1 Merge branch 'MDL-38807-master' of git://github.com/danpoltawski/moodle 2013-04-29 14:17:53 +08:00
Damyon Wiese
ea03f1149e Merge branch 'MDL-30940-master' of git://github.com/FMCorz/moodle 2013-04-29 14:03:34 +08:00
Ankit Agarwal
325c730ba1 MDL-39365 scorm reports: Return correct track count 2013-04-29 13:26:09 +08:00
Damyon Wiese
bc5775b0ea Merge branch 'MDL-39362' of git://github.com/rwijaya/moodle 2013-04-29 13:00:19 +08:00
Frederic Massart
a0d8b5114e MDL-39399 theme: RTL styles for collapse/expand in forms 2013-04-29 12:40:42 +08:00
Damyon Wiese
c59a99df30 Merge branch 'w17_MDL-39174_m25_themedocs' of git://github.com/skodak/moodle 2013-04-29 12:22:23 +08:00
Frederic Massart
97d2a5dd66 MDL-39399 theme: Missing expand/collapse icon in clean 2013-04-29 12:02:09 +08:00
Rossiani Wijaya
c71d9297a6 MDL-39362 Admin: fixed setType() error for networking 2013-04-29 11:59:48 +08:00
Damyon Wiese
dd1ab4ae9a Merge branch 'MDL-37845' of git://github.com/timhunt/moodle 2013-04-29 11:45:05 +08:00
Frederic Massart
b5472cb856 MDL-39367 resource: An admin cannot decide which settings are advanced 2013-04-29 11:10:38 +08:00
Damyon Wiese
50cc49ba04 Merge branch 'MDL-38440-master' of git://github.com/mouneyrac/moodle 2013-04-29 11:01:57 +08:00
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