Diffusion roundcubemail-plugins-kolab 9124f1108136

Merge branch 'master' into dev/elastic
9124f1108136
Actions

Description

Merge branch 'master' into dev/elastic

Details

Provenance

machniak	Authored on May 10 2018, 8:45 AM
machniak	Pushed on May 10 2018, 9:42 AM

Parents

rRPKce097cdbef58: Fix support for imap hierarchy delimiter different than a slash char…
rRPK4b0b36776846: folderlist.js -> libkolab.js

Branches

Unknown

Tags

Unknown

Build Status

Buildable 18143

Event Timeline

machniak committed rRPK9124f1108136: Merge branch 'master' into dev/elastic (authored by machniak).May 10 2018, 8:45 AM

Merged Changes

ce097cdbef58 Fix support for imap hierarchy delimiter different than a slash char…
Author
machniak
Browse Repository
Building
No Audits
741ba7afbdc0 Elastic: Move add-folder button to left in "Save to cloud" dialog
Author
machniak
Browse Repository
Building
No Audits
05ca896e1613 Elastic: Fix .faded color
Author
machniak
Browse Repository
Building
No Audits
5eb1d8783916 Elastic: Simplify skin extending
Author
machniak
Browse Repository
Building
No Audits
0d3ac2098b7b Elastic: Fix font size for Export button in Tasks toolbar
Author
machniak
Browse Repository
Building
No Audits
e1fcd7330b45 Fix kolab_tags compatibility with Roundcube 1.4 (and contextmenu plugin)…
Author
machniak
Browse Repository
Building
No Audits
f665dfcd6ed7 Elastic: Add More actions menu with Copy/Move functionality for Files
Author
machniak
Browse Repository
Building
No Audits
931c7e594d1d Elastic: Various improvements for Files on mobile
Author
machniak
Browse Repository
Building
No Audits
0fc9ca30313d Elastic: Better alignment of video/audio preview
Author
machniak
Browse Repository
Building
No Audits
361837cfee87 Elastic: Document editing and some other fixes
Author
machniak
Browse Repository
Building
No Audits
0e5a0648e15e Elastic: Improvements in attachment/file preview
Author
machniak
Browse Repository
Building
No Audits
185d4ab754f5 Elastic: Files and sessions list functionality
Author
machniak
Browse Repository
Building
No Audits
460723895b7a Elastic: Files - verious improvements
Author
machniak
Browse Repository
Building
No Audits
fd9b76886fe9 Elastic: Unify attachments list on event and task info
Author
machniak
Browse Repository
Building
No Audits
2270fd8b6a82 Elastic: Partial Files support
Author
machniak
Browse Repository
Building
No Audits
318883147500 Elastic: Various Calendar improvements, mostly for mobile
Author
machniak
Browse Repository
Building
No Audits
3027b61ec211 Elastic: Calendar - Resources dialog
Author
machniak
Browse Repository
Building
No Audits
91b4bc34d570 folderlist.js -> libkolab.js
Author
machniak
Browse Repository
Building
No Audits
a514ae7b9fc5 Add script to build elastic skin css file
Author
machniak
Browse Repository
Building
No Audits
89a736205887 Bump plugin versions and requirements
Author
vanmeeuwen
Browse Repository
Building
No Audits
4cd62009c0f6 Merge branch 'dev/elastic'
Author
machniak
Browse Repository
Building
No Audits
fdc0fbe4db1f Fix handling iTip replies with different address in From: and the iTip…
Author
machniak
Browse Repository
Building
No Audits
f422aa853fa2 Remove delegators' identities from pgp key generation form
Author
machniak
Browse Repository
Building
No Audits
5d6b3ef13d83 Fix delegation context on RSVP action in the Calendar UI (Bifrost#T31915)
Author
machniak
Browse Repository
Building
No Audits

Changes (60)

Path

Size

less-build.sh

plugins/

calendar/

calendar.php

calendar_ui.js

composer.json

drivers/

kolab/

kolab_invitation_calendar.php

kolab_user_calendar.php

lib/

calendar_ui.php

localization/

en_US.inc

skins/

elastic/

templates/

html_converter/

kolab_2fa/

kolab_activesync/

kolab_addressbook/

skins/

elastic/

templates/

kolab_auth/

kolab_config/

kolab_delegation/

kolab_files/

lib/

kolab_files_engine.php

localization/

skins/

larry/

templates/

	kolab_files/	skins/	elastic/	templates/
	libkolab/	skins/	elastic/	templates/

	filepreview.html
	attachment.html

kolab_folders/

composer.json

kolab_notes/

composer.json

skins/

elastic/

templates/

kolab_shortcuts/

kolab_tags/

ldap_authentication/

libcalendaring/

lib/

libcalendaring_itip.php

libcalendaring.js

libkolab/

composer.json

lib/

kolab_storage_folder_api.php

libkolab.php

skins/

elastic/

include/

templates/

logon_page/

odfviewer/

pdfviewer/

tasklist/

skins/

elastic/

templates/

tinymce_config/

wap_client/

rRPK9124f1108136

View Options

less-build.sh

View Options

plugins/calendar/calendar.php

View Options

plugins/calendar/calendar_ui.js

View Options

plugins/calendar/composer.json

View Options

plugins/calendar/drivers/kolab/kolab_invitation_calendar.php

View Options

plugins/calendar/drivers/kolab/kolab_user_calendar.php

View Options

plugins/calendar/lib/calendar_ui.php

View Options

plugins/calendar/localization/en_US.inc

View Options

plugins/calendar/skins/elastic/templates/calendar.html

View Options

plugins/calendar/skins/elastic/templates/eventedit.html

View Options

plugins/html_converter/composer.json

View Options

plugins/kolab_2fa/composer.json

View Options

plugins/kolab_activesync/composer.json

View Options

plugins/kolab_addressbook/composer.json

View Options

plugins/kolab_addressbook/skins/elastic/templates/search_addon.html

View Options

plugins/kolab_auth/composer.json

View Options

plugins/kolab_config/composer.json

View Options

plugins/kolab_delegation/composer.json

View Options

plugins/kolab_delegation/kolab_delegation.php

View Options

plugins/kolab_files/composer.json

View Options

plugins/kolab_files/kolab_files.js

View Options

plugins/kolab_files/lib/kolab_files_engine.php

View Options

plugins/kolab_files/localization/en_US.inc

View Options

plugins/kolab_files/skins/elastic/templates/compose_plugin.html

View Options

plugins/kolab_files/skins/elastic/templates/docedit.html

View Options

plugins/kolab_files/skins/elastic/templates/filepreview.html

View Options

plugins/kolab_files/skins/elastic/templates/files.html

View Options

plugins/kolab_files/skins/elastic/templates/message_plugin.html

View Options

plugins/kolab_files/skins/elastic/ui.js

View Options

plugins/kolab_files/skins/larry/style.css

View Options

plugins/kolab_files/skins/larry/templates/docedit.html

View Options

plugins/kolab_folders/composer.json

View Options

plugins/kolab_notes/composer.json

View Options

plugins/kolab_notes/skins/elastic/templates/notes.html

View Options

plugins/kolab_shortcuts/composer.json

View Options

plugins/kolab_tags/composer.json

View Options

plugins/kolab_tags/kolab_tags.js

View Options

plugins/ldap_authentication/composer.json

View Options

plugins/libcalendaring/composer.json

View Options

plugins/libcalendaring/lib/libcalendaring_itip.php

View Options

plugins/libcalendaring/libcalendaring.js

View Options

plugins/libkolab/composer.json

View Options

plugins/libkolab/lib/kolab_storage_folder_api.php

View Options

plugins/libkolab/libkolab.php

View Options

plugins/libkolab/skins/elastic/include/calendar.less

View Options

plugins/libkolab/skins/elastic/include/kolab_files.less

View Options

plugins/libkolab/skins/elastic/include/libcalendaring.less

View Options

plugins/libkolab/skins/elastic/include/tasklist.less

View Options

plugins/libkolab/skins/elastic/libkolab.less

View Options

plugins/libkolab/skins/elastic/templates/attachment.html

View Options

plugins/logon_page/composer.json

View Options

plugins/odfviewer/composer.json

View Options

plugins/pdfviewer/composer.json

View Options

plugins/tasklist/composer.json

View Options

plugins/tasklist/skins/elastic/templates/mainview.html

View Options

plugins/tasklist/skins/elastic/templates/taskedit.html

View Options

plugins/tinymce_config/composer.json

View Options

plugins/wap_client/composer.json

Merge branch 'master' into dev/elastic9124f1108136Actions

Description

Details

Event Timeline

Merged Changes

Changes (60)

rRPK9124f1108136

less-build.sh

plugins/calendar/calendar.php

plugins/calendar/calendar_ui.js

plugins/calendar/composer.json

plugins/calendar/drivers/kolab/kolab_invitation_calendar.php

plugins/calendar/drivers/kolab/kolab_user_calendar.php

plugins/calendar/lib/calendar_ui.php

plugins/calendar/localization/en_US.inc

plugins/calendar/skins/elastic/templates/calendar.html

plugins/calendar/skins/elastic/templates/eventedit.html

plugins/html_converter/composer.json

plugins/kolab_2fa/composer.json

plugins/kolab_activesync/composer.json

plugins/kolab_addressbook/composer.json

plugins/kolab_addressbook/skins/elastic/templates/search_addon.html

plugins/kolab_auth/composer.json

plugins/kolab_config/composer.json

plugins/kolab_delegation/composer.json

plugins/kolab_delegation/kolab_delegation.php

plugins/kolab_files/composer.json

plugins/kolab_files/kolab_files.js

plugins/kolab_files/lib/kolab_files_engine.php

plugins/kolab_files/localization/en_US.inc

plugins/kolab_files/skins/elastic/templates/compose_plugin.html

plugins/kolab_files/skins/elastic/templates/docedit.html

plugins/kolab_files/skins/elastic/templates/filepreview.html

plugins/kolab_files/skins/elastic/templates/files.html

plugins/kolab_files/skins/elastic/templates/message_plugin.html

plugins/kolab_files/skins/elastic/ui.js

plugins/kolab_files/skins/larry/style.css

plugins/kolab_files/skins/larry/templates/docedit.html

plugins/kolab_folders/composer.json

plugins/kolab_notes/composer.json

plugins/kolab_notes/skins/elastic/templates/notes.html

plugins/kolab_shortcuts/composer.json

plugins/kolab_tags/composer.json

plugins/kolab_tags/kolab_tags.js

plugins/ldap_authentication/composer.json

plugins/libcalendaring/composer.json

plugins/libcalendaring/lib/libcalendaring_itip.php

plugins/libcalendaring/libcalendaring.js

plugins/libkolab/composer.json

plugins/libkolab/lib/kolab_storage_folder_api.php

plugins/libkolab/libkolab.php

plugins/libkolab/skins/elastic/include/calendar.less

plugins/libkolab/skins/elastic/include/kolab_files.less

plugins/libkolab/skins/elastic/include/libcalendaring.less

plugins/libkolab/skins/elastic/include/tasklist.less

plugins/libkolab/skins/elastic/libkolab.less

plugins/libkolab/skins/elastic/templates/attachment.html

plugins/logon_page/composer.json

plugins/odfviewer/composer.json

plugins/pdfviewer/composer.json

plugins/tasklist/composer.json

plugins/tasklist/skins/elastic/templates/mainview.html

plugins/tasklist/skins/elastic/templates/taskedit.html

plugins/tinymce_config/composer.json

plugins/wap_client/composer.json

Merge branch 'master' into dev/elastic
9124f1108136
Actions