Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
Conflicts:
CHANGELOG
|
|
Conflicts:
CHANGELOG
|
|
|
|
|
|
Conflicts:
CHANGELOG
installer/rcube_install.php
|
|
Conflicts:
CHANGELOG
|
|
|
|
|
|
Conflicts:
CHANGELOG
config/main.inc.php.dist
|
|
display (#1489320)
Conflicts:
CHANGELOG
program/steps/mail/show.inc
|
|
on user alias (#1489332)
Conflicts:
plugins/password/config.inc.php.dist
|
|
|
|
Conflicts:
CHANGELOG
skins/larry/styles.css
|
|
(#1489327)
|
|
|
|
a draft (#1489319)
Conflicts:
CHANGELOG
|
|
|
|
Conflicts:
CHANGELOG
program/lib/Roundcube/bootstrap.php
|
|
|
|
|
|
(#1489316)
Conflicts:
CHANGELOG
|
|
|
|
|
|
Conflicts:
CHANGELOG
|
|
(#1489313)
|
|
Added possibility to register flag mappings by a plugin.
Conflicts:
plugins/markasjunk/markasjunk.php
program/lib/Roundcube/rcube_imap_generic.php
|
|
|
|
selected (#1489296)
|
|
|
|
|
|
|
|
Conflicts:
plugins/additional_message_headers/additional_message_headers.php
program/lib/Roundcube/rcube.php
|
|
Conflicts:
CHANGELOG
|
|
|
|
- remove ambiguous m/d/Y format from default config
Conflicts:
CHANGELOG
config/main.inc.php.dist
program/lib/Roundcube/rcube_utils.php
tests/Framework/Utils.php
|
|
- reverted commit 856ec447fa0a7ddd0ad19ed57fc0031040037284 which shouldn't
be cherry-picked from master
|
|
|
|
Conflicts:
CHANGELOG
program/lib/Roundcube/bootstrap.php
|
|
|
|
Conflicts:
CHANGELOG
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|