Petr Skoda
25bd4d9a37
Merge branch 'MDL-26847_amended' of git://github.com/timhunt/moodle
2011-03-21 18:10:35 +01:00
Eloy Lafuente (stronk7)
4386e0d101
Merge branch 'master' of git.moodle.org:/git/integration
2011-03-21 18:04:25 +01:00
Petr Skoda
61baea5d22
Merge branch 'MDL-26903' of git://github.com/samhemelryk/moodle
2011-03-21 18:00:07 +01:00
Eloy Lafuente (stronk7)
1f95c9a4af
Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle
2011-03-21 17:55:40 +01:00
Petr Skoda
cd278cd454
MDL-26842 fix invalid parameter mix discovered by the new test
2011-03-21 17:19:36 +01:00
Eloy Lafuente (stronk7)
1997d9dc1d
Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle
2011-03-21 16:38:19 +01:00
Petr Skoda
4c1638c10f
MDL-26842 fix o_ prefix regression
2011-03-21 16:32:09 +01:00
Eloy Lafuente (stronk7)
c0c232ab63
Merge branch 'master' of git.moodle.org:/git/integration
2011-03-21 16:31:27 +01:00
Tim Hunt
af7b3673d7
MDL-26847 new method file_storage::delete_area_files_select for efficient bulk file deletion.
2011-03-21 15:21:02 +00:00
Petr Skoda
10464ffb33
Merge branch 'MDL-26887' of git://github.com/timhunt/moodle
2011-03-21 15:39:31 +01:00
Eloy Lafuente (stronk7)
7a5852c857
Merge branch 'w12_MDL-26844_20_limittests' of git://github.com/skodak/moodle
2011-03-21 15:35:17 +01:00
Petr Skoda
d96b0a969b
Merge branch 'wip-MDL-26822'
2011-03-21 14:03:33 +01:00
Petr Skoda
ae8c1f3d06
MDL-26822 fix whitespace
2011-03-21 14:02:50 +01:00
Sam Hemelryk
8196e3c08d
Merge branch 'MDL-26557' of git://git.luns.net.uk/moodle
2011-03-21 17:32:06 +08:00
Sam Hemelryk
beb81f4947
Merged PULL-496/MDL-26859 and fixed incorrect defines
2011-03-21 17:13:20 +08:00
Sam Hemelryk
909fc3ff2e
Merge branch 'w12_MDL-26726_20_typocat' of git://github.com/skodak/moodle
2011-03-21 14:16:51 +08:00
Sam Hemelryk
e460480080
Merge branch 'w12_MDL-26825_20_cancelform' of git://github.com/skodak/moodle
2011-03-21 14:10:44 +08:00
Sam Hemelryk
37fff87398
Merge branch 'w12_MDL-26803_20_userupload' of git://github.com/skodak/moodle
2011-03-21 12:28:45 +08:00
Sam Hemelryk
b89d39bfcb
Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle
2011-03-21 12:22:23 +08:00
Sam Hemelryk
c78262b542
navigation MDL-26903 Fixed regression to navigation ajax after CM changes
2011-03-21 10:22:28 +08:00
Petr Skoda
8f6c1f3488
MDL-26859 improve blog access control and prevent unnecessary blog includes
2011-03-20 13:34:51 +01:00
Petr Skoda
d9e0b80ffb
MDL-26859 automatically enable and disable blog related blocks when bloglevel changed
2011-03-20 12:28:34 +01:00
Tim Hunt
c08643da97
MDL-26887 Refactor file_save_draft_area_files to separate out the file_rewrite_urls_to_pluginfile bit.
2011-03-18 16:41:29 +00:00
Eloy Lafuente (stronk7)
00570de599
MDL-26883 ddl - fix some function declarations
2011-03-18 14:40:20 +01:00
Sam Hemelryk
dd18964703
navigation MDL-26570 Removed test from navigation simpletests which is no longer possible due to new cm_info object implementation
2011-03-18 13:51:35 +08:00
Sam Hemelryk
c755c87437
navigation MDL-26570 branchid was renamed to key in previous fixes, unit tests updated to reflect this
2011-03-18 13:35:46 +08:00
Petr Skoda
3e7069e70b
MDL-26726 fix whitespace and a few debug and comment typos
2011-03-17 21:34:34 +01:00
Petr Skoda
d2b322ae3c
MDL-26825 do not return any form data if form cancelled
2011-03-17 20:43:35 +01:00
Petr Skoda
bc61aa4085
MDL-26803 add missing forcing of password reset when new password created in cron
2011-03-16 19:59:33 +01:00
Petr Skoda
4335aa296e
MDL-26844 ugly workaround for PHP int size limitation in query limits
...
It looks like the pg driver or database is internally overflowing at least on my 64bit test setup, I think we can safely return all results when from + num is over our max PHP integer.
2011-03-16 16:15:43 +01:00
Petr Skoda
3d24c50144
MDL-26844 fix use of invalid integers in dml tests
2011-03-16 16:08:55 +01:00
sam marshall
adaeccb66d
MDL-26781 Ensure get_fast_modinfo $cm is compatible with get_record $cm
2011-03-16 15:03:01 +00:00
Petr Skoda
200b4556d7
MDL-26842 make sure query parameter names are not reserved words in oracle driver
2011-03-16 15:20:32 +01:00
Andrew Robert Nicols
d8e7d1a085
formslib: MDL-26557 Use correct variable name and specify defaults in function declaration
...
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
2011-03-16 10:50:07 +00:00
Eloy Lafuente (stronk7)
e5e64a4886
Merge branch 'w11_MDL-26697_20_media' of git://github.com/skodak/moodle
...
Conflicts:
theme/formal_white/config.php
2011-03-15 15:21:02 +01:00
Jerome Mouneyrac
d587f077ef
MDL-26822 enrol_user now save the status + trivial typo change in a (bit) related file
2011-03-15 17:27:27 +08:00
Eloy Lafuente (stronk7)
3d63eb08f6
Merge branch 'MDL-22478-alternative-langcacheroot' of git://github.com/mudrd8mz/moodle
2011-03-14 12:03:36 +01:00
Sam Hemelryk
e96aa1a669
Merge branch 's7_MDL-26583_filepicker_lang' of git://github.com/dongsheng/moodle
2011-03-14 16:05:37 +08:00
Sam Hemelryk
4bbe460316
Merge branch 'w11_MDL-26480_20_redirect' of git://github.com/skodak/moodle
2011-03-14 15:41:51 +08:00
Sam Hemelryk
85f1abe304
Merge branch 'MDL-13983' of git://github.com/timhunt/moodle
2011-03-14 15:33:49 +08:00
Eloy Lafuente (stronk7)
64f3208b7c
Merge branch 'w11_MDL-26698_20_helphttps' of git://github.com/skodak/moodle
2011-03-14 02:12:46 +01:00
Eloy Lafuente (stronk7)
5869d05bb7
Merge branch 'w11_MDL-25352_20_replace' of git://github.com/skodak/moodle
2011-03-14 01:10:35 +01:00
Eloy Lafuente (stronk7)
2b1a23a6aa
Merge branch 'MDL-26594' of git://github.com/nebgor/moodle
2011-03-14 00:54:36 +01:00
Petr Skoda
c3b5e8290b
MDL-25352 fix multiple issues in admin/replace.php
...
Make sure admins know things can go wrong, MSSQL and Oracle were never working, fix block_html config saving issue, skip a lot more tables because the data there is serialised() or can not be changed in case of config tables, more warnings and checkbox confirmation.
2011-03-14 00:51:42 +01:00
Eloy Lafuente (stronk7)
9929445926
Merge branch 'MDL-19555_m20' of git://github.com/rwijaya/moodle
2011-03-14 00:35:03 +01:00
Eloy Lafuente (stronk7)
e9579e548d
Merge branch 'w11_MDL-26621_20_profilemail' of git://github.com/skodak/moodle
2011-03-14 00:25:04 +01:00
Petr Skoda
69542fb3af
MDL-26698 use https for help ajax loginhttps pages
2011-03-13 17:08:50 +01:00
Petr Skoda
b399e43592
MDL-26480 IIS redirect bug workaround
...
Credit goes to Zenger Sergey
2011-03-13 10:47:47 +01:00
Petr Skoda
181991e791
MDL-26621 respect email privacy settings on the main user profile and fix missing context
2011-03-12 19:04:26 +01:00
Petr Skoda
fcd2cbaf1f
MDL-26697 multiple media filtering fixes and improvements
...
Bug fixes:
* fixed broken flash resizing via URL
* upgraded Flowplayer
* fixed invalid context in format_text()
* all media related CSS moved from themes to filter and resources
* fixed automatic pdf resizing in resources
Changes:
* reworked filter_mediaplugin system settings - grouped by player type instead of individual extensions, added more information
* improved regex url matching
* removed old unused players, Eolas fix and UFO embedding
* image embedding moved to filter_urltolink
* new Flowplayer embedding API
* accessibility and compatibility tweaks in Flowplayer
* SWF embedding now works only in trusted texts, it is now enabled by default (works everywhere if "Allow EMBED and OBJECT tags" enabled)
* new default video width and height
New features:
* automatic Flash video resizing using information from video metadata
* Flash HD video support (*.f4v)
* Flash video embedding with HTML5 fallback - compatible with iOS and other mobile devices
* Vimeo embedding
* no-cookie YouTube site supported
* HTML 5 audio and video with multiple source URLs and QuickTime fallback
* more video and audio extensions in filelib.php
* MP3 player colours customisable via CSS in themes
* nomediaplugin class in a tag prevents media embedding
2011-03-12 17:42:52 +01:00
