Commit graph

14850 commits

Author SHA1 Message Date
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
Aparup Banerjee
8f8e28c0b6 Merge branch 'MDL-31365_master' of https://github.com/birdy1976/moodle 2012-09-04 11:38:11 +08: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
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)
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
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
Petr Škoda
ffdd502dbd MDL-35184 import adodb 5.17 2012-09-03 18:49:53 +02:00
Eloy Lafuente (stronk7)
1cdcfb7813 Merge branch 'MDL-35133' of git://github.com/timhunt/moodle 2012-09-03 17:47:33 +02:00
Eloy Lafuente (stronk7)
55970f85a4 Merge branch 'w36_MDL-35145_m24_guestdelete' of git://github.com/skodak/moodle 2012-09-03 16:17:51 +02:00
Aparup Banerjee
bb048c6afa Merge branch 'w36_MDL-35080_m24_weirdtables' of git://github.com/skodak/moodle 2012-09-03 17:09:23 +08:00
Rajesh Taneja
732c25ade9 MDl-30667 Course: Maxbytes list will show current value, if it's lower then maxbytes 2012-09-03 14:43:33 +08:00
Jean-Philippe Gaudreau
1ba43a9c6f MDL-34997 - Allow shortened url youtu.be and y2u.be for Youtube filter 2012-09-03 14:13:41 +08:00
Frederic Massart
ec7e998f4b MDL-35034 Repository: Google Docs does not fail when download is restricted 2012-09-03 14:12:43 +08:00
Martin Vögeli
2d0e682d8b MDL-31365 Fix for safebrowser and securewindow 2012-09-03 07:25:30 +02:00
Sam Hemelryk
21a87e501a Merge branch 'MDL-35109-available-updates' of git://github.com/mudrd8mz/moodle 2012-09-03 12:28:30 +12:00
Sam Hemelryk
78cdd4cd41 Merge branch 'MDL-35029_master' of git://github.com/dmonllao/moodle 2012-09-03 12:16:03 +12:00
Petr Škoda
1290a9e2a1 MDL-35189 import typo3 4.7.4 2012-09-02 16:10:57 +02:00
Petr Škoda
d6ed2191d7 MDL-35188 import tcpdf 5.9.181 2012-09-02 15:58:25 +02:00
Petr Škoda
0747dabad8 MDL-35186 import phpmailer 5.2.1 2012-09-02 15:36:25 +02:00
Petr Škoda
1dd274dc21 MDL-35185 import Flowplayer 3.2.14 2012-09-02 15:11:57 +02:00
Petr Škoda
3182d885e7 MDL-35080 skip views and weird tables in mysql structure upgrades 2012-09-01 16:23:08 +02:00
Eric Merrill
1bae1fe522 MDL-35171 formslib Updating date config array to fix problems with month jumping.
Based on https://bugs.php.net/bug.php?id=49115, if you request a month, but do not
specify a date, it will use your current date, which may be beyon a date in the month
requested, causing the return of the next month. This patch specifies the date (1st).
2012-09-01 10:11:24 -04:00
Petr Škoda
4366ce8097 MDL-35145 add basic unit tests for delete_user() 2012-09-01 14:13:40 +02:00
Petr Škoda
fba5791323 MDL-35145 add extra delete_user() parameter validation
We do not want to delete local admins and guest account, we need to validate the supplied parameter is valid $user record and refetch it from database.
2012-09-01 13:48:07 +02:00
Petr Škoda
03f48b4797 MDL-35177 add tinymce plugin icons 2012-09-01 11:36:13 +02:00
Petr Škoda
c64f13178a MDL-35172 rework editor toolbar setting 2012-08-31 22:52:45 +02:00
Tyler Bannister
2da32bd6a5 MDL-30643 - Fixing minor log output error and test cases. 2012-08-31 14:52:29 -04:00
Tyler Bannister
8646f5a436 MDL-30643 - Added statslib test file.
- Tests daily stats and daily stats related functions.
2012-08-31 14:52:28 -04:00
Tyler Bannister
d352e733b3 MDL-30643 - Now loading table definitions from XML files. 2012-08-31 14:52:28 -04:00
Tyler Bannister
678f53c5f7 MDL-30643 - Moved table create/drop out of loop to fix performance issue.
- Added additional output to weekly and monthly stat generation
2012-08-31 14:52:28 -04:00
Tyler Bannister
e710925a24 MDL-30643 - Added additional temporary tables to deal with log growth in daily tables. 2012-08-31 14:52:28 -04:00
Tyler Bannister
5d911452cd MDL-30643 - Fixed speed issues with stats generation. 2012-08-31 14:52:28 -04:00
Tim Hunt
fc51c2bce2 MDL-27818 question bank: multilang category names don't work. 2012-08-30 22:42:15 +01:00
Tim Hunt
34bc5e2f3a MDL-35133 accesslib: context_module::get_context_name should format_string
Otherwise activites with multilang names are displayed badly.
2012-08-30 22:38:24 +01:00
sam marshall
ed0f5a9507 MDL-35141 Filelib: No icon for epub filetype 2012-08-30 12:13:56 +01:00
Tim Hunt
2079c732f9 MDL-29662 quiz overrides: update dates during course reset.
Also, fix duplicate SQL clause in similar code in lib,
and fix error when saving overrides.
2012-08-29 18:41:37 +01:00
Eloy Lafuente (stronk7)
69689b4c3e Merge branch 'wip-MDL-34290-master' of git://github.com/marinaglancy/moodle 2012-08-29 12:11:00 +02:00
Aparup Banerjee
42ac7cf123 Merge branch 'wip-mdl-31623' of git://github.com/rajeshtaneja/moodle 2012-08-29 16:57:03 +08:00
Petr Škoda
5854be2587 MDL-34990 fix JS error when moodlenolink button not present in toolbar
Thanks Rossiani Wijaya for discovering this issue!
2012-08-29 16:13:30 +08:00
Aparup Banerjee
a476581f0d Merge branch 'wip-MDL-34075-master' of git://github.com/abgreeve/moodle 2012-08-29 12:38:17 +08:00
Marina Glancy
7bb7bd2e79 MDL-34290 Added timeout to googledocs request to download a file 2012-08-29 11:56:18 +08:00
Marina Glancy
42aa6e15bb MDL-34290, MDL-33416 prepare to deprecate fields files.referencelastsync and referencelifetime 2012-08-29 11:56:18 +08:00
Marina Glancy
437f5dc4cf MDL-34290 Auto synchronise newly created references when possible 2012-08-29 11:56:17 +08:00
Marina Glancy
db02d84a40 MDL-34290 remove class cache_file as not used
in fact we have moodle filepool that can work perfectly for caching files, no need to create new class and storage
2012-08-29 11:56:17 +08:00
Marina Glancy
6ec6842933 MDL-34290 oauthlib_helper support for POST request 2012-08-29 11:56:16 +08:00
Marina Glancy
7e1e775fa4 MDL-34290 Allow to have several requests to the same instance of oauth_helper 2012-08-29 11:56:16 +08:00
Marina Glancy
f24b0f69ee MDL-34290 repository_boxnet, boxlib use request timeouts
boxlib receives additional argument as request timeout
repository_boxnet::get_file_by_reference respects request timeouts and downloads file into moodle only if it is image
also some improvements to repository_boxnet source display functions;
also do not cache result of request in retrieving of listing, user is unable to see the new files he added to box.
2012-08-29 11:56:15 +08:00