Diffusion roundcubemail-plugins-kolab f5a807291e71

Merge branch 'master' into manticore
f5a807291e71
Actions

Description

Merge branch 'master' into manticore

Conflicts:
plugins/kolab_files/kolab_files.js

Details

Provenance

machniak	Authored on
machniak	Pushed on Nov 10 2015, 11:17 AM

Parents

rRPK57b6e77eb5d3: Fix attachments list collision in Save as Event dialog and message view (T834)
rRPKec39aaaaf412: Added collaborators list widget

Branches

Unknown

Tags

Unknown

Build Status

Buildable 1896
Build 1897: Continuous Integration for Software Development Projects

Event Timeline

machniak committed rRPKf5a807291e71: Merge branch 'master' into manticore (authored by machniak).Nov 10 2015, 10:55 AM

Harbormaster failed to build B1896: rRPKf5a807291e71: Merge branch 'master' into manticore!Nov 10 2015, 11:26 AM

Merged Changes

57b6e77eb5d3 Fix attachments list collision in Save as Event dialog and message view (T834)
Author
machniak
Browse Repository
Passed
No Audits
9ba3165560d2 Fix bug where Save as Event (and task) form was visible before the dialog was…
Author
machniak
Browse Repository
Passed
No Audits
65d7c7e6f83e Fix error when selecting a folder on search result
Author
machniak
Browse Repository
Passed
No Audits
a293625dea6d Mark readonly folders with a locker icon as in other components (T114)
Author
machniak
Browse Repository
Passed
No Audits
13bc3a77e564 Fix use of removed Roundcube function aliases, small css improvements
Author
machniak
Browse Repository
Passed
No Audits
423979d63fca Disable delete and upload buttons on readonly folders
Author
machniak
Browse Repository
Passed
No Audits
4b727c45cd6c Prevent dropping files to read-only folders (T115)
Author
machniak
Browse Repository
Passed
No Audits
e22d4aafab12 Omit read-only folders in "Save to cloud..." type of dialogs (T116)
Author
machniak
Browse Repository
Passed
No Audits
07742bd66184 Fix over-sized "Upload" and "From cloud..." buttons
Author
machniak
Browse Repository
Passed
No Audits
8c9bdc4571f9 "Add from cloud" for task attachments (T811)
Author
machniak
Browse Repository
Passed
No Audits
905df56bb916 "Add from cloud" for event attachments (T809)
Author
machniak
Browse Repository
Passed
No Audits
436027bf0e3e Fix invalid closing tag
Author
machniak
Browse Repository
Passed
No Audits
95832509b9f6 Fix javascript error when selecting a contact in search result (#5269)
Author
machniak
Browse Repository
Passed
No Audits
8a112e529281 Explicitly set allday property when parsing ical
Author
bruederli
Browse Repository
Passed
No Audits
b2839729b520 Use the right variable when unserializing old attendee data
Author
bruederli
Browse Repository
Passed
No Audits
90c9f3264fcc Remove unused variable (#3953)
Author
bruederli
Browse Repository
Passed
No Audits

Changes (18)

Path

Size

plugins/

calendar/

calendar.php

calendar_base.js

drivers/

database/

database_driver.php

lib/

calendar_ui.php

skins/

classic/

calendar.css

larry/

calendar.css

templates/

eventedit.html

kolab_addressbook/

skins/

larry/

kolab_addressbook.css

kolab_files/

kolab_files.js

lib/

kolab_files_engine.php

skins/

larry/

templates/

kolab_notes/

libcalendaring/

tasklist/

skins/

larry/

tasklist.css

tasklist_base.js

tasklist_ui.php

rRPKf5a807291e71

View Options

plugins/calendar/calendar.php

View Options

plugins/calendar/calendar_base.js

View Options

plugins/calendar/drivers/database/database_driver.php

View Options

plugins/calendar/lib/calendar_ui.php

View Options

plugins/calendar/skins/classic/calendar.css

View Options

plugins/calendar/skins/larry/calendar.css

View Options

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

View Options

plugins/kolab_addressbook/skins/larry/kolab_addressbook.css

View Options

plugins/kolab_files/kolab_files.js

View Options

plugins/kolab_files/lib/kolab_files_engine.php

View Options

plugins/kolab_files/skins/larry/style.css

View Options

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

View Options

plugins/kolab_files/skins/larry/ui.js

View Options

plugins/kolab_notes/kolab_notes.php

View Options

plugins/libcalendaring/libvcalendar.php

View Options

plugins/tasklist/skins/larry/tasklist.css

View Options

plugins/tasklist/tasklist_base.js

View Options

plugins/tasklist/tasklist_ui.php

Merge branch 'master' into manticoref5a807291e71Actions

Description

Details

Event Timeline

Merged Changes

Changes (18)

rRPKf5a807291e71

plugins/calendar/calendar.php

plugins/calendar/calendar_base.js

plugins/calendar/drivers/database/database_driver.php

plugins/calendar/lib/calendar_ui.php

plugins/calendar/skins/classic/calendar.css

plugins/calendar/skins/larry/calendar.css

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

plugins/kolab_addressbook/skins/larry/kolab_addressbook.css

plugins/kolab_files/kolab_files.js

plugins/kolab_files/lib/kolab_files_engine.php

plugins/kolab_files/skins/larry/style.css

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

plugins/kolab_files/skins/larry/ui.js

plugins/kolab_notes/kolab_notes.php

plugins/libcalendaring/libvcalendar.php

plugins/tasklist/skins/larry/tasklist.css

plugins/tasklist/tasklist_base.js

plugins/tasklist/tasklist_ui.php

Merge branch 'master' into manticore
f5a807291e71
Actions