Diffusion roundcubemail-plugins-kolab 47d33c54a9ed

manticore'
47d33c54a9ed
Actions

Description

Merge remote-tracking branch 'remotes/origin/manticore'

Details

Provenance

machniak	Authored on
machniak	Pushed on Jan 8 2016, 3:45 PM

Parents

rRPK5d8f64481fe0: Fix disabled tasklist selector in "Save as task" dialog (#5301)
rRPKda5038ef62d2: Add sessionClosed event handling (T846)

Branches

Unknown

Tags

Unknown

Build Status

Buildable 2444
Build 2312: Continuous Integration for Software Development Projects

Event Timeline

machniak committed rRPK47d33c54a9ed: Merge remote-tracking branch 'remotes/origin/manticore' (authored by machniak).Jan 8 2016, 3:42 PM

Harbormaster failed to build B2444: rRPK47d33c54a9ed: Merge remote-tracking branch 'remotes/origin/manticore'!Jan 8 2016, 3:50 PM

Harbormaster failed to build B2444: rRPK47d33c54a9ed: Merge remote-tracking branch 'remotes/origin/manticore'!Jan 8 2016, 4:24 PM

Merged Changes

da5038ef62d2 Add sessionClosed event handling (T846)
Author
machniak
Browse Repository
Building
No Audits
9e5d6fe1c1e2 Disable Save button in manticore session when the file/folder is not writable
Author
machniak
Browse Repository
Building
No Audits
580904174e51 Various fixes
Author
machniak
Browse Repository
Building
No Audits
94eff6b1e763 Implement users autocompletion in kolab_files - use users from LDAP not from…
Author
machniak
Browse Repository
Building
No Audits
df5e84f05277 Update session indicators periodically (T848)
Author
machniak
Browse Repository
Building
No Audits
c9c5b19b522f Support user names and comment for invitations (T859)
Author
machniak
Browse Repository
Failed
No Audits
5b796290d6bc Add button to join the session immediately on invitation level, add option to…
Author
machniak
Browse Repository
Failed
No Audits
eb0fdf3765f8 Partial invitations and notifications support
Author
machniak
Browse Repository
Failed
No Audits
24c8ac75077d Removing session participants
Author
machniak
Browse Repository
Failed
No Audits
e2123344549a Some fixes in invitations dialog
Author
machniak
Browse Repository
Failed
No Audits
725ae222a43e Warn about unsaved changes on session close (T845)
Author
machniak
Browse Repository
Failed
No Audits
98cc54d67c04 Fix #members floating
Author
machniak
Browse Repository
Failed
No Audits
48ddb0eea438 Partial invitations handling, participants autocompletion (T726, T729)
Author
machniak
Browse Repository
Failed
No Audits
9d32f5cbae59 Add Terminate button on document editing page (T845)
Author
machniak
Browse Repository
Failed
No Audits
c323706a9bb3 Open and join collaborative sessions (T724, T725), Editing read-only documents…
Author
machniak
Browse Repository
Failed
No Audits
2ad06d8870c2 Display editing sessions status on files list, added icon on "Rename" button
Author
machniak
Browse Repository
Failed
No Audits
303efd96eff3 Add some icons for future use
Author
machniak
Browse Repository
Failed
No Audits
31587cfdf728 Make rename dialog smaller, but the input wider
Author
machniak
Browse Repository
Failed
No Audits
45430717d50e Add "Rename" button, remove edit icon from the list
Author
machniak
Browse Repository
Failed
No Audits
83cbf1db333f Add "Create and Edit" button into file create dialog
Author
machniak
Browse Repository
Failed
No Audits
ea0b2a60ba16 Small refactoring to have both View and Edit buttons for documents
Author
machniak
Browse Repository
Failed
No Audits
02d13ba808ea Merge branch 'master' into manticore
Author
machniak
Browse Repository
Failed
No Audits
f5a807291e71 Merge branch 'master' into manticore
Author
machniak
Browse Repository
Failed
No Audits
ec39aaaaf412 Added collaborators list widget
Author
machniak
Browse Repository
Failed
No Audits
c01447347cac Add document title input to the toolbar
Author
machniak
Browse Repository
Failed
No Audits
9a0ba625aa48 Manticore support - single-user mode
Author
machniak
Browse Repository
Failed
No Audits
83951483f97f Fix javascript error when selecting a contact in search result (#5269)
Author
machniak
Browse Repository
Failed
No Audits
8706209a7276 Added file creation dialog
Author
machniak
Browse Repository
Failed
No Audits

Changes (13)

Path

Size

plugins/

kolab_files/

config.inc.php.dist

kolab_files.js

kolab_files.php

lib/

kolab_files_autocomplete.php

kolab_files_engine.php

localization/

en_US.inc

skins/

larry/

images/

templates/

rRPK47d33c54a9ed

View Options

plugins/kolab_files/config.inc.php.dist

View Options

plugins/kolab_files/kolab_files.js

View Options

plugins/kolab_files/kolab_files.php

View Options

plugins/kolab_files/lib/kolab_files_autocomplete.php

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/larry/images/buttons.png

View Options

plugins/kolab_files/skins/larry/images/listicons.png

View Options

plugins/kolab_files/skins/larry/style.css

View Options

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

View Options

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

View Options

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

View Options

plugins/kolab_files/skins/larry/ui.js

Merge remote-tracking branch 'remotes/origin/manticore'47d33c54a9edActions

Description

Details

Event Timeline

Merged Changes

Changes (13)

rRPK47d33c54a9ed

plugins/kolab_files/config.inc.php.dist

plugins/kolab_files/kolab_files.js

plugins/kolab_files/kolab_files.php

plugins/kolab_files/lib/kolab_files_autocomplete.php

plugins/kolab_files/lib/kolab_files_engine.php

plugins/kolab_files/localization/en_US.inc

plugins/kolab_files/skins/larry/images/buttons.png

plugins/kolab_files/skins/larry/images/listicons.png

plugins/kolab_files/skins/larry/style.css

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

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

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

plugins/kolab_files/skins/larry/ui.js

Merge remote-tracking branch 'remotes/origin/manticore'
47d33c54a9ed
Actions