Commit graph

13068 commits

Author SHA1 Message Date
Dan Poltawski
3bbfe7d636 Merge branch 'w17_MDL-32449_m23_tinymce' of git://github.com/skodak/moodle 2012-04-23 15:37:34 +08:00
Dan Poltawski
98fc9c8363 Merge branch 'w17_MDL-31553_m23_clitimeout' of git://github.com/skodak/moodle 2012-04-23 15:25:42 +08:00
Dan Poltawski
b68eef5e0b Merge branch 'MDL-32462' of git://github.com/timhunt/moodle 2012-04-23 12:54:01 +08:00
Dan Poltawski
e0ed91ba39 Merge branch 'MDL-29262' of git://github.com/stronk7/moodle
Conflicts:
	version.php
2012-04-23 12:42:16 +08:00
Dan Poltawski
e7e0f8d27f Merge branch 'MDL-32215-master' of git://github.com/sammarshallou/moodle
Conflicts:
	course/simpletest/testcourselib.php
    lib/db/upgrade.php
	version.php
2012-04-23 12:20:57 +08:00
Dan Poltawski
f488088109 Merge branch 'w17_MDL-32569_m23_phpunit5' of git://github.com/skodak/moodle 2012-04-23 11:21:06 +08:00
Dan Poltawski
a50a1b5dbf Merge branch 'w17_MDL-32512_m23_estrict' of git://github.com/skodak/moodle 2012-04-23 10:22:04 +08:00
Dan Poltawski
c4974b077a Merge branch 'w17_MDL-32576_m23_markdown' of git://github.com/skodak/moodle 2012-04-23 10:09:02 +08:00
Dan Poltawski
242c26e063 Merge branch 'w17_MDL-32575_m23_typo3' of git://github.com/skodak/moodle 2012-04-23 10:07:07 +08:00
Petr Skoda
b29487664d MDL32575 make sure typo3 is not confused by non-string data types 2012-04-23 00:20:47 +02:00
Eloy Lafuente (stronk7)
14e2704ad4 MDL-29262 backup: new setting to control the ttl of backup logs
Add one new backup setting, moving from the general CFG->loglifetime,
to be able to delete backup logged information often.
2012-04-22 21:23:55 +02:00
Petr Skoda
5563f5fbbb MDL-31553 do not timeout CLI upgrade scripts
Credit goes to Michael Aherne.
2012-04-22 17:51:06 +02:00
Petr Skoda
fb8e3faba2 MDL-32569 always set $CFG->wwwroot to http://www.example.com/moodle in test environment 2012-04-22 17:23:20 +02:00
Petr Skoda
e4ba066f1d MDL-32576 import Markdown 1.2.5 2012-04-21 22:17:41 +02:00
Petr Skoda
bc5c10f69e MDL-32575 import latest Typo3 libs for textlib and other improvements
Includes new textlib reset, new test for faulty integer lower/upper casing.
2012-04-21 21:31:03 +02:00
Petr Skoda
ee97a3adbb MDL-32574 import adodb 5.16 2012-04-21 20:02:29 +02:00
Petr Skoda
37ba2528c1 MDL-32569 convert the remaining tests 2012-04-21 17:47:30 +02:00
Petr Skoda
4ca04fb58b MDL-32569 remove remaining references to simpletest and improve events test 2012-04-21 17:08:30 +02:00
Petr Skoda
7a636d6e7f MDL-32569 drop migrated core simpletests 2012-04-21 16:36:37 +02:00
Petr Skoda
05d531a5fb MDL-32569 drop old functional DB tests 2012-04-21 16:32:14 +02:00
Petr Skoda
f59f03ad2d MDL-32569 drop more core simpletests that were already migrated 2012-04-21 16:27:30 +02:00
Petr Skoda
b38d2ce7f8 MDL-32569 move other test related files to new tests directory 2012-04-21 16:11:36 +02:00
Petr Skoda
7e41a08d7a MDL-32512 remove deprecated table_sql constructor breaking E_STRICT 2012-04-21 11:26:14 +02:00
Petr Skoda
c8bd9402ea MDL-32449 import latest version of TinyMCE 3.5dev 2012-04-21 11:04:54 +02:00
Petr Skoda
6e9f0fd15d MDL-32569 improve SimpleTest emulation 2012-04-20 22:20:43 +02:00
Tim Hunt
33af12eb8c MDL-32462 accesslib: fix context_user::build_paths performance
The problem was that the query was updating every row whether it needed
it or not. This turns out to be a really bad thing to do on Postgres,
because it then triggers a long expensive vacuum, which lock the context
table for a long time a really bad thing to do.
2012-04-20 10:09:44 +01:00
sam marshall
cf76b3353c MDL-32215 Course: Ensure section entries are unique on course, section 2012-04-19 15:16:56 +01:00
Dan Poltawski
f0ab3a05e3 Merge branch 'w16_MDL-32377_m23_strcache' of git://github.com/skodak/moodle 2012-04-18 18:30:03 +08:00
Eloy Lafuente (stronk7)
80695b2d51 MDL-32448 import YUI 3.5.0: update readme 2012-04-17 18:15:16 +02:00
Eloy Lafuente (stronk7)
2a1f43a1db Merge branch 'w16_MDL-32448_m23_yui350' of git://github.com/skodak/moodle 2012-04-17 00:29:35 +02:00
Petr Skoda
d7b44d5e95 MDL-32377 do not rewrite on-disk string cache when double checking if string really does not exist in get_string()
This should help with performance on production sites and may indirectly resolve race condition problems in MDL-31904.
2012-04-16 23:58:50 +02:00
Petr Skoda
ea7d4b0972 MDL-32377 do not store incomplete component strings without local packs in on-disk string cache 2012-04-16 23:55:35 +02:00
Petr Skoda
36902e062e MDL-32448 import YUI 3.5.0 2012-04-16 11:59:43 +02:00
Dan Poltawski
54e4d1b3a1 Merge branch 'w16_MDL-32400_m23_phpunit4' of git://github.com/skodak/moodle 2012-04-16 16:12:35 +08:00
Dan Poltawski
71504afc99 Merge branch 'w16_MDL-32392_m23_minversion' of git://github.com/skodak/moodle 2012-04-16 13:52:50 +08:00
Dan Poltawski
04b16edb6d Merge branch 'w16_MDL-32434_m23_droptemp' of git://github.com/skodak/moodle 2012-04-16 13:40:32 +08:00
Dan Poltawski
2e70e457bd Merge branch 'w16_MDL-32423_m23_flowplayer' of git://github.com/skodak/moodle 2012-04-16 13:32:40 +08:00
Sam Hemelryk
a02e2eafa4 Merge branch 'w16_MDL-32405_m23_estrict4' of git://github.com/skodak/moodle 2012-04-16 17:31:45 +12:00
Dan Poltawski
788c5164aa Merge branch 'wip-MDL-32393-m23' of git://github.com/samhemelryk/moodle 2012-04-16 13:29:04 +08:00
Sam Hemelryk
9f31cf9f33 Merge branch 'w16_MDL-32447_m23_tcpdf' of git://github.com/skodak/moodle 2012-04-16 17:25:27 +12:00
Sam Hemelryk
0064f3cfbb MDL-32393 navigation: Fixed up issue when rendering action_link instances for the navigation 2012-04-16 17:12:48 +12:00
Sam Hemelryk
e3d34313ab Merge branch 'MDL-26099-workshop-phase-switch' of git://github.com/mudrd8mz/moodle 2012-04-16 15:00:20 +12:00
Dan Poltawski
85b0540605 Merge branch 'wip-MDL-32395-m23' of git://github.com/samhemelryk/moodle 2012-04-16 10:32:09 +08:00
Sam Hemelryk
2a535174c0 MDL-32426 phpunit: Fixed up phpdocs for generator changes 2012-04-16 11:52:56 +12:00
Sam Hemelryk
e3a660a2e7 Merge branch 'MDL-32426-master-1' of git://git.luns.net.uk/moodle 2012-04-16 11:52:12 +12:00
Sam Hemelryk
68c7673088 Merge branch 'MDL-27547' of git://github.com/mouneyrac/moodle 2012-04-16 10:48:15 +12:00
Petr Skoda
54c5b1ad35 MDL32392 delete unused is_min_version() in some DB drivers 2012-04-15 19:40:07 +02:00
Petr Skoda
66b3302dec MDL-32405 workaround for non-static PEAR::raise_error() and fixed -1 debug support 2012-04-15 17:02:26 +02:00
Petr Skoda
585ae3d949 MDL-32447 import latest tcpdf and point cache to tcpdf subdirectory of moodle cache dir 2012-04-15 16:08:46 +02:00
Petr Skoda
afd1c47c10 MDL32423 import latest flowplayer 2012-04-15 15:59:07 +02:00