Merge branch 'dev-canned-responses'
98b7b548a229
Actions

Description

Merge branch 'dev-canned-responses'

Conflicts (resolved):
skins/classic/includes/settingstabs.html
skins/larry/includes/settingstabs.html

Details

Provenance

Thomas Bruederli	Authored on Oct 25 2013, 2:50 PM
mollekopf	Pushed on Aug 21 2023, 3:06 PM

Parents

R3:9c41ba3c9ebb: Allow sysadmins to define static responses which are immutable for the user
R3:4e4c2511bc00: Merge pull request #143 from cmcnulty/#1489392---fix-control+arrow-behavior

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

9c41ba3c9ebb Allow sysadmins to define static responses which are immutable for the user
Author
Thomas Bruederli
Browse Repository
No Builds
No Audits
cc041fe11c19 Use the correct label for responses list header
Author
Thomas Bruederli
Browse Repository
No Builds
No Audits
4f432f880afe Make result of rcmail::get_compose_responses() always an (indexed) array; add…
Author
Thomas Bruederli
Browse Repository
No Builds
No Audits
460a3eaaac0e Fix indentation
Author
Thomas Bruederli
Browse Repository
No Builds
No Audits
0d9b63e9c022 Add canned response UI elements to classic skin
Author
Thomas Bruederli
Browse Repository
No Builds
No Audits
4f35bec6b29d Don't normalize line breaks (doesn't work properly on IE)
Author
Thomas Bruederli
Browse Repository
No Builds
No Audits
0933d66b5910 Keep current selection on IE browsers by adding unselectable=on to link elements
Author
Thomas Bruederli
Browse Repository
No Builds
No Audits
80b3c6200ee7 Toolbar and list icons for responses + list header icon for prority column…
Author
Thomas Bruederli
Browse Repository
No Builds
No Audits
0ce2126ac91f New settings section to manage canned responses
Author
Thomas Bruederli
Browse Repository
No Builds
No Audits
2d6242ffb25b Make canned response insertion and extraction work with both plaintext and HTML…
Author
Thomas Bruederli
Browse Repository
No Builds
No Audits
0b1de8a48703 Add new feature to save and recall text snippets (aka canned responses) when…
Author
Thomas Bruederli
Browse Repository
No Builds
No Audits

Changes (27)

Path

Size

config/

defaults.inc.php

program/

include/

rcmail.php

rcmail_output_html.php

js/

app.js

lib/

Roundcube/

html.php

rcube_user.php

localization/

en_US/

labels.inc

messages.inc

steps/

mail/

settings/

skins/

classic/

images/

templates/

	responseedit.html
	settingsedit.html

	responses.html
	identities.html

larry/

images/

templates/

	responseedit.html
	identityedit.html

	responses.html
	identities.html

R3:98b7b548a229

View Options

config/defaults.inc.php

View Options

program/include/rcmail.php

View Options

program/include/rcmail_output_html.php

View Options

program/js/app.js

View Options

program/lib/Roundcube/html.php

View Options

program/lib/Roundcube/rcube_user.php

View Options

program/localization/en_US/labels.inc

View Options

program/localization/en_US/messages.inc

View Options

program/steps/mail/compose.inc

View Options

program/steps/settings/edit_response.inc

View Options

program/steps/settings/func.inc

View Options

program/steps/settings/responses.inc

View Options

skins/classic/common.css

View Options

skins/classic/images/mail_toolbar.png

View Options

skins/classic/mail.css

View Options

skins/classic/settings.css

View Options

skins/classic/templates/compose.html

View Options

skins/classic/templates/responseedit.html

View Options

skins/classic/templates/responses.html

View Options

skins/larry/images/buttons.png

View Options

skins/larry/images/listicons.png

View Options

skins/larry/mail.css

View Options

skins/larry/settings.css

View Options

skins/larry/styles.css

View Options

skins/larry/templates/compose.html

View Options

skins/larry/templates/responseedit.html

View Options

skins/larry/templates/responses.html

Merge branch 'dev-canned-responses'98b7b548a229Actions

Description

Details

Event Timeline

Merged Changes

Changes (27)

R3:98b7b548a229

config/defaults.inc.php

program/include/rcmail.php

program/include/rcmail_output_html.php

program/js/app.js

program/lib/Roundcube/html.php

program/lib/Roundcube/rcube_user.php

program/localization/en_US/labels.inc

program/localization/en_US/messages.inc

program/steps/mail/compose.inc

program/steps/settings/edit_response.inc

program/steps/settings/func.inc

program/steps/settings/responses.inc

skins/classic/common.css

skins/classic/images/mail_toolbar.png

skins/classic/mail.css

skins/classic/settings.css

skins/classic/templates/compose.html

skins/classic/templates/responseedit.html

skins/classic/templates/responses.html

skins/larry/images/buttons.png

skins/larry/images/listicons.png

skins/larry/mail.css

skins/larry/settings.css

skins/larry/styles.css

skins/larry/templates/compose.html

skins/larry/templates/responseedit.html

skins/larry/templates/responses.html

Merge branch 'dev-canned-responses'
98b7b548a229
Actions