Merge branch 'master' into dev/elastic
750827ad65c9
Actions

Description

Merge branch 'master' into dev/elastic

Details

Provenance

machniak	Authored on May 21 2018, 7:34 AM
mollekopf	Pushed on Aug 21 2023, 3:06 PM

Parents

R3:5e9dd80c471e: Elastic: Fix corner-case for closing pretty select options list
R3:339121b121ae: Fix bug where managesieve_allowed_hosts config wasn't respected on mail screen…

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

339121b121ae Fix bug where managesieve_allowed_hosts config wasn't respected on mail screen…
Author
machniak
Browse Repository
No Builds
No Audits
53fe9d7048fd Bump managesieve version number, cs improvements
Author
machniak
Browse Repository
No Builds
No Audits
b497908040ea Managesieve allowed hosts (#6292)
Author
Athanasios Douitsis
Browse Repository
No Builds
No Audits
71eec07d252b Fix regression where some non-inline attachments could be not listed (#6291)
Author
machniak
Browse Repository
No Builds
No Audits
647a7e91c634 Unify content frame (watermark) template objects (#6285)
Author
johndoh
Browse Repository
No Builds
No Audits

Changes (42)

Path

Size

CHANGELOG

plugins/

enigma/

lib/

enigma_ui.php

skins/

classic/

templates/

keys.html

elastic/

templates/

keys.html

larry/

templates/

keys.html

help/

help.php

skins/

classic/

templates/

help.html

elastic/

templates/

help.html

larry/

templates/

help.html

managesieve/

Changelog

config.inc.php.dist

lib/

Roundcube/

rcube_sieve_engine.php

managesieve.php

skins/

classic/

templates/

managesieve.html

elastic/

templates/

managesieve.html

larry/

templates/

managesieve.html

program/

include/

rcmail_output_html.php

lib/

Roundcube/

rcube_message.php

steps/

addressbook/

mail/

settings/

skins/

classic/

templates/

elastic/

templates/

larry/

templates/

R3:750827ad65c9

View Options

CHANGELOG

View Options

plugins/enigma/lib/enigma_ui.php

View Options

plugins/enigma/skins/classic/templates/keys.html

View Options

plugins/enigma/skins/elastic/templates/keys.html

View Options

plugins/enigma/skins/larry/templates/keys.html

View Options

plugins/help/help.php

View Options

plugins/help/skins/classic/templates/help.html

View Options

plugins/help/skins/elastic/templates/help.html

View Options

plugins/help/skins/larry/templates/help.html

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/managesieve.php

View Options

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

View Options

plugins/managesieve/skins/elastic/templates/managesieve.html

View Options

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

View Options

program/include/rcmail_output_html.php

View Options

program/lib/Roundcube/rcube_message.php

View Options

program/steps/addressbook/func.inc

View Options

program/steps/mail/func.inc

View Options

program/steps/settings/folders.inc

View Options

program/steps/settings/func.inc

View Options

program/steps/settings/identities.inc

View Options

program/steps/settings/responses.inc

View Options

skins/classic/templates/addressbook.html

View Options

skins/classic/templates/folders.html

View Options

skins/classic/templates/identities.html

View Options

skins/classic/templates/mail.html

View Options

skins/classic/templates/responses.html

View Options

skins/classic/templates/settings.html

View Options

skins/elastic/templates/addressbook.html

View Options

skins/elastic/templates/folders.html

View Options

skins/elastic/templates/identities.html

View Options

skins/elastic/templates/mail.html

View Options

skins/elastic/templates/responses.html

View Options

skins/elastic/templates/settings.html

View Options

skins/larry/templates/addressbook.html

View Options

skins/larry/templates/folders.html

View Options

skins/larry/templates/identities.html

View Options

skins/larry/templates/mail.html

View Options

skins/larry/templates/responses.html

View Options

skins/larry/templates/settings.html

Merge branch 'master' into dev/elastic750827ad65c9Actions

Description

Details

Event Timeline

Merged Changes

Changes (42)

R3:750827ad65c9

CHANGELOG

plugins/enigma/lib/enigma_ui.php

plugins/enigma/skins/classic/templates/keys.html

plugins/enigma/skins/elastic/templates/keys.html

plugins/enigma/skins/larry/templates/keys.html

plugins/help/help.php

plugins/help/skins/classic/templates/help.html

plugins/help/skins/elastic/templates/help.html

plugins/help/skins/larry/templates/help.html

plugins/managesieve/Changelog

plugins/managesieve/config.inc.php.dist

plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php

plugins/managesieve/managesieve.php

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

plugins/managesieve/skins/elastic/templates/managesieve.html

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

program/include/rcmail_output_html.php

program/lib/Roundcube/rcube_message.php

program/steps/addressbook/func.inc

program/steps/mail/func.inc

program/steps/settings/folders.inc

program/steps/settings/func.inc

program/steps/settings/identities.inc

program/steps/settings/responses.inc

skins/classic/templates/addressbook.html

skins/classic/templates/folders.html

skins/classic/templates/identities.html

skins/classic/templates/mail.html

skins/classic/templates/responses.html

skins/classic/templates/settings.html

skins/elastic/templates/addressbook.html

skins/elastic/templates/folders.html

skins/elastic/templates/identities.html

skins/elastic/templates/mail.html

skins/elastic/templates/responses.html

skins/elastic/templates/settings.html

skins/larry/templates/addressbook.html

skins/larry/templates/folders.html

skins/larry/templates/identities.html

skins/larry/templates/mail.html

skins/larry/templates/responses.html

skins/larry/templates/settings.html

Merge branch 'master' into dev/elastic
750827ad65c9
Actions