Merge branch 'master' into dev/elastic
44d082458591
Actions

Description

Merge branch 'master' into dev/elastic

Conflicts:
skins/elastic/styles/widgets/mail.less

Details

Provenance

machniak	Authored on Jun 12 2018, 7:54 AM
mollekopf	Pushed on Aug 21 2023, 3:06 PM

Parents

R3:5fd1b52f01f2: Update de_DE localization
R3:fd7d7faabd00: Improve checking folder delete rights according to RFC 4314

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

fd7d7faabd00 Improve checking folder delete rights according to RFC 4314
Author
machniak
Browse Repository
No Builds
No Audits
728e5c6cc456 Don't wrap attachment size (#6321)
Author
machniak
Browse Repository
No Builds
No Audits
b816569a83c2 Improve description of imap_ns_* options, add note about FALSE value
Author
machniak
Browse Repository
No Builds
No Audits
58e514970ebb Add option to hide folders in share/other-user namespace or outside of the…
Author
machniak
Browse Repository
No Builds
No Audits
5e3868eb1028 Fix so attachment without Content-ID is not an inline attachment (#5905)
Author
machniak
Browse Repository
No Builds
No Audits
e9d38e847cae Re-add setting error_log=syslog when log_driver=syslog
Author
machniak
Browse Repository
No Builds
No Audits
4d47fb6f0b94 Replace Save with Import button in messages import form
Author
machniak
Browse Repository
No Builds
No Audits
2fa112bd836e [EFAIL] Don't decrypt PGP messages with no MDC protection (#6289)
Author
machniak
Browse Repository
No Builds
No Audits
6d0b30d45619 Fix bug where messages list was not updated after moving ALL messages (#6310)
Author
machniak
Browse Repository
No Builds
No Audits
3d0b2cd3cec3 Pass PEAR errors to rcube::raise_error(), small CS improvements
Author
machniak
Browse Repository
No Builds
No Audits
12b1b54792eb Fix bug where after "mark all folders as read" action message counters were not…
Author
machniak
Browse Repository
No Builds
No Audits
2275df3bcaf4 Fix js error when flagging a message as unread
Author
machniak
Browse Repository
No Builds
No Audits
9e289982acce Add "Disk usage: " prefix to the quota element title
Author
machniak
Browse Repository
No Builds
No Audits
6691756ea126 Fix bug where unicode contact names could have been broken/emptied or caused DB…
Author
machniak
Browse Repository
No Builds
No Audits
30ab2eec5f56 Remove function_exists() checks for mbstring functions
Author
machniak
Browse Repository
No Builds
No Audits
01f331e303a8 Merge branch 'master' of github.com:roundcube/roundcubemail
Author
machniak
Browse Repository
No Builds
No Audits
3ede8e540417 Show message flagged status in message view (#5080)
Author
machniak
Browse Repository
No Builds
No Audits
e05be853da61 Enigma: Add hint about max upload size in key import form
Author
machniak
Browse Repository
No Builds
No Audits

Changes (29)

Path

Size

config/

plugins/

enigma/

lib/

enigma_driver_gnupg.php

enigma_error.php

enigma_ui.php

localization/

en_US.inc

managesieve/

lib/

Roundcube/

rcube_sieve.php

rcube_sieve_engine.php

program/

include/

rcmail.php

js/

app.js

lib/

Roundcube/

bootstrap.php

rcube.php

rcube_addressbook.php

rcube_config.php

rcube_imap.php

rcube_message.php

steps/

mail/

skins/

elastic/

styles/

widgets/

larry/

templates/

tests/

Framework/

Bootstrap.php

R3:44d082458591

View Options

CHANGELOG

View Options

INSTALL

View Options

composer.json-dist

View Options

config/defaults.inc.php

View Options

plugins/enigma/lib/enigma_driver_gnupg.php

View Options

plugins/enigma/lib/enigma_error.php

View Options

plugins/enigma/lib/enigma_ui.php

View Options

plugins/enigma/localization/en_US.inc

View Options

plugins/managesieve/lib/Roundcube/rcube_sieve.php

View Options

plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php

View Options

program/include/rcmail.php

View Options

program/js/app.js

View Options

program/lib/Roundcube/bootstrap.php

View Options

program/lib/Roundcube/rcube.php

View Options

program/lib/Roundcube/rcube_addressbook.php

View Options

program/lib/Roundcube/rcube_config.php

View Options

program/lib/Roundcube/rcube_imap.php

View Options

program/lib/Roundcube/rcube_message.php

View Options

program/steps/mail/check_recent.inc

View Options

program/steps/mail/func.inc

View Options

program/steps/mail/mark.inc

View Options

program/steps/mail/show.inc

View Options

skins/elastic/styles/widgets/mail.less

View Options

skins/elastic/ui.js

View Options

skins/larry/mail.css

View Options

skins/larry/templates/message.html

View Options

skins/larry/templates/messagepreview.html

View Options

skins/larry/ui.js

View Options

tests/Framework/Bootstrap.php

Merge branch 'master' into dev/elastic44d082458591Actions

Description

Details

Event Timeline

Merged Changes

Changes (29)

R3:44d082458591

CHANGELOG

INSTALL

composer.json-dist

config/defaults.inc.php

plugins/enigma/lib/enigma_driver_gnupg.php

plugins/enigma/lib/enigma_error.php

plugins/enigma/lib/enigma_ui.php

plugins/enigma/localization/en_US.inc

plugins/managesieve/lib/Roundcube/rcube_sieve.php

plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php

program/include/rcmail.php

program/js/app.js

program/lib/Roundcube/bootstrap.php

program/lib/Roundcube/rcube.php

program/lib/Roundcube/rcube_addressbook.php

program/lib/Roundcube/rcube_config.php

program/lib/Roundcube/rcube_imap.php

program/lib/Roundcube/rcube_message.php

program/steps/mail/check_recent.inc

program/steps/mail/func.inc

program/steps/mail/mark.inc

program/steps/mail/show.inc

skins/elastic/styles/widgets/mail.less

skins/elastic/ui.js

skins/larry/mail.css

skins/larry/templates/message.html

skins/larry/templates/messagepreview.html

skins/larry/ui.js

tests/Framework/Bootstrap.php

Merge branch 'master' into dev/elastic
44d082458591
Actions