Merge branch 'master' into dev/elastic
9eba51e23bbb
Actions

Description

Merge branch 'master' into dev/elastic

Details

Provenance

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

Parents

R3:78d808aaf7c1: Elastic: Use non-white background in footers/headers on mobile, other…
R3:34dc62b9e963: Elastic: FontAwesome 5.1

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

34dc62b9e963 Elastic: FontAwesome 5.1
Author
machniak
Browse Repository
No Builds
No Audits
086e781b8fca Fix bug where some HTML comments could have been malformed by HTML parser…
Author
machniak
Browse Repository
No Builds
No Audits
fa5023f8f60f Update changelog
Author
machniak
Browse Repository
No Builds
No Audits
4ea790ba37ee Extend skin_logo allowing per skin logos (#6273)
Author
johndoh
Browse Repository
No Builds
No Audits
4224ccdaa996 Elastic: Add some .keylist style
Author
machniak
Browse Repository
No Builds
No Audits
c826fd502df7 Fix focus on the editor when switching modes
Author
machniak
Browse Repository
No Builds
No Audits
338486348e79 Fix adding uploaded images to image selector list
Author
machniak
Browse Repository
No Builds
No Audits
10b85656d5a4 Add fake argument to TinyMCE languages download URL to force .zip extension
Author
machniak
Browse Repository
No Builds
No Audits

Changes (25)

Path

Size

CHANGELOG

config/

defaults.inc.php

jsdeps.json

program/

include/

rcmail_output_html.php

js/

editor.js

lib/

Roundcube/

rcube_washtml.php

skins/

classic/

includes/

links.html

templates/

contactprint.html

messageprint.html

elastic/

fonts/

styles/

widgets/

templates/

includes/

larry/

includes/

links.html

templates/

contactprint.html

messageprint.html

tests/

Framework/

Washtml.php

R3:9eba51e23bbb

View Options

CHANGELOG

View Options

config/defaults.inc.php

View Options

jsdeps.json

View Options

program/include/rcmail_output_html.php

View Options

program/js/editor.js

View Options

program/lib/Roundcube/rcube_washtml.php

View Options

skins/classic/includes/links.html

View Options

skins/classic/templates/contactprint.html

View Options

skins/classic/templates/messageprint.html

View Options

skins/elastic/fonts/fa-regular-400.woff

View Options

skins/elastic/fonts/fa-regular-400.woff2

View Options

skins/elastic/fonts/fa-solid-900.woff

View Options

skins/elastic/fonts/fa-solid-900.woff2

View Options

skins/elastic/styles/fontawesome.less

View Options

skins/elastic/styles/widgets/lists.less

View Options

skins/elastic/styles/widgets/taskmenu.less

View Options

skins/elastic/templates/contactprint.html

View Options

skins/elastic/templates/includes/layout.html

View Options

skins/elastic/templates/includes/menu.html

View Options

skins/elastic/templates/messageprint.html

View Options

skins/elastic/ui.js

View Options

skins/larry/includes/links.html

View Options

skins/larry/templates/contactprint.html

View Options

skins/larry/templates/messageprint.html

View Options

tests/Framework/Washtml.php

Merge branch 'master' into dev/elastic9eba51e23bbbActions

Description

Details

Event Timeline

Merged Changes

Changes (25)

R3:9eba51e23bbb

CHANGELOG

config/defaults.inc.php

jsdeps.json

program/include/rcmail_output_html.php

program/js/editor.js

program/lib/Roundcube/rcube_washtml.php

skins/classic/includes/links.html

skins/classic/templates/contactprint.html

skins/classic/templates/messageprint.html

skins/elastic/fonts/fa-regular-400.woff

skins/elastic/fonts/fa-regular-400.woff2

skins/elastic/fonts/fa-solid-900.woff

skins/elastic/fonts/fa-solid-900.woff2

skins/elastic/styles/fontawesome.less

skins/elastic/styles/widgets/lists.less

skins/elastic/styles/widgets/taskmenu.less

skins/elastic/templates/contactprint.html

skins/elastic/templates/includes/layout.html

skins/elastic/templates/includes/menu.html

skins/elastic/templates/messageprint.html

skins/elastic/ui.js

skins/larry/includes/links.html

skins/larry/templates/contactprint.html

skins/larry/templates/messageprint.html

tests/Framework/Washtml.php

Merge branch 'master' into dev/elastic
9eba51e23bbb
Actions