Merge branch 'master' into dev-elastic
3c1b78af48b5
Actions

Description

Merge branch 'master' into dev-elastic

Details

Provenance

machniak	Authored on Oct 2 2017, 2:58 PM
mollekopf	Pushed on Aug 21 2023, 3:06 PM

Parents

R3:cdd616744a02: Initial Elastic skin support for Enigma
R3:56b5eced08de: Merge branch 'JohnDoh-managesieve-actions'

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

56b5eced08de Merge branch 'JohnDoh-managesieve-actions'
Author
machniak
Browse Repository
No Builds
No Audits
e54e484a4039 Fix "PHP Warning: array_search() expects parameter 2 to be array, null given"
Author
machniak
Browse Repository
No Builds
No Audits
2683d1d8df24 Update changelog
Author
machniak
Browse Repository
No Builds
No Audits
490aa70bd50a Merge branch 'managesieve-actions' of https://github.com/JohnDoh/roundcubemail…
Author
machniak
Browse Repository
No Builds
No Audits
13ee305aa025 Fix travis-ci status image url
Author
Thomas B
Browse Repository
No Builds
No Audits
5d16751ed8e2 Fix (again) bug where image data URIs in css style were treated as evil/remote…
Author
machniak
Browse Repository
No Builds
No Audits
3723f3f1787c Fix rcube_utils::random_bytes() to not throw exception for length=0
Author
Thomas Bruederli
Browse Repository
No Builds
No Audits
c56c9c5e4056 Merge pull request #5935 from Slamdunk/travis
Author
Thomas B
Browse Repository
No Builds
No Audits
b0697e5f9ab7 Merge pull request #5960 from duk3luk3/auth-log-server
Author
Thomas B
Browse Repository
No Builds
No Audits
79ea526d6546 Fix missing cursor in HTML editor on mail reply (#5969)
Author
machniak
Browse Repository
No Builds
No Audits
5660489759ee Fix decryption of messages encoded with non-ascii charset (#5962)
Author
machniak
Browse Repository
No Builds
No Audits
130f0cde3e13 Add host to IMAP login error
Author
Lukas Erlacher
Browse Repository
No Builds
No Audits
0ffd5463d8fa Fix wording of "Mark previewed messages as read" to "Mark messages as read"…
Author
machniak
Browse Repository
No Builds
No Audits
72fe97ddfc49 Fix bug where HTML messages could have been rendered empty on some systems…
Author
machniak
Browse Repository
No Builds
No Audits
ee6b5e9e58ad Fix PHP 7.2 error: count(): Parameter must be an array or an object that…
Author
machniak
Browse Repository
No Builds
No Audits
fa3eb6813f81 Ignore rewind() warnings (#5950)
Author
machniak
Browse Repository
No Builds
No Audits
148ccda88ab7 Password: Support host variables in password_db_dsn option (#5955)
Author
machniak
Browse Repository
No Builds
No Audits
e5e37928d48b Add Travis CI
Author
Filippo Tessarotto
Browse Repository
No Builds
No Audits
2aee340cbb6b support disabling of specific actions in managesieve plugin
Author
PhilW
Browse Repository
No Builds
No Audits

Changes (29)

Path

Size

plugins/

enigma/

lib/

enigma_engine.php

managesieve/

Changelog

config.inc.php.dist

lib/

Roundcube/

rcube_sieve_engine.php

localization/

en_GB.inc

en_US.inc

managesieve.js

skins/

classic/

templates/

larry/

templates/

password/

drivers/

program/

js/

app.js

editor.js

lib/

Roundcube/

localization/

en_US/

labels.inc

steps/

settings/

func.inc

tests/

Framework/

Utils.php

phpunit.xml

R3:3c1b78af48b5

View Options

.travis.yml

View Options

CHANGELOG

View Options

README.md

View Options

composer.json-dist

View Options

plugins/enigma/lib/enigma_engine.php

View Options

plugins/managesieve/Changelog

View Options

plugins/managesieve/config.inc.php.dist

View Options

plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php

View Options

plugins/managesieve/localization/en_GB.inc

View Options

plugins/managesieve/localization/en_US.inc

View Options

plugins/managesieve/managesieve.js

View Options

plugins/managesieve/skins/classic/managesieve.css

View Options

plugins/managesieve/skins/classic/templates/managesieve.html

View Options

plugins/managesieve/skins/larry/managesieve.css

View Options

plugins/managesieve/skins/larry/templates/managesieve.html

View Options

plugins/password/composer.json

View Options

plugins/password/config.inc.php.dist

View Options

plugins/password/drivers/sql.php

View Options

program/js/app.js

View Options

program/js/editor.js

View Options

program/lib/Roundcube/rcube_imap.php

View Options

program/lib/Roundcube/rcube_message.php

View Options

program/lib/Roundcube/rcube_utils.php

View Options

program/lib/Roundcube/rcube_vcard.php

View Options

program/lib/Roundcube/rcube_washtml.php

View Options

program/localization/en_US/labels.inc

View Options

program/steps/settings/func.inc

View Options

tests/Framework/Utils.php

View Options

Merge branch 'master' into dev-elastic3c1b78af48b5Actions

Description

Details

Event Timeline

Merged Changes

Changes (29)

R3:3c1b78af48b5

.travis.yml

CHANGELOG

README.md

composer.json-dist

plugins/enigma/lib/enigma_engine.php

plugins/managesieve/Changelog

plugins/managesieve/config.inc.php.dist

plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php

plugins/managesieve/localization/en_GB.inc

plugins/managesieve/localization/en_US.inc

plugins/managesieve/managesieve.js

plugins/managesieve/skins/classic/managesieve.css

plugins/managesieve/skins/classic/templates/managesieve.html

plugins/managesieve/skins/larry/managesieve.css

plugins/managesieve/skins/larry/templates/managesieve.html

plugins/password/composer.json

plugins/password/config.inc.php.dist

plugins/password/drivers/sql.php

program/js/app.js

program/js/editor.js

program/lib/Roundcube/rcube_imap.php

program/lib/Roundcube/rcube_message.php

program/lib/Roundcube/rcube_utils.php

program/lib/Roundcube/rcube_vcard.php

program/lib/Roundcube/rcube_washtml.php

program/localization/en_US/labels.inc

program/steps/settings/func.inc

tests/Framework/Utils.php

tests/phpunit.xml

Merge branch 'master' into dev-elastic
3c1b78af48b5
Actions