Commit Graph

182 Commits

Author SHA1 Message Date
Lukas Reschke f6a452cabf Incorporate review changes 2015-02-12 19:14:54 +01:00
windaishi c9b5608405 Improve: Index for file_map
Added two indices for file_map, that improve syncing and uploading and deleting files
2015-02-12 19:12:08 +01:00
Thomas Müller 3e58f5df2e Revert "add share index"
This reverts commit e19b3a8794.
2014-07-17 20:56:06 +02:00
Jörn Friedrich Dreyer b4f40e4da0 shorten userid columns to 64 chars, ref #9186 2014-06-27 16:48:42 +02:00
Thomas Müller da3974bcb2 - drop permissions table and related code
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
2014-06-05 08:22:01 +02:00
Morris Jobke e8ec81110d Merge pull request #8806 from owncloud/add_share_index
add share index
2014-06-02 18:47:13 +02:00
Frank Karlitschek a339855b4c add another index to the filecache to reduce the number of queries without a matching index 2014-05-31 16:55:50 +02:00
Frank Karlitschek e19b3a8794 add share index 2014-05-31 16:47:46 +02:00
Thomas Müller a2e4bc8d33 # This is a combination of 2 commits.
# The first commit's message is:

adding tests for long paths
increment path field in database up to 4000 (maximum for Oracle - otherwise we could use php's 4096)
increment version to trigger database migration
adding unit test for too long path

# This is the 2nd commit message:

fix too long path
2014-05-28 15:30:44 +02:00
Robin Appelman 47245e7417 Add index on oc_appconfig for appid 2013-12-18 15:13:27 +01:00
Andreas Fischer 0013e2e6a8 Fix spacing. 2013-11-26 22:16:14 +01:00
Andreas Fischer 68986f5272 db-doc: privatedata description 2013-11-26 22:13:01 +01:00
Andreas Fischer 2714a22ba8 db-doc: vcategory* descriptions 2013-11-26 22:06:20 +01:00
Andreas Fischer ab773650cd db-doc: users description 2013-11-26 21:53:55 +01:00
Andreas Fischer bc77ba1d4c db-doc: jobs description 2013-11-26 21:52:30 +01:00
Andreas Fischer 8cde5e80f6 db-doc: share description 2013-11-26 21:48:31 +01:00
Andreas Fischer f4031d4320 db-doc: properties description 2013-11-26 21:23:57 +01:00
Andreas Fischer 035199acab db-doc: preferences description 2013-11-26 21:18:42 +01:00
Andreas Fischer 5450d166b0 db-doc: locks description 2013-11-26 21:15:23 +01:00
Andreas Fischer 466e8985a8 db-doc: groups description 2013-11-26 21:14:52 +01:00
Andreas Fischer 43f0e30315 db-doc: group_admin reduction note 2013-11-26 20:55:19 +01:00
Andreas Fischer 790155e574 db-doc: group_admin description 2013-11-26 20:55:08 +01:00
Andreas Fischer 46e32b08c0 db-doc: group_user description 2013-11-26 20:50:21 +01:00
Andreas Fischer 6da5b05176 Remove the dbprefix from comments. It has no information. 2013-11-26 20:42:15 +01:00
Andreas Fischer d083108e72 db-doc: permissions description 2013-11-26 20:41:05 +01:00
Andreas Fischer ea26282493 Prettier ASCII lists. ^^ 2013-11-26 20:27:51 +01:00
Andreas Fischer 421a1e69dc db-doc: filecache description 2013-11-26 20:27:18 +01:00
Andreas Fischer ad603388ca db-doc: mimetypes description 2013-11-26 19:30:59 +01:00
Andreas Fischer 7d1f67b7a9 db-doc: storages description 2013-11-26 18:57:39 +01:00
Andreas Fischer a018dacac2 db-doc: appconfig description 2013-11-26 18:39:19 +01:00
Bart Visscher c5cd0b2d26 Add some more indexes to tables to improve db queries 2013-11-11 17:57:17 +01:00
Thomas Mueller f22684cb3d fixing Specified key was too long; max key length is 767 bytes 2013-11-02 20:52:38 +01:00
Frank Karlitschek 330d026be7 fix the privatedata key value store 2013-10-30 19:36:29 +01:00
Bjoern Schiessle fc76a13c52 Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	lib/public/share.php
2013-09-23 11:18:00 +02:00
Thomas Müller 3189ee2daf setting a default on filecache column unencrypted_size 2013-09-20 20:47:24 +02:00
Bjoern Schiessle b918c06be6 Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	lib/util.php
2013-09-02 14:41:46 +02:00
Bjoern Schiessle 77adaee645 enable user to inform recipients about a shared file by mail 2013-08-30 13:53:49 +02:00
Georg Ehrke 4b5fb08c2c Merge master into oc_preview 2013-08-14 20:56:44 +02:00
Jörn Friedrich Dreyer 9334974a92 allow empty configvalue in appconfig 2013-08-09 11:27:21 +02:00
Georg Ehrke 1c9d52774e update indexes of oc_permissions 2013-08-09 09:31:53 +02:00
Georg Ehrke dcc92445a0 allow permissions.user to be null as suggested by @butonic 2013-08-07 11:51:08 +02:00
Bart Visscher e2b6781cf9 Tweaks to the MDB2SchemaReader 2013-07-18 21:07:56 +02:00
Bart Visscher 21f87d63cf Change nullable of filecache.etag and permissions.user 2013-06-26 18:07:53 +02:00
Jörn Friedrich Dreyer e3e140993d db structure, allow null in columns for '' values 2013-06-11 11:02:57 +02:00
Robin Appelman 24ab525669 Use int for last_run 2013-06-02 22:49:54 +02:00
Robin Appelman 251527c6e6 merge master into backgroundjob 2013-06-02 20:12:44 +02:00
Florin Peter 28d72b822d Merge branch 'master' into files_encryption
Conflicts:
	lib/files/cache/cache.php
2013-05-22 01:26:35 +02:00
Robin Appelman 81fd1badc3 merge master into filecache_mtime 2013-05-21 23:35:19 +02:00
Florin Peter fac288a4ad added unencrypted file size to file cache
improved file size calculation and speeds
2013-04-25 15:20:06 +02:00
Robin Appelman db0ea9780b Add database table for backgroundjob 2013-04-21 00:04:58 +02:00
Thomas Tanghus 44668b36a7 Remove not null constraint. Fix #2976 2013-04-17 14:08:45 +02:00
Arthur Schiwon fe5c00a173 Key must use less then 767 bytes long 2013-04-02 12:06:40 +02:00
Arthur Schiwon 588e1547cf Port OC_Property Table Index 2013-03-27 19:17:20 +01:00
Thomas Tanghus f052846914 Add indexes and primary keys. 2013-03-19 01:38:40 +01:00
Thomas Tanghus 935d2169c8 Revert "Add indexes and primary keys."
This reverts commit 3b33712dc9.
2013-03-19 01:36:51 +01:00
Thomas Tanghus 3b33712dc9 Add indexes and primary keys. 2013-03-19 01:35:12 +01:00
Robin Appelman 2ed850e05b merge master into filecache_mtime 2013-02-15 21:04:48 +01:00
Robin Appelman 9c1196d73e Cache: add seccond mtime field 2013-02-10 12:05:41 +01:00
Robin Appelman 3292dc3eea Cache: allow file sizes >2GB 2013-02-10 16:44:00 +01:00
Robin Appelman 0c05244f8b Mapper: use md5 hashes for database indexes
indexing the full path exeeds the maximum index length for MySQL
2013-02-10 11:49:37 +01:00
Thomas Mueller fd8cb9974b initial version of a local storage implementation which will use unique slugified filename on the local filesystem.
This implementation will only be enabled on windows based system to solve the issues around UTF-8 file names with php on windows.
2013-02-06 23:41:52 +01:00
Robin Appelman 207aa22d12 merge master into filesystem 2013-01-30 19:24:24 +01:00
Björn Schießle 3e0d117d60 add display name to the database table oc_users 2013-01-28 14:38:38 +01:00
Robin Appelman 8ede3290ae Cache: add database indexes for mimetype and mimepart 2013-01-21 22:31:44 +01:00
Michael Gapczynski 6f049d0889 Merge branch 'filesystem' into filesystem-etags 2013-01-11 21:00:02 -05:00
Michael Gapczynski 106541361c Change length of mimetypes to 255, the maximum length according to RFC 4288 2013-01-09 22:57:42 -05:00
Michael Gapczynski 6801f82d09 Merge branch 'filesystem' into filesystem-etags
Conflicts:
	lib/files/cache/cache.php
2013-01-07 10:28:37 -05:00
Robin Appelman d0377b1951 Cache: normalize mimetypes 2013-01-07 02:09:21 +01:00
Robin Appelman 6a6d6756b7 Cache: rename index to prevent colissions with old fscache indexes 2013-01-03 00:29:10 +01:00
Michael Gapczynski 29b82ccdf3 Change length of etag field to 40 2012-12-30 21:23:54 -05:00
Michael Gapczynski 2c23e143d3 Store etags in the file cache 2012-12-30 16:32:55 -05:00
Robin Appelman b12abb2c94 use numeric ids for storages in the filecache 2012-12-15 23:35:07 +01:00
Robin Appelman d33f697a5f merge master into filesystem 2012-11-30 00:18:42 +01:00
Jörn Friedrich Dreyer 71e8755d31 Merge pull request #380 from butonic/feature_share_link_with_token
Feature share link with token
2012-11-26 07:42:53 -08:00
Frank Karlitschek f712ca61df remove the index on the share table because of problems with the index size. Thanks to icewind for spotting this. 2012-11-25 15:09:07 +01:00
Frank Karlitschek ebe3c9130d add a few more indexes. This is just a first step. More work is needed here but this should improve perfomance already for big installations. 2012-11-24 20:58:51 +01:00
Jörn Friedrich Dreyer d8a171df26 implement share via link token 2012-11-20 15:03:12 +01:00
Robin Appelman bf2ac9f113 merge master into filesystem 2012-11-15 00:37:54 +01:00
Robin Appelman c22a723785 add file permissions cache 2012-10-26 19:07:29 +02:00
Thomas Tanghus fc6d1bf500 Clean indentation. 2012-10-19 19:42:59 +02:00
Thomas Tanghus 73c743076e Remove index that might cause problems. 2012-10-19 17:23:54 +02:00
Robin Appelman 3c8e5ea358 this index cant be unique due to collisions of the root of different storages 2012-10-03 11:31:13 +02:00
Robin Appelman 6134e554f2 new filecache table 2012-10-02 23:46:35 +02:00
Thomas Tanghus 241862756e Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-09-30 06:51:40 +02:00
Robin Appelman e8df2eeefc some more sane column sizes for appconfig and preferences 2012-09-27 22:49:01 +02:00
Jörn Friedrich Dreyer 1c97fd7228 shorten index name, oracle can only handle identifiers <=30 chars 2012-09-20 21:05:37 +02:00
Robin Appelman 74ec2765b3 db indexes for appconfig and preferences 2012-09-20 01:36:52 +02:00
Robin Appelman 499567397d use tabs in db_structure 2012-09-20 01:36:51 +02:00
Arthur Schiwon 93d0defe9a set configuvalue in table appconfig back to clob. Likely to break LDAP settings, probably responsible for some bugs with it. Might also cause damage in other apps. That's why it was once already set to clob 2012-09-19 12:55:07 +02:00
Jörn Friedrich Dreyer 7811fa4faf timestamp uses emptystring as NULL default 2012-09-17 17:57:53 +02:00
Jörn Friedrich Dreyer c790a0c476 fix default values: 1. remove whitespace, don't use emptystring for int, remove empty default for nullable columns to use NULL as default 2012-09-17 16:35:31 +02:00
Thomas Tanghus b1a6acde30 Added separate table for OC_VCategories and category/object (event/contact etc.) relations. 2012-09-17 16:03:15 +02:00
Michael Gapczynski 60feaf9abf Merge branch 'master' into share_expiration
Conflicts:
	core/js/share.js
	lib/util.php
2012-09-12 01:06:57 -04:00
Michael Gapczynski b194ac3dde Add expiration column to share table and bump version number 2012-09-12 01:01:45 -04:00
Thomas Tanghus e2ead7db86 Changed oc_preferences configvalue back to clob as it will give us bug reports in calendar, contacts and tasks if less. 2012-09-05 17:22:03 +02:00
Michael Gapczynski fd2ca21fc2 Allow share_with column to be null for links 2012-08-28 09:51:00 -04:00
Jörn Friedrich Dreyer f105e9b454 remove oc_log, as it is unused
add length to text columns or newer mysql will produce columns too wide
2012-08-27 13:40:48 +02:00
jfd 59eb693e51 fix typo in db_structure 2012-08-25 02:13:15 +02:00
Jörn Friedrich Dreyer c8255a170c Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
Conflicts:
	3rdparty/Sabre/CardDAV/Plugin.php
	3rdparty/smb4php/smb.php
	apps/bookmarks/ajax/addBookmark.php
	apps/bookmarks/ajax/editBookmark.php
	apps/bookmarks/appinfo/migrate.php
	apps/calendar/ajax/calendar/edit.form.php
	apps/calendar/ajax/changeview.php
	apps/calendar/ajax/import/import.php
	apps/calendar/ajax/settings/guesstimezone.php
	apps/calendar/ajax/settings/setfirstday.php
	apps/calendar/ajax/settings/settimeformat.php
	apps/calendar/ajax/share/changepermission.php
	apps/calendar/ajax/share/share.php
	apps/calendar/ajax/share/unshare.php
	apps/calendar/appinfo/app.php
	apps/calendar/appinfo/remote.php
	apps/calendar/appinfo/update.php
	apps/calendar/appinfo/version
	apps/calendar/js/calendar.js
	apps/calendar/l10n/da.php
	apps/calendar/l10n/de.php
	apps/calendar/l10n/fi_FI.php
	apps/calendar/l10n/gl.php
	apps/calendar/l10n/he.php
	apps/calendar/l10n/hr.php
	apps/calendar/l10n/ja_JP.php
	apps/calendar/l10n/lb.php
	apps/calendar/l10n/lt_LT.php
	apps/calendar/l10n/nb_NO.php
	apps/calendar/l10n/pl.php
	apps/calendar/l10n/pt_PT.php
	apps/calendar/l10n/ro.php
	apps/calendar/l10n/ru.php
	apps/calendar/l10n/sv.php
	apps/calendar/l10n/zh_CN.php
	apps/calendar/l10n/zh_TW.php
	apps/calendar/lib/app.php
	apps/calendar/lib/calendar.php
	apps/calendar/lib/object.php
	apps/calendar/lib/share.php
	apps/calendar/templates/part.choosecalendar.rowfields.php
	apps/calendar/templates/part.import.php
	apps/calendar/templates/settings.php
	apps/contacts/ajax/activation.php
	apps/contacts/ajax/addressbook/delete.php
	apps/contacts/ajax/contact/add.php
	apps/contacts/ajax/contact/addproperty.php
	apps/contacts/ajax/contact/delete.php
	apps/contacts/ajax/contact/deleteproperty.php
	apps/contacts/ajax/contact/saveproperty.php
	apps/contacts/ajax/createaddressbook.php
	apps/contacts/ajax/cropphoto.php
	apps/contacts/ajax/currentphoto.php
	apps/contacts/ajax/importaddressbook.php
	apps/contacts/ajax/oc_photo.php
	apps/contacts/ajax/savecrop.php
	apps/contacts/ajax/selectaddressbook.php
	apps/contacts/ajax/updateaddressbook.php
	apps/contacts/ajax/uploadimport.php
	apps/contacts/ajax/uploadphoto.php
	apps/contacts/appinfo/migrate.php
	apps/contacts/appinfo/remote.php
	apps/contacts/css/contacts.css
	apps/contacts/import.php
	apps/contacts/index.php
	apps/contacts/js/contacts.js
	apps/contacts/l10n/ca.php
	apps/contacts/l10n/cs_CZ.php
	apps/contacts/l10n/da.php
	apps/contacts/l10n/de.php
	apps/contacts/l10n/el.php
	apps/contacts/l10n/eo.php
	apps/contacts/l10n/es.php
	apps/contacts/l10n/et_EE.php
	apps/contacts/l10n/eu.php
	apps/contacts/l10n/fa.php
	apps/contacts/l10n/fi_FI.php
	apps/contacts/l10n/fr.php
	apps/contacts/l10n/he.php
	apps/contacts/l10n/hr.php
	apps/contacts/l10n/hu_HU.php
	apps/contacts/l10n/ia.php
	apps/contacts/l10n/it.php
	apps/contacts/l10n/ja_JP.php
	apps/contacts/l10n/ko.php
	apps/contacts/l10n/lb.php
	apps/contacts/l10n/mk.php
	apps/contacts/l10n/nb_NO.php
	apps/contacts/l10n/nl.php
	apps/contacts/l10n/pl.php
	apps/contacts/l10n/pt_BR.php
	apps/contacts/l10n/pt_PT.php
	apps/contacts/l10n/ro.php
	apps/contacts/l10n/ru.php
	apps/contacts/l10n/sk_SK.php
	apps/contacts/l10n/sl.php
	apps/contacts/l10n/sv.php
	apps/contacts/l10n/th_TH.php
	apps/contacts/l10n/tr.php
	apps/contacts/l10n/zh_CN.php
	apps/contacts/l10n/zh_TW.php
	apps/contacts/lib/addressbook.php
	apps/contacts/lib/hooks.php
	apps/contacts/lib/vcard.php
	apps/contacts/photo.php
	apps/contacts/templates/part.contact.php
	apps/contacts/templates/part.contacts.php
	apps/contacts/templates/part.cropphoto.php
	apps/contacts/templates/part.importaddressbook.php
	apps/contacts/templates/part.selectaddressbook.php
	apps/contacts/thumbnail.php
	apps/files/ajax/download.php
	apps/files/ajax/newfile.php
	apps/files/ajax/timezone.php
	apps/files/appinfo/update.php
	apps/files/appinfo/version
	apps/files/index.php
	apps/files/js/fileactions.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/l10n/ar.php
	apps/files/l10n/bg_BG.php
	apps/files/l10n/ca.php
	apps/files/l10n/cs_CZ.php
	apps/files/l10n/da.php
	apps/files/l10n/de.php
	apps/files/l10n/el.php
	apps/files/l10n/eo.php
	apps/files/l10n/es.php
	apps/files/l10n/et_EE.php
	apps/files/l10n/eu.php
	apps/files/l10n/fa.php
	apps/files/l10n/fi_FI.php
	apps/files/l10n/fr.php
	apps/files/l10n/gl.php
	apps/files/l10n/he.php
	apps/files/l10n/hr.php
	apps/files/l10n/hu_HU.php
	apps/files/l10n/ia.php
	apps/files/l10n/id.php
	apps/files/l10n/it.php
	apps/files/l10n/ja_JP.php
	apps/files/l10n/ko.php
	apps/files/l10n/lb.php
	apps/files/l10n/lt_LT.php
	apps/files/l10n/mk.php
	apps/files/l10n/ms_MY.php
	apps/files/l10n/nb_NO.php
	apps/files/l10n/nl.php
	apps/files/l10n/nn_NO.php
	apps/files/l10n/pl.php
	apps/files/l10n/pt_BR.php
	apps/files/l10n/pt_PT.php
	apps/files/l10n/ro.php
	apps/files/l10n/ru.php
	apps/files/l10n/sk_SK.php
	apps/files/l10n/sl.php
	apps/files/l10n/sr.php
	apps/files/l10n/sr@latin.php
	apps/files/l10n/sv.php
	apps/files/l10n/th_TH.php
	apps/files/l10n/tr.php
	apps/files/l10n/uk.php
	apps/files/l10n/zh_CN.php
	apps/files/l10n/zh_TW.php
	apps/files_archive/js/archive.js
	apps/files_encryption/lib/cryptstream.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/tests/proxy.php
	apps/files_external/appinfo/app.php
	apps/files_external/lib/smb.php
	apps/files_external/lib/streamwrapper.php
	apps/files_external/tests/config.php
	apps/files_external/tests/smb.php
	apps/files_sharing/ajax/email.php
	apps/files_sharing/ajax/getitem.php
	apps/files_sharing/ajax/setpermissions.php
	apps/files_sharing/ajax/share.php
	apps/files_sharing/ajax/toggleresharing.php
	apps/files_sharing/ajax/unshare.php
	apps/files_sharing/ajax/userautocomplete.php
	apps/files_sharing/js/settings.js
	apps/files_sharing/js/share.js
	apps/files_sharing/lib_share.php
	apps/files_sharing/settings.php
	apps/files_sharing/sharedstorage.php
	apps/files_sharing/templates/settings.php
	apps/files_versions/ajax/rollbackVersion.php
	apps/files_versions/versions.php
	apps/gallery/ajax/thumbnail.php
	apps/gallery/appinfo/app.php
	apps/gallery/appinfo/update.php
	apps/gallery/appinfo/version
	apps/gallery/css/styles.css
	apps/gallery/index.php
	apps/gallery/js/pictures.js
	apps/gallery/l10n/ca.php
	apps/gallery/l10n/cs_CZ.php
	apps/gallery/l10n/de.php
	apps/gallery/l10n/el.php
	apps/gallery/l10n/es.php
	apps/gallery/l10n/fi_FI.php
	apps/gallery/l10n/fr.php
	apps/gallery/l10n/it.php
	apps/gallery/l10n/pl.php
	apps/gallery/l10n/pt_PT.php
	apps/gallery/l10n/ru.php
	apps/gallery/l10n/sl.php
	apps/gallery/l10n/sv.php
	apps/gallery/l10n/th_TH.php
	apps/gallery/l10n/tr.php
	apps/gallery/l10n/zh_CN.php
	apps/gallery/lib/album.php
	apps/gallery/lib/hooks_handlers.php
	apps/gallery/lib/managers.php
	apps/gallery/lib/photo.php
	apps/gallery/lib/tiles.php
	apps/gallery/lib/tiles_test.php
	apps/gallery/templates/index.php
	apps/media/lib_ampache.php
	apps/media/lib_collection.php
	apps/media/lib_media.php
	apps/remoteStorage/lib_remoteStorage.php
	apps/tasks/ajax/addtaskform.php
	apps/tasks/ajax/edittask.php
	apps/user_ldap/appinfo/update.php
	apps/user_ldap/group_ldap.php
	apps/user_ldap/lib_ldap.php
	apps/user_ldap/settings.php
	apps/user_ldap/templates/settings.php
	apps/user_ldap/user_ldap.php
	apps/user_migrate/appinfo/app.php
	apps/user_migrate/templates/settings.php
	apps/user_webfinger/host-meta.php
	config/config.sample.php
	core/js/js.js
	core/l10n/da.php
	core/l10n/de.php
	core/l10n/fi_FI.php
	core/l10n/gl.php
	core/l10n/he.php
	core/l10n/hr.php
	core/l10n/id.php
	core/l10n/ja_JP.php
	core/l10n/lb.php
	core/l10n/lt_LT.php
	core/l10n/nb_NO.php
	core/l10n/pl.php
	core/l10n/pt_PT.php
	core/l10n/ro.php
	core/l10n/ru.php
	core/l10n/sv.php
	core/lostpassword/index.php
	core/templates/layout.user.php
	core/templates/login.php
	db_structure.xml
	index.php
	l10n/af/calendar.po
	l10n/af/contacts.po
	l10n/af/core.po
	l10n/af/files.po
	l10n/af/settings.po
	l10n/ar/calendar.po
	l10n/ar/contacts.po
	l10n/ar/core.po
	l10n/ar/files.po
	l10n/ar/media.po
	l10n/ar/settings.po
	l10n/bg_BG/calendar.po
	l10n/bg_BG/contacts.po
	l10n/bg_BG/core.po
	l10n/bg_BG/files.po
	l10n/bg_BG/media.po
	l10n/bg_BG/settings.po
	l10n/ca/calendar.po
	l10n/ca/contacts.po
	l10n/ca/core.po
	l10n/ca/files.po
	l10n/ca/gallery.po
	l10n/ca/settings.po
	l10n/cs_CZ/calendar.po
	l10n/cs_CZ/contacts.po
	l10n/cs_CZ/core.po
	l10n/cs_CZ/files.po
	l10n/cs_CZ/gallery.po
	l10n/cs_CZ/settings.po
	l10n/da/calendar.po
	l10n/da/contacts.po
	l10n/da/core.po
	l10n/da/files.po
	l10n/da/settings.po
	l10n/de/calendar.po
	l10n/de/contacts.po
	l10n/de/core.po
	l10n/de/files.po
	l10n/de/gallery.po
	l10n/de/settings.po
	l10n/el/calendar.po
	l10n/el/contacts.po
	l10n/el/core.po
	l10n/el/files.po
	l10n/el/gallery.po
	l10n/el/settings.po
	l10n/eo/calendar.po
	l10n/eo/contacts.po
	l10n/eo/core.po
	l10n/eo/files.po
	l10n/eo/media.po
	l10n/eo/settings.po
	l10n/es/calendar.po
	l10n/es/contacts.po
	l10n/es/core.po
	l10n/es/files.po
	l10n/es/gallery.po
	l10n/es/settings.po
	l10n/et_EE/calendar.po
	l10n/et_EE/contacts.po
	l10n/et_EE/core.po
	l10n/et_EE/files.po
	l10n/et_EE/settings.po
	l10n/eu/calendar.po
	l10n/eu/contacts.po
	l10n/eu/core.po
	l10n/eu/files.po
	l10n/eu/settings.po
	l10n/fa/calendar.po
	l10n/fa/contacts.po
	l10n/fa/core.po
	l10n/fa/files.po
	l10n/fa/settings.po
	l10n/fi_FI/calendar.po
	l10n/fi_FI/contacts.po
	l10n/fi_FI/core.po
	l10n/fi_FI/files.po
	l10n/fi_FI/gallery.po
	l10n/fi_FI/settings.po
	l10n/fr/calendar.po
	l10n/fr/contacts.po
	l10n/fr/core.po
	l10n/fr/files.po
	l10n/fr/gallery.po
	l10n/fr/media.po
	l10n/fr/settings.po
	l10n/gl/calendar.po
	l10n/gl/contacts.po
	l10n/gl/core.po
	l10n/gl/files.po
	l10n/gl/settings.po
	l10n/he/calendar.po
	l10n/he/contacts.po
	l10n/he/core.po
	l10n/he/files.po
	l10n/he/settings.po
	l10n/hr/calendar.po
	l10n/hr/contacts.po
	l10n/hr/core.po
	l10n/hr/files.po
	l10n/hr/settings.po
	l10n/hu_HU/calendar.po
	l10n/hu_HU/contacts.po
	l10n/hu_HU/core.po
	l10n/hu_HU/files.po
	l10n/hu_HU/settings.po
	l10n/hy/calendar.po
	l10n/hy/contacts.po
	l10n/hy/core.po
	l10n/hy/files.po
	l10n/hy/settings.po
	l10n/ia/calendar.po
	l10n/ia/contacts.po
	l10n/ia/core.po
	l10n/ia/files.po
	l10n/ia/settings.po
	l10n/id/calendar.po
	l10n/id/contacts.po
	l10n/id/core.po
	l10n/id/files.po
	l10n/id/settings.po
	l10n/it/calendar.po
	l10n/it/contacts.po
	l10n/it/core.po
	l10n/it/files.po
	l10n/it/gallery.po
	l10n/it/settings.po
	l10n/ja_JP/calendar.po
	l10n/ja_JP/contacts.po
	l10n/ja_JP/core.po
	l10n/ja_JP/files.po
	l10n/ja_JP/settings.po
	l10n/ko/calendar.po
	l10n/ko/contacts.po
	l10n/ko/core.po
	l10n/ko/files.po
	l10n/ko/settings.po
	l10n/lb/calendar.po
	l10n/lb/contacts.po
	l10n/lb/core.po
	l10n/lb/files.po
	l10n/lb/settings.po
	l10n/lt_LT/calendar.po
	l10n/lt_LT/contacts.po
	l10n/lt_LT/core.po
	l10n/lt_LT/files.po
	l10n/lt_LT/settings.po
	l10n/mk/calendar.po
	l10n/mk/contacts.po
	l10n/mk/core.po
	l10n/mk/files.po
	l10n/mk/settings.po
	l10n/ms_MY/calendar.po
	l10n/ms_MY/contacts.po
	l10n/ms_MY/core.po
	l10n/ms_MY/files.po
	l10n/ms_MY/settings.po
	l10n/nb_NO/calendar.po
	l10n/nb_NO/contacts.po
	l10n/nb_NO/core.po
	l10n/nb_NO/files.po
	l10n/nb_NO/settings.po
	l10n/nl/calendar.po
	l10n/nl/contacts.po
	l10n/nl/core.po
	l10n/nl/files.po
	l10n/nl/settings.po
	l10n/nn_NO/calendar.po
	l10n/nn_NO/contacts.po
	l10n/nn_NO/core.po
	l10n/nn_NO/files.po
	l10n/nn_NO/settings.po
	l10n/pl/calendar.po
	l10n/pl/contacts.po
	l10n/pl/core.po
	l10n/pl/files.po
	l10n/pl/gallery.po
	l10n/pl/settings.po
	l10n/pt_BR/calendar.po
	l10n/pt_BR/contacts.po
	l10n/pt_BR/core.po
	l10n/pt_BR/files.po
	l10n/pt_BR/settings.po
	l10n/pt_PT/calendar.po
	l10n/pt_PT/contacts.po
	l10n/pt_PT/core.po
	l10n/pt_PT/files.po
	l10n/pt_PT/gallery.po
	l10n/pt_PT/settings.po
	l10n/ro/calendar.po
	l10n/ro/contacts.po
	l10n/ro/core.po
	l10n/ro/files.po
	l10n/ro/settings.po
	l10n/ru/calendar.po
	l10n/ru/contacts.po
	l10n/ru/core.po
	l10n/ru/files.po
	l10n/ru/gallery.po
	l10n/ru/settings.po
	l10n/sk_SK/calendar.po
	l10n/sk_SK/contacts.po
	l10n/sk_SK/core.po
	l10n/sk_SK/files.po
	l10n/sk_SK/settings.po
	l10n/sl/calendar.po
	l10n/sl/contacts.po
	l10n/sl/core.po
	l10n/sl/files.po
	l10n/sl/gallery.po
	l10n/sl/settings.po
	l10n/sr/calendar.po
	l10n/sr/contacts.po
	l10n/sr/core.po
	l10n/sr/files.po
	l10n/sr/settings.po
	l10n/sr@latin/calendar.po
	l10n/sr@latin/contacts.po
	l10n/sr@latin/core.po
	l10n/sr@latin/files.po
	l10n/sr@latin/settings.po
	l10n/sv/calendar.po
	l10n/sv/contacts.po
	l10n/sv/core.po
	l10n/sv/files.po
	l10n/sv/gallery.po
	l10n/sv/media.po
	l10n/sv/settings.po
	l10n/templates/bookmarks.pot
	l10n/templates/calendar.pot
	l10n/templates/contacts.pot
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/gallery.pot
	l10n/templates/media.pot
	l10n/templates/settings.pot
	l10n/th_TH/calendar.po
	l10n/th_TH/contacts.po
	l10n/th_TH/core.po
	l10n/th_TH/files.po
	l10n/th_TH/gallery.po
	l10n/th_TH/settings.po
	l10n/tr/calendar.po
	l10n/tr/contacts.po
	l10n/tr/core.po
	l10n/tr/files.po
	l10n/tr/gallery.po
	l10n/tr/settings.po
	l10n/uk/calendar.po
	l10n/uk/contacts.po
	l10n/uk/core.po
	l10n/uk/files.po
	l10n/uk/media.po
	l10n/uk/settings.po
	l10n/zh_CN/calendar.po
	l10n/zh_CN/contacts.po
	l10n/zh_CN/core.po
	l10n/zh_CN/files.po
	l10n/zh_CN/gallery.po
	l10n/zh_CN/settings.po
	l10n/zh_TW/calendar.po
	l10n/zh_TW/contacts.po
	l10n/zh_TW/core.po
	l10n/zh_TW/files.po
	l10n/zh_TW/settings.po
	lib/app.php
	lib/base.php
	lib/connector/sabre/file.php
	lib/connector/sabre/locks.php
	lib/connector/sabre/node.php
	lib/db.php
	lib/filecache.php
	lib/fileproxy/quota.php
	lib/files.php
	lib/filestorage/local.php
	lib/filesystemview.php
	lib/group/database.php
	lib/helper.php
	lib/installer.php
	lib/json.php
	lib/l10n.php
	lib/migrate.php
	lib/mimetypes.fixlist.php
	lib/ocs.php
	lib/preferences.php
	lib/public/json.php
	lib/public/util.php
	lib/template.php
	lib/user.php
	lib/user/database.php
	lib/util.php
	lib/vcategories.php
	ocs/providers.php
	settings/admin.php
	settings/ajax/lostpassword.php
	settings/ajax/removeuser.php
	settings/ajax/setbackgroundjobsmode.php
	settings/ajax/setlanguage.php
	settings/ajax/setquota.php
	settings/ajax/togglegroups.php
	settings/apps.php
	settings/css/settings.css
	settings/js/apps.js
	settings/js/users.js
	settings/l10n/bg_BG.php
	settings/l10n/ca.php
	settings/l10n/cs_CZ.php
	settings/l10n/da.php
	settings/l10n/de.php
	settings/l10n/el.php
	settings/l10n/eo.php
	settings/l10n/es.php
	settings/l10n/et_EE.php
	settings/l10n/eu.php
	settings/l10n/fa.php
	settings/l10n/fi_FI.php
	settings/l10n/fr.php
	settings/l10n/gl.php
	settings/l10n/he.php
	settings/l10n/hr.php
	settings/l10n/hu_HU.php
	settings/l10n/it.php
	settings/l10n/ja_JP.php
	settings/l10n/ko.php
	settings/l10n/lt_LT.php
	settings/l10n/mk.php
	settings/l10n/ms_MY.php
	settings/l10n/nb_NO.php
	settings/l10n/nl.php
	settings/l10n/nn_NO.php
	settings/l10n/pl.php
	settings/l10n/pt_BR.php
	settings/l10n/pt_PT.php
	settings/l10n/ru.php
	settings/l10n/sk_SK.php
	settings/l10n/sl.php
	settings/l10n/sv.php
	settings/l10n/th_TH.php
	settings/l10n/tr.php
	settings/l10n/zh_CN.php
	settings/personal.php
	settings/templates/admin.php
	settings/templates/users.php
2012-08-25 00:05:07 +02:00
Michael Gapczynski 4c7fd8cd01 Merge branch 'master' into share_api
Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php
2012-08-14 10:22:13 -04:00