61171 Commits

Author SHA1 Message Date
Jamie Pratt
397acdfda2 MDL-39230 Question bank - refactor xml import
Allow for reuse of code to read xml questions.
2013-04-30 11:38:26 +08:00
Andrew Davis
dc514c1a0b MDL-35385 mod_chat: made sure no message popups display within the chat window 2013-04-30 09:01:00 +08:00
Frederic Massart
09faedd129 MDL-39265 feedback: Reformat module settings form 2013-04-30 08:33:20 +08:00
Sam Hemelryk
5c8f681713 MDL-39216 url: moodle_url now handles empty param values properly 2013-04-30 11:09:47 +12:00
Sam Hemelryk
45d9752205 MDL-39216 url: updated tests to show desired outcome 2013-04-30 11:09:47 +12:00
Sam Hemelryk
616396a6cf MDL-39216 url: new moodle_url tests for valueless params 2013-04-30 11:09:47 +12:00
Sam Hemelryk
d36cc73edb Merge branch 'w17_MDL-39386_m25_enroldocs' of git://github.com/skodak/moodle 2013-04-30 11:00:06 +12:00
Sam Hemelryk
2a03b6dafe Merge branch 'MDL-39366-master-int' of git://github.com/FMCorz/moodle 2013-04-30 10:38:38 +12:00
Sam Hemelryk
0f540591df Merge branch 'MDL-39303_master' of https://github.com/markn86/moodle 2013-04-30 10:08:20 +12:00
Sam Hemelryk
3e9406bc17 Merge branch 'MDL-38896_master' of git://github.com/lazydaisy/moodle 2013-04-30 09:57:00 +12:00
Sam Hemelryk
e76a515f31 Merge branch 'MDL-39377' of git://github.com/colchambers/moodle 2013-04-30 09:48:18 +12:00
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 0da03bf4e268e38cbb2be8254270ca38538b86e9.
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