Merge branch 'multi-driver'
23d233b79e31
Actions

Description

Merge branch 'multi-driver'

Details

Provenance

machniak	Authored on Oct 14 2014, 6:11 PM
machniak	Pushed on Aug 24 2023, 12:19 PM

Parents

R26:ddbf10493c71: Add missing semi-colon
R26:70e8fc24bce3: Shrink some images with TinyPNG

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

ddbf10493c71 Add missing semi-colon
Author
machniak
Browse Repository
No Builds
No Audits
ca61b8b91bb1 Fix SeaFile quota() result
Author
machniak
Browse Repository
No Builds
No Audits
782709e22773 Finish storing external storage configuration in Kolab driver
Author
machniak
Browse Repository
No Builds
No Audits
2d7299758979 Describe Chwala configuration options
Author
machniak
Browse Repository
No Builds
No Audits
ba42ffe978d7 Missing client-side part of interface to manage external storage(s)
Author
machniak
Browse Repository
No Builds
No Audits
1f476a5eccff dirname(__FILE__) -> __DIR__
Author
machniak
Browse Repository
No Builds
No Audits
bb58debeefbb Optimize driver icons
Author
machniak
Browse Repository
No Builds
No Audits
3efb3d021520 Added interface to manage external storage(s)
Author
machniak
Browse Repository
No Builds
No Audits
cca411d89888 SeaFile folders cache
Author
machniak
Browse Repository
No Builds
No Audits
657f60ad7400 Make possible to configure and use more than one storage source at a time.
Author
machniak
Browse Repository
No Builds
No Audits
fd5a5403e773 Implemented SeaFile storage driver.
Author
machniak
Browse Repository
No Builds
No Audits

Changes (190)

Path

Size

config/

lib/

	api/

	file_copy.php
	init.php

	file_create.php
	init.php

	file_delete.php
	init.php

	file_info.php
	init.php

	file_list.php
	init.php

	file_update.php
	init.php

	file_upload.php
	init.php

	folder_delete.php
	init.php

	folder_types.php
	init.php

	lock_create.php
	init.php

	lock_delete.php
	init.php

	lock_list.php
	init.php

	quota.php
	init.php

client/

file_ui_client_main.php

kolab_bonnie_api_client.php

kolab_format_configuration.php

kolab_storage_cache_configuration.php

kolab_storage_config.php

kolab_storage_dataset.php

kolab_storage_folder_api.php

kolab_storage_folder_user.php

kolab_storage_folder_virtual.php

vendor

finediff.php

finediff_modifications.diff

seafile

seafile.png

seafile_api.php

seafile_file_storage.php

seafile_request_observer.php

	drivers/	kolab/
		kolab/

kolab_file_plugin_api.php

kolab_file_storage.php

plugins/

libkolab/

SQL/

mysql/

bin/

lib/

kolab_date_recurrence.php

kolab_format.php

kolab_format_contact.php

kolab_format_distributionlist.php

kolab_format_event.php

kolab_format_file.php

kolab_format_journal.php

	kolab_format_note.php
	kolab_format_file.php

kolab_format_task.php

kolab_format_xcal.php

kolab_storage.php

kolab_storage_cache.php

kolab_storage_cache_contact.php

kolab_storage_cache_event.php

kolab_storage_cache_file.php

kolab_storage_cache_freebusy.php

kolab_storage_cache_journal.php

kolab_storage_cache_mongodb.php

kolab_storage_cache_note.php

kolab_storage_cache_task.php

kolab_storage_folder.php

kolab_file_plugin_api.php

kolab_file_storage.php

kolab_date_recurrence.php

kolab_format.php

kolab_format_configuration.php

kolab_format_contact.php

kolab_format_distributionlist.php

kolab_format_event.php

kolab_format_file.php

kolab_format_journal.php

kolab_format_note.php

kolab_format_task.php

kolab_format_xcal.php

kolab_storage.php

kolab_storage_cache.php

kolab_storage_cache_configuration.php

kolab_storage_cache_contact.php

kolab_storage_cache_event.php

kolab_storage_cache_file.php

kolab_storage_cache_freebusy.php

kolab_storage_cache_journal.php

kolab_storage_cache_mongodb.php

kolab_storage_cache_note.php

kolab_storage_cache_task.php

kolab_storage_folder.php

locale/

viewers/

public_html/

js/

files_api.js

files_ui.js

wModal.js

skins/

default/

style.css

R26:23d233b79e31

View Options

config/config.inc.php.dist

View Options

lib/api/common.php

View Options

lib/api/file_copy.php

View Options

lib/api/file_create.php

View Options

lib/api/file_delete.php

View Options

lib/api/file_get.php

View Options

lib/api/file_info.php

View Options

lib/api/file_list.php

View Options

lib/api/file_move.php

View Options

lib/api/file_update.php

View Options

lib/api/file_upload.php

View Options

lib/api/folder_auth.php

View Options

lib/api/folder_create.php

View Options

lib/api/folder_delete.php

View Options

lib/api/folder_list.php

View Options

lib/api/folder_move.php

View Options

lib/api/folder_types.php

View Options

lib/api/lock_create.php

View Options

lib/api/lock_delete.php

View Options

lib/api/lock_list.php

View Options

lib/api/quota.php

View Options

lib/client/file_ui_client_main.php

View Options

lib/drivers/kolab/kolab.png

View Options

lib/drivers/kolab/kolab_file_plugin_api.php

View Options

lib/drivers/kolab/kolab_file_storage.php

View Options

lib/drivers/kolab/plugins/kolab_auth/LICENSE

View Options

lib/drivers/kolab/plugins/kolab_auth/config.inc.php.dist

View Options

lib/drivers/kolab/plugins/kolab_auth/kolab_auth.php

View Options

lib/drivers/kolab/plugins/kolab_auth/kolab_auth_ldap.php

View Options

lib/drivers/kolab/plugins/kolab_auth/localization/bg_BG.inc

View Options

lib/drivers/kolab/plugins/kolab_auth/localization/de_CH.inc

View Options

lib/drivers/kolab/plugins/kolab_auth/localization/de_DE.inc

View Options

lib/drivers/kolab/plugins/kolab_auth/localization/en_US.inc

View Options

lib/drivers/kolab/plugins/kolab_auth/localization/es_ES.inc

View Options

lib/drivers/kolab/plugins/kolab_auth/localization/et_EE.inc

View Options

lib/drivers/kolab/plugins/kolab_auth/localization/fr_FR.inc

View Options

lib/drivers/kolab/plugins/kolab_auth/localization/ja_JP.inc

View Options

lib/drivers/kolab/plugins/kolab_auth/localization/nl_NL.inc

View Options

lib/drivers/kolab/plugins/kolab_auth/localization/pl_PL.inc

View Options

lib/drivers/kolab/plugins/kolab_auth/localization/pt_BR.inc

View Options

lib/drivers/kolab/plugins/kolab_auth/localization/ru_RU.inc

View Options

lib/drivers/kolab/plugins/kolab_auth/package.xml

View Options

lib/drivers/kolab/plugins/libkolab/LICENSE

View Options

lib/drivers/kolab/plugins/libkolab/README

View Options

lib/drivers/kolab/plugins/libkolab/SQL/mysql.initial.sql

View Options

lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013011000.sql

View Options

lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013041900.sql

View Options

lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013100400.sql

View Options

lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013110400.sql

View Options

lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013121100.sql

View Options

lib/drivers/kolab/plugins/libkolab/SQL/mysql/2014021000.sql

View Options

lib/drivers/kolab/plugins/libkolab/SQL/mysql/2014032700.sql

View Options

lib/drivers/kolab/plugins/libkolab/SQL/mysql/2014040900.sql

View Options

lib/drivers/kolab/plugins/libkolab/SQL/oracle.initial.sql

View Options

lib/drivers/kolab/plugins/libkolab/SQL/postgres.initial.sql

View Options

lib/drivers/kolab/plugins/libkolab/UPGRADING

View Options

lib/drivers/kolab/plugins/libkolab/bin/modcache.sh

View Options

lib/drivers/kolab/plugins/libkolab/bin/randomcontacts.sh

View Options

lib/drivers/kolab/plugins/libkolab/composer.json

View Options

lib/drivers/kolab/plugins/libkolab/config.inc.php.dist

View Options

lib/drivers/kolab/plugins/libkolab/js/folderlist.js

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_bonnie_api.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_bonnie_api_client.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_date_recurrence.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_format.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_format_configuration.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_format_contact.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_format_distributionlist.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_format_event.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_format_file.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_format_journal.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_format_note.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_format_task.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_format_xcal.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_storage.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_configuration.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_contact.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_event.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_file.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_freebusy.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_journal.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_mongodb.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_note.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_task.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_config.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_dataset.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder_api.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder_user.php

View Options

lib/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder_virtual.php

View Options

lib/drivers/kolab/plugins/libkolab/libkolab.php

View Options

lib/drivers/kolab/plugins/libkolab/package.xml

View Options

lib/drivers/kolab/plugins/libkolab/vendor/finediff.php

View Options

lib/drivers/kolab/plugins/libkolab/vendor/finediff_modifications.diff

View Options

lib/drivers/seafile/seafile.png

View Options

lib/drivers/seafile/seafile_api.php

View Options

lib/drivers/seafile/seafile_file_storage.php

View Options

lib/drivers/seafile/seafile_request_observer.php

View Options

lib/file_api.php

View Options

lib/file_locale.php

View Options

lib/file_storage.php

View Options

lib/file_ui.php

View Options

lib/file_ui_output.php

View Options

lib/file_utils.php

View Options

lib/init.php

View Options

lib/kolab

View Options

lib/kolab/kolab_file_plugin_api.php

View Options

lib/kolab/kolab_file_storage.php

View Options

lib/kolab/plugins

View Options

lib/kolab/plugins/kolab_auth/LICENSE

View Options

lib/kolab/plugins/kolab_auth/config.inc.php.dist

View Options

lib/kolab/plugins/kolab_auth/kolab_auth.php

View Options

lib/kolab/plugins/kolab_auth/kolab_auth_ldap.php

View Options

lib/kolab/plugins/kolab_auth/localization/bg_BG.inc

View Options

lib/kolab/plugins/kolab_auth/localization/de_CH.inc

View Options

lib/kolab/plugins/kolab_auth/localization/de_DE.inc

View Options

lib/kolab/plugins/kolab_auth/localization/en_US.inc

View Options

lib/kolab/plugins/kolab_auth/localization/es_ES.inc

View Options

lib/kolab/plugins/kolab_auth/localization/et_EE.inc

View Options

lib/kolab/plugins/kolab_auth/localization/fr_FR.inc

View Options

lib/kolab/plugins/kolab_auth/localization/ja_JP.inc

View Options

lib/kolab/plugins/kolab_auth/localization/nl_NL.inc

View Options

lib/kolab/plugins/kolab_auth/localization/pl_PL.inc

View Options

lib/kolab/plugins/kolab_auth/localization/pt_BR.inc

View Options

lib/kolab/plugins/kolab_auth/localization/ru_RU.inc

View Options

lib/kolab/plugins/kolab_auth/package.xml

View Options

lib/kolab/plugins/libkolab

View Options

lib/kolab/plugins/libkolab/LICENSE

View Options

lib/kolab/plugins/libkolab/README

View Options

lib/kolab/plugins/libkolab/SQL

View Options

lib/kolab/plugins/libkolab/SQL/mysql

View Options

lib/kolab/plugins/libkolab/SQL/mysql.initial.sql

View Options

lib/kolab/plugins/libkolab/SQL/mysql/2013011000.sql

View Options

lib/kolab/plugins/libkolab/SQL/mysql/2013041900.sql

View Options

lib/kolab/plugins/libkolab/SQL/mysql/2013100400.sql

View Options

lib/kolab/plugins/libkolab/SQL/postgres.initial.sql

View Options

lib/kolab/plugins/libkolab/UPGRADING

View Options

lib/kolab/plugins/libkolab/bin

View Options

lib/kolab/plugins/libkolab/bin/modcache.sh

View Options

lib/kolab/plugins/libkolab/config.inc.php.dist

View Options

lib/kolab/plugins/libkolab/lib

View Options

lib/kolab/plugins/libkolab/lib/kolab_date_recurrence.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_format.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_format_configuration.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_format_contact.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_format_distributionlist.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_format_event.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_format_file.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_format_journal.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_format_note.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_format_task.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_format_xcal.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_storage.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_storage_cache.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_storage_cache_configuration.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_storage_cache_contact.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_storage_cache_event.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_storage_cache_file.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_storage_cache_freebusy.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_storage_cache_journal.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_storage_cache_mongodb.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_storage_cache_note.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_storage_cache_task.php

View Options

lib/kolab/plugins/libkolab/lib/kolab_storage_folder.php

View Options

lib/kolab/plugins/libkolab/libkolab.php

View Options

lib/kolab/plugins/libkolab/package.xml

View Options

lib/locale/en_US.php

View Options

lib/viewers/image.php

View Options

lib/viewers/text.php

View Options

public_html/js/files_api.js

View Options

public_html/js/files_ui.js

View Options

public_html/js/wModal.js

View Options

public_html/skins/default/style.css

Merge branch 'multi-driver'23d233b79e31Actions

Description

Details

Event Timeline

Merged Changes

Changes (190)

R26:23d233b79e31

config/config.inc.php.dist

lib/api/common.php

lib/api/file_copy.php

lib/api/file_create.php

lib/api/file_delete.php

lib/api/file_get.php

lib/api/file_info.php

lib/api/file_list.php

lib/api/file_move.php

lib/api/file_update.php

lib/api/file_upload.php

lib/api/folder_auth.php

lib/api/folder_create.php

lib/api/folder_delete.php

lib/api/folder_list.php

lib/api/folder_move.php

lib/api/folder_types.php

lib/api/lock_create.php

lib/api/lock_delete.php

lib/api/lock_list.php

lib/api/quota.php

lib/client/file_ui_client_main.php

lib/drivers/kolab/kolab.png

lib/drivers/kolab/kolab_file_plugin_api.php

lib/drivers/kolab/kolab_file_storage.php

lib/drivers/kolab/plugins/kolab_auth/LICENSE

lib/drivers/kolab/plugins/kolab_auth/config.inc.php.dist

lib/drivers/kolab/plugins/kolab_auth/kolab_auth.php

lib/drivers/kolab/plugins/kolab_auth/kolab_auth_ldap.php

lib/drivers/kolab/plugins/kolab_auth/localization/bg_BG.inc

lib/drivers/kolab/plugins/kolab_auth/localization/de_CH.inc

lib/drivers/kolab/plugins/kolab_auth/localization/de_DE.inc

lib/drivers/kolab/plugins/kolab_auth/localization/en_US.inc

lib/drivers/kolab/plugins/kolab_auth/localization/es_ES.inc

lib/drivers/kolab/plugins/kolab_auth/localization/et_EE.inc

lib/drivers/kolab/plugins/kolab_auth/localization/fr_FR.inc

lib/drivers/kolab/plugins/kolab_auth/localization/ja_JP.inc

lib/drivers/kolab/plugins/kolab_auth/localization/nl_NL.inc

lib/drivers/kolab/plugins/kolab_auth/localization/pl_PL.inc

lib/drivers/kolab/plugins/kolab_auth/localization/pt_BR.inc

lib/drivers/kolab/plugins/kolab_auth/localization/ru_RU.inc

lib/drivers/kolab/plugins/kolab_auth/package.xml

lib/drivers/kolab/plugins/libkolab/LICENSE

lib/drivers/kolab/plugins/libkolab/README

lib/drivers/kolab/plugins/libkolab/SQL/mysql.initial.sql

lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013011000.sql

lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013041900.sql

lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013100400.sql

lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013110400.sql

lib/drivers/kolab/plugins/libkolab/SQL/mysql/2013121100.sql

lib/drivers/kolab/plugins/libkolab/SQL/mysql/2014021000.sql

lib/drivers/kolab/plugins/libkolab/SQL/mysql/2014032700.sql

lib/drivers/kolab/plugins/libkolab/SQL/mysql/2014040900.sql

lib/drivers/kolab/plugins/libkolab/SQL/oracle.initial.sql

lib/drivers/kolab/plugins/libkolab/SQL/postgres.initial.sql

lib/drivers/kolab/plugins/libkolab/UPGRADING

lib/drivers/kolab/plugins/libkolab/bin/modcache.sh

lib/drivers/kolab/plugins/libkolab/bin/randomcontacts.sh

lib/drivers/kolab/plugins/libkolab/composer.json

lib/drivers/kolab/plugins/libkolab/config.inc.php.dist

lib/drivers/kolab/plugins/libkolab/js/folderlist.js

lib/drivers/kolab/plugins/libkolab/lib/kolab_bonnie_api.php

lib/drivers/kolab/plugins/libkolab/lib/kolab_bonnie_api_client.php

lib/drivers/kolab/plugins/libkolab/lib/kolab_date_recurrence.php

lib/drivers/kolab/plugins/libkolab/lib/kolab_format.php

lib/drivers/kolab/plugins/libkolab/lib/kolab_format_configuration.php

lib/drivers/kolab/plugins/libkolab/lib/kolab_format_contact.php

lib/drivers/kolab/plugins/libkolab/lib/kolab_format_distributionlist.php

lib/drivers/kolab/plugins/libkolab/lib/kolab_format_event.php

lib/drivers/kolab/plugins/libkolab/lib/kolab_format_file.php

lib/drivers/kolab/plugins/libkolab/lib/kolab_format_journal.php

lib/drivers/kolab/plugins/libkolab/lib/kolab_format_note.php

lib/drivers/kolab/plugins/libkolab/lib/kolab_format_task.php

Merge branch 'multi-driver'
23d233b79e31
Actions