Merge branch 'manticore'
b8ab3d79b7c8
Actions

Description

Merge branch 'manticore'

Conflicts:
doc/SQL/mysql.initial.sql
lib/api/document.php
lib/api/file_info.php
lib/file_api.php
lib/file_api_core.php
lib/file_manticore.php
lib/file_manticore_api.php
public_html/js/files_api.js

Details

Provenance

machniak	Authored on
machniak	Pushed on Dec 7 2015, 4:07 PM

Parents

rCa57efc84e5f0: Partial invitations support
rCb86501a2d613: Fix typo causing redundant Manticore logon request, remove unused code

Branches

Unknown

Tags

Unknown

Build Status

Buildable 2120

Event Timeline

machniak committed rCb8ab3d79b7c8: Merge branch 'manticore' (authored by machniak).Dec 7 2015, 4:06 PM

Merged Changes

b86501a2d613 Fix typo causing redundant Manticore logon request, remove unused code
Author
machniak
Browse Repository
Building
No Audits
02f194ab3852 Fix joining sessions on files inaccessible to the invited user
Author
machniak
Browse Repository
Building
No Audits
1a71747ac9a3 Call 'startup' hook so kolab_auth plugin can modify user settings (T762) via…
Author
machniak
Browse Repository
Building
No Audits
65f913db732e Return folder writable flag in file_info, set 'editable' flag also on plain…
Author
machniak
Browse Repository
Building
No Audits
244cf81cb300 Varius fixes in invitations/session handling
Author
machniak
Browse Repository
Building
No Audits
da19e02a1a15 For iRony skip only webdav sources that point to the same host
Author
machniak
Browse Repository
Failed
No Audits
000f90850f5e Fix fatal error when creating external store folder
Author
machniak
Browse Repository
Failed
No Audits
a1c0ef49f421 Fix bug in downloading/opening compressed files via WebDAV driver
Author
machniak
Browse Repository
Failed
No Audits
50fb9382121a Fix missing Content-Type on file_get response using WebDAV driver
Author
machniak
Browse Repository
Failed
No Audits
198e713f61a4 Performance: Don't load file content from storage on file_get method with HEAD…
Author
machniak
Browse Repository
Failed
No Audits
0595a657411e Performance: Cache in memory used file object to skip redundant sql queries in…
Author
machniak
Browse Repository
Failed
No Audits
22f9cd9f5db4 Small css fix
Author
machniak
Browse Repository
Failed
No Audits
ff2afff44363 Performance: Skip count query in kolab_storage when expecting only one record…
Author
machniak
Browse Repository
Failed
No Audits
78de3aea9a5f Fix small issue in setting folders tree icons
Author
machniak
Browse Repository
Failed
No Audits
fcf6b5a84386 Fix session validation and redundant session update queries
Author
machniak
Browse Repository
Failed
No Audits
5d9c7e9adf3e Small css fixes regarding truncated icons on folders an files list
Author
machniak
Browse Repository
Failed
No Audits
163d226e1b77 Don't start new session for a file if it already exist for the requested user
Author
machniak
Browse Repository
Failed
No Audits
c6d4b8bdab06 Don't resolve username if it is already provided on invitation
Author
machniak
Browse Repository
Failed
No Audits
7192cf53b035 Support user names and comments in invitations (T859)
Author
machniak
Browse Repository
Failed
No Audits
65481be8426f Support file_info by session ID, cache session_info() data
Author
machniak
Browse Repository
Failed
No Audits
89aa8ebd59e8 More on invitations and notifications
Author
machniak
Browse Repository
Failed
No Audits
e10fbc3186e5 Added an API to track changes in invitations and notify users
Author
machniak
Browse Repository
Failed
No Audits
c97b74b184e6 Invitations removing
Author
machniak
Browse Repository
Failed
No Audits
0143370e9227 Fix document_invite action
Author
machniak
Browse Repository
Failed
No Audits
649be6ac566d Partial invitations support
Author
machniak
Browse Repository
Failed
No Audits
52c7b2465fd6 Add posibility to destroy document sessions (T845)
Author
machniak
Browse Repository
Failed
No Audits
8a3667058710 Joining a session + some improvements, fixed rename-on-copy in Kolab driver
Author
machniak
Browse Repository
Failed
No Audits
f75c0237acd9 Small fixes in sessions handling
Author
machniak
Browse Repository
Failed
No Audits
22630e85211c Small changes in manticore handling on file_info
Author
machniak
Browse Repository
Failed
No Audits
34234d758727 Replace folder_rights action with folder_info which additionally can return…
Author
machniak
Browse Repository
Failed
No Audits
1c3cb93ae9e4 Update Kolab plugins
Author
machniak
Browse Repository
Failed
No Audits
0d7efae76d63 Merge branch 'master' into manticore
Author
machniak
Browse Repository
Failed
No Audits
b59f5eeb3ab1 Initial Manticore support
Author
machniak
Browse Repository
Failed
No Audits
1647ec2a214c Improved file URIs handling, made public the API for this
Author
machniak
Browse Repository
Failed
No Audits
42ce2f2b83d6 Add support for members API actions/events
Author
machniak
Browse Repository
Failed
No Audits
5fa713689d3e Initial Manticore Client API support
Author
machniak
Browse Repository
Failed
No Audits

Changes (11)

Path

Size

doc/

SQL/

mysql.initial.sql

lib/

api/

drivers/

kolab/

kolab_file_storage.php

file_api.php

file_api_core.php

file_manticore.php

file_manticore_api.php

public_html/

js/

files_api.js

rCb8ab3d79b7c8

View Options

doc/SQL/mysql.initial.sql

View Options

lib/api/common.php

View Options

lib/api/document.php

View Options

lib/api/file_info.php

View Options

lib/api/folder_create.php

View Options

lib/drivers/kolab/kolab_file_storage.php

View Options

lib/file_api.php

View Options

lib/file_api_core.php

View Options

lib/file_manticore.php

View Options

lib/file_manticore_api.php

View Options

public_html/js/files_api.js

Merge branch 'manticore'b8ab3d79b7c8Actions

Description

Details

Event Timeline

Merged Changes

Changes (11)

rCb8ab3d79b7c8

doc/SQL/mysql.initial.sql

lib/api/common.php

lib/api/document.php

lib/api/file_info.php

lib/api/folder_create.php

lib/drivers/kolab/kolab_file_storage.php

lib/file_api.php

lib/file_api_core.php

lib/file_manticore.php

lib/file_manticore_api.php

public_html/js/files_api.js

Merge branch 'manticore'
b8ab3d79b7c8
Actions