Petr Škoda
6dd4241f81
MDL-35318 fix lang revision incrementation conditions
2012-09-10 20:23:14 +02:00
Petr Škoda
79df150a62
MDL-35318 use new lang revision to invalidate TinyMCE lang caches
2012-09-09 12:18:32 +02:00
Petr Škoda
a46e11b5df
MDL-35318 add lang revision counter and improve PHPUnit test reset
...
We need this for hacks that need to find out if strings changed.
2012-09-09 12:15:30 +02:00
Petr Škoda
29149f981c
MDL-35289 use unmodified TinyMCE
2012-09-09 11:57:25 +02:00
Petr Škoda
a4a4b2f6c6
MDL-35289 use new TinyMCE en lang import
...
AMOS BEGIN
MOV [common:browsemedia,editor_tinymce],[moodlemedia:browsemedia,tinymce_moodlemedia]
MOV [common:browseimage,editor_tinymce],[moodleimage:browseimage,tinymce_moodleimage]
AMOS END
2012-09-07 10:11:37 +02:00
Eloy Lafuente (stronk7)
3b70685c26
fix permissions
2012-09-07 02:36:04 +02:00
Eloy Lafuente (stronk7)
df5ac8d0ec
MDL-6424 - blocks - Add missing global vars.
2012-09-06 19:39:49 +02:00
Eloy Lafuente (stronk7)
7c2bc95ae2
Merge branch 'wip-MDL-6424-master' of git://github.com/abgreeve/moodle
2012-09-06 19:31:43 +02:00
Eloy Lafuente (stronk7)
0cbf023ab6
Merge branch 'w36_MDL-35172_m24_editortoolbar' of git://github.com/skodak/moodle
2012-09-06 12:08:26 +02:00
Eloy Lafuente (stronk7)
0e08f394f5
Merge branch 'MDL-35034-master' of git://github.com/FMCorz/moodle
2012-09-06 02:01:11 +02:00
Eloy Lafuente (stronk7)
44a2eb911b
Revert "MDL-30643 - Fixed speed issues with stats generation."
...
This reverts commit 5d911452cd
.
2012-09-05 19:04:01 +02:00
Eloy Lafuente (stronk7)
cbcf50a2f4
Revert "MDL-30643 - Added additional temporary tables to deal with log growth in daily tables."
...
This reverts commit e710925a24
.
2012-09-05 19:03:46 +02:00
Eloy Lafuente (stronk7)
583a19d772
Revert "MDL-30643 - Moved table create/drop out of loop to fix performance issue."
...
This reverts commit 678f53c5f7
.
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 d352e733b3
.
2012-09-05 19:03:17 +02:00
Eloy Lafuente (stronk7)
8127f098d8
Revert "MDL-30643 - Added statslib test file."
...
This reverts commit 8646f5a436
.
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 2da32bd6a5
.
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 f0f0fec295
.
2012-09-05 19:02:38 +02:00
Eloy Lafuente (stronk7)
447721b44f
Revert "RFC-30643 - Removed get_context_instance calls."
...
This reverts commit eb0ffd3214
.
2012-09-05 19:02:27 +02:00
Eloy Lafuente (stronk7)
ac9fe9b3a5
Revert "MDL-30643 fixed whitespace"
...
This reverts commit 5c27678d3a
.
2012-09-05 19:02:07 +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
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
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
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