Aleksander Machniak 731d190fec Merge branch 'tinymce4' ...

Conflicts:
	program/js/app.js
	program/js/editor.js
	program/js/tiny_mce/tiny_mce.js
	program/steps/utils/spell_html.inc

2014-05-28 15:52:30 +02:00

..

acl

Merge branch 'dev-multi-folder-search'

2014-04-07 09:53:46 +02:00

additional_message_headers

1489868 - additional_message_headers: correct example X-Originating-IP format

2014-05-08 15:01:13 +00:00

archive

Specify licenses in all javascript files and blocks to please LibreJS

2014-04-27 15:35:07 +02:00

attachment_reminder

Specify licenses in all javascript files and blocks to please LibreJS

2014-04-27 15:35:07 +02:00

autologon

Avoid unused local variables

2013-05-07 13:51:23 +02:00

database_attachments

Fix fatal error in database_attachments plugin under some conditions (#1489726)

2014-03-25 15:40:53 +01:00

debug_logger

Created composer.json files for default plugins

2013-09-28 13:03:57 +02:00

emoticons

Update to TinyMCE 4.x

2014-01-20 18:46:28 +01:00

enigma

Fix fatal error after last fix

2013-12-30 15:33:56 +01:00

example_addressbook

Make all bundled plugins the same license as Roundcube itself, which is GPLv3+

2013-06-20 22:06:28 +02:00

filesystem_attachments

Make sure attachment ID is really unique when uploading multiple files (#1489546)

2014-03-11 11:12:41 +01:00

help

Specify licenses in all javascript files and blocks to please LibreJS

2014-04-27 15:35:07 +02:00

hide_blockquote

Improved display of plain text messages and text to HTML conversion (#1488937)

2014-05-11 11:03:45 +02:00

http_authentication

Redirect after HTTP authentication

2014-01-10 19:29:06 +01:00

identity_select

Created composer.json files for default plugins

2013-09-28 13:03:57 +02:00

jqueryui

Specify licenses in all javascript files and blocks to please LibreJS

2014-04-27 15:35:07 +02:00

legacy_browser

MOve more IE<9 code to legacy_browser

2014-05-02 11:01:18 +02:00

managesieve

Specify licenses in all javascript files and blocks to please LibreJS

2014-04-27 15:35:07 +02:00

markasjunk

Specify licenses in all javascript files and blocks to please LibreJS

2014-04-27 15:35:07 +02:00

new_user_dialog

CS fixes

2014-04-28 14:21:32 +02:00

new_user_identity

Created composer.json files for default plugins

2013-09-28 13:03:57 +02:00

newmail_notifier

Specify licenses in all javascript files and blocks to please LibreJS

2014-04-27 15:35:07 +02:00

password

Add timeout for password-driver vpopmaild

2014-05-16 12:29:06 +02:00

redundant_attachments

Created composer.json files for default plugins

2013-09-28 13:03:57 +02:00

show_additional_headers

Created composer.json files for default plugins

2013-09-28 13:03:57 +02:00

squirrelmail_usercopy

s/$rcmail_config/$config/ also for plugins configuration

2013-08-20 19:23:59 +02:00

subscriptions_option

Updated localizations from Transifex

2014-01-30 08:59:28 +01:00

userinfo

Updated localizations from Transifex

2014-01-30 08:59:28 +01:00

vcard_attachments

Specify licenses in all javascript files and blocks to please LibreJS

2014-04-27 15:35:07 +02:00

virtuser_file

Created composer.json files for default plugins

2013-09-28 13:03:57 +02:00

virtuser_query

Fix so identity fields are cast to string to prevent "Column X cannot be null" errors.

2014-03-30 11:20:21 +02:00

zipdownload

Specify licenses in all javascript files and blocks to please LibreJS

2014-04-27 15:35:07 +02:00