56267 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
583a19d772 Revert "MDL-30643 - Moved table create/drop out of loop to fix performance issue."
This reverts commit 678f53c5f781d45424020530435382645325ab73.
2012-09-05 19:03:30 +02:00
Eloy Lafuente (stronk7)
6a7fb9f778 Revert "MDL-30643 - Now loading table definitions from XML files."
This reverts commit d352e733b3729ee820de8859d67c859cda81ee34.
2012-09-05 19:03:17 +02:00
Eloy Lafuente (stronk7)
8127f098d8 Revert "MDL-30643 - Added statslib test file."
This reverts commit 8646f5a4363a4331c8673e2bc98a7372ed789182.
2012-09-05 19:03:06 +02:00
Eloy Lafuente (stronk7)
06d54f411c Revert "MDL-30643 - Fixing minor log output error and test cases."
This reverts commit 2da32bd6a5a0071756c29a4684c73694f0971664.
2012-09-05 19:02:54 +02:00
Eloy Lafuente (stronk7)
fa4fbd9790 Revert "MDL-30643 - Updated test cases to handle timezones better."
This reverts commit f0f0fec29572e6670cb46f4325955201f871b519.
2012-09-05 19:02:38 +02:00
Eloy Lafuente (stronk7)
447721b44f Revert "RFC-30643 - Removed get_context_instance calls."
This reverts commit eb0ffd3214ad568ded291936c2cd6e67276350b6.
2012-09-05 19:02:27 +02:00
Eloy Lafuente (stronk7)
ac9fe9b3a5 Revert "MDL-30643 fixed whitespace"
This reverts commit 5c27678d3aa51af7c6e5ce992e52e55a29195a22.
2012-09-05 19:02:07 +02:00
Eloy Lafuente (stronk7)
393cadf205 MDL-29662 quiz overrides: use proper course value (was php notice). 2012-09-05 18:01:24 +02:00
David Mudrák
0e5ebc8755 MDL-35272 Fix typo in qformat_blackboard_six.php
Credit goes to German Valero for spotting and reporting this.
2012-09-05 14:05:36 +02:00
Eloy Lafuente (stronk7)
130eddd24c Merge branch 'w36_MDL-35077_m24_stats' of git://github.com/skodak/moodle 2012-09-05 13:12:59 +02:00
Petr Škoda
61712b0fb0 MDL-35077 do not show link to system stats report if stats disabled 2012-09-05 10:01:30 +02:00
Aparup Banerjee
379833e0d0 Merge branch 'MDL-35089' of git://github.com/stronk7/moodle 2012-09-05 15:02:17 +08:00
Petr Škoda
717a993122 MDL-35172 fix handling of more than 10 tinymce toolbars 2012-09-05 08:23:36 +02:00
Aparup Banerjee
01ba041fa6 Merge branch 'w36_MDL-35177_m24_editoradminicons' of git://github.com/skodak/moodle 2012-09-05 11:45:56 +08:00
Aparup Banerjee
937b0acba1 MDL-26504 blog: fixed SQL to add explicit casting 2012-09-05 10:25:22 +08:00
Dan Marsden
c792565b9d MDL-35255 mod_assign plagiarism api shift update_status call to after header has been printed. 2012-09-05 12:44:18 +12:00
Eloy Lafuente (stronk7)
4bab07c68c Merge branch 'MDL-34997-master' of git://github.com/FMCorz/moodle 2012-09-05 00:52:17 +02:00
Aparup Banerjee
5c27678d3a MDL-30643 fixed whitespace 2012-09-05 01:51:39 +08:00
Aparup Banerjee
b0381539e5 Merge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle 2012-09-05 01:16:51 +08:00
Tyler Bannister
eb0ffd3214 RFC-30643 - Removed get_context_instance calls.
- Added fifth table to speed up enrolment look ups.
2012-09-04 10:11:16 -04:00
Tyler Bannister
f0f0fec295 MDL-30643 - Updated test cases to handle timezones better. 2012-09-04 10:10:19 -04:00
Aparup Banerjee
c43f715d42 Merge branch 'wip-mdl-34537' of git://github.com/rajeshtaneja/moodle 2012-09-04 17:31:50 +08:00
Kordan
087c28d62e MDL-34916 theme_formal_white: added support for relative path of logos 2012-09-04 09:52:13 +02:00
Aparup Banerjee
736cc6a246 Merge branch 'MDL-26504_blog_unregister' of git://github.com/andyjdavis/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-09-04 13:43:11 +08:00
Jerome Mouneyrac
4647b4d76f MDL-34973 PHPunit test: notes/externallib.php 2012-09-04 13:38:36 +08:00
Sam Hemelryk
b5b82ae943 Merge branch 'MDL-30022_message_duplicate' of git://github.com/andyjdavis/moodle 2012-09-04 16:50:36 +12:00
Jerome Mouneyrac
1f867c025b MDL-34970 PHPunit test: group/externallib.php 2012-09-04 12:34:40 +08:00
Jerome Mouneyrac
566596abd7 MDL-34967 PHPunit test: enrol/externallib.php and enrol/manual/externallib.php 2012-09-04 12:26:21 +08:00
Aparup Banerjee
82fb0aa576 MDL-31365 theme: mymobile updated to compatible declaration 2012-09-04 12:10:30 +08:00
Tim Hunt
0e708c3476 MDL-34257 quiz 'secure' mode: PAGE initialisation order issues. 2012-09-04 11:39:38 +08:00
Aparup Banerjee
8f8e28c0b6 Merge branch 'MDL-31365_master' of https://github.com/birdy1976/moodle 2012-09-04 11:38:11 +08:00
Tim Lock
c3a0938e79 MDL-35092: Add proxy support to enrol/paypal IPN 2012-09-04 10:55:09 +08:00
Simon Coggins
02ed0df5ae MDL-34755 SCORM: pop-up not loading in IE7/IE8 compat mode 2012-09-04 13:11:22 +12:00
Eloy Lafuente (stronk7)
519fb0b878 Merge branch 'wip-mdl-34606' of git://github.com/rajeshtaneja/moodle 2012-09-04 02:08:54 +02:00
Eloy Lafuente (stronk7)
12e0ecde48 Merge branch 'MDL-34633-master' of git://github.com/FMCorz/moodle 2012-09-04 01:52:08 +02:00
Eloy Lafuente (stronk7)
259208e0ab MDL-31295 assign: fix comments in upgrade code. 2012-09-04 01:27:49 +02:00
Eloy Lafuente (stronk7)
7ef0d527b2 Merge branch 'MDL-31295-POST23' of git://github.com/netspotau/moodle-mod_assign 2012-09-04 01:20:55 +02:00
Eloy Lafuente (stronk7)
b448cf475e Merge branch 'MDL-29662' of git://github.com/timhunt/moodle 2012-09-04 01:14:06 +02:00
Eloy Lafuente (stronk7)
5087a95e9c Merge branch 'MDL-27818' of git://github.com/timhunt/moodle 2012-09-04 01:06:48 +02:00
Dan Marsden
cfa5063777 MDL-35208 mod_choice: respect order of options when running backup 2012-09-04 11:01:06 +12:00
Eloy Lafuente (stronk7)
5b38b6be70 Merge branch 'w36_MDL-35189_m24_typo3' of git://github.com/skodak/moodle 2012-09-04 00:38:30 +02:00
Eloy Lafuente (stronk7)
8619c884d9 Merge branch 'w36_MDL-35185_m24_flowplayer' of git://github.com/skodak/moodle 2012-09-04 00:35:48 +02:00
Eloy Lafuente (stronk7)
a39c97ca4a Merge branch 'MDL-33306' of git://github.com/timhunt/moodle 2012-09-04 00:30:35 +02:00
Eloy Lafuente (stronk7)
edeb39d44a Merge branch 'MDL-33812-master' of git://github.com/FMCorz/moodle 2012-09-04 00:19:53 +02:00
Eloy Lafuente (stronk7)
bf14738ea1 Merge branch 'MDL-34725-strict-standards' of git://github.com/mudrd8mz/moodle 2012-09-04 00:05:52 +02:00
Eloy Lafuente (stronk7)
717282a5da Merge branch 'w36_MDL-34097_m24_environment' of git://github.com/skodak/moodle 2012-09-04 00:00:20 +02:00
Eloy Lafuente (stronk7)
4ee9de8f8f Merge branch 'w36_MDL-35188_m24_tcpdf' of git://github.com/skodak/moodle 2012-09-03 23:42:14 +02:00
Eloy Lafuente (stronk7)
ffa9378541 Merge branch 'w36_MDL-35186_m24_phpmailer' of git://github.com/skodak/moodle 2012-09-03 23:31:13 +02:00
Paul Charsley
5e21657f87 Merge branch 'master' of https://github.com/moodle/moodle
Conflicts:
	files/externallib.php
2012-09-04 08:58:31 +12:00
Eloy Lafuente (stronk7)
e246a8056e Merge branch 'w36_MDL-35184_m24_adodb' of git://github.com/skodak/moodle 2012-09-03 20:16:20 +02:00