summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-05-271-0/+1
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-05-264-0/+4
|
* Merge pull request #3388 from roha4000/masterMichael Gapczynski2013-05-251-2/+2
|\ | | | | Duplicate DB entries in filecache table when renaming folder in WebUI #2
| * Fixing UPDATE error in filecache table when renaming files by calling ↵Roland Hager2013-05-221-2/+2
| | | | | | | | move(). Add storage id to the where clause to avoid updating entries of other users.
* | Merge pull request #3493 from owncloud/bumpversionMichael Gapczynski2013-05-251-1/+1
|\ \ | | | | | | Bump version for files_encryption changes
| * | Bump version for files_encryption changesMichael Gapczynski2013-05-251-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-254-0/+4
| | |
* | | Merge pull request #3416 from owncloud/files_encryptionThomas Müller2013-05-245-11/+160
|\ \ \ | | | | | | | | New files encryption app
| * | | Merge branch 'master' into files_encryptionBjörn Schießle2013-05-228-20/+47
| |\| | | | | | | | | | | | | | | | | | Conflicts: lib/files/cache/cache.php
| * | | Merge branch 'master' into files_encryptionFlorin Peter2013-05-228-8/+162
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: lib/files/cache/cache.php
| * | | Merge branch 'master' into files_encryptionBjörn Schießle2013-05-212-0/+33
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_trashbin/l10n/nn_NO.php
| * \ \ \ Merge branch 'master' into files_encryptionFlorin Peter2013-05-206-10/+82
| |\ \ \ \
| * | | | | fix for webdav because initMounts() is triggered twice so we lost the root pathFlorin Peter2013-05-201-1/+3
| | | | | |
| * | | | | Revert "fix for webdav and wrong reference for findByStorageId"Florin Peter2013-05-202-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 079f918d5ca0d242e77717aaeac82bcf011dc745.
| * | | | | fix for webdav and wrong reference for findByStorageIdFlorin Peter2013-05-192-2/+4
| | | | | |
| * | | | | revert changesFlorin Peter2013-05-171-28/+25
| | | | | |
| * | | | | add pre-shared hooksBjörn Schießle2013-05-161-0/+22
| | | | | |
| * | | | | allow admin to recover users files in case of password lostBjörn Schießle2013-05-161-3/+4
| | | | | |
| * | | | | fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been ↵Florin Peter2013-05-151-25/+28
| | | | | | | | | | | | | | | | | | | | | | | | correctly initialised in post_addToGroup
| * | | | | merge changes for files_encryptionFlorin Peter2013-05-151-40/+42
| | | | | |
| * | | | | fix for losing mount point "/"Florin Peter2013-05-151-1/+4
| | | | | |
| * | | | | Merge branch 'master' into files_encryptionFlorin Peter2013-05-1595-863/+1136
| |\ \ \ \ \
| * | | | | | added post rename proxyFlorin Peter2013-04-251-0/+1
| | | | | | |
| * | | | | | added unencrypted file size to file cacheFlorin Peter2013-04-251-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | improved file size calculation and speeds
| * | | | | | Added post proxy for getFileInfo.Florin Peter2013-04-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for WebDAV and FileSize @samtuke and @schiesbn you guys know a better solution?
| * | | | | | Merge branch 'master' into files_encryptionSam Tuke2013-04-2360-156/+522
| |\ \ \ \ \ \
| * | | | | | | fix encryption to owncloud user for public link sharesBjörn Schießle2013-04-221-1/+1
| | | | | | | |
| * | | | | | | the owner uid is not interesting. We want to get all users who have access ↵Björn Schießle2013-04-221-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the given item source, no matter from whom it was shared
| * | | | | | | we need to add the owner of the file as parameter in case someone else like ↵Björn Schießle2013-04-181-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the owner edits the file; if $includeOwner is set than add owner also if no other recipient was found. This changes enable all user with write access to the file to edit it and to encrypt it to the right list of users again
| * | | | | | | Merge branch 'master' into files_encryptionSam Tuke2013-03-292-14/+17
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into files_encryptionSam Tuke2013-03-28123-1072/+4523
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/crypt.php apps/files_encryption/lib/keymanager.php
| * | | | | | | | | isSharedFile() doesn't detect all shares, just use getUsersSharingFile() ↵Björn Schießle2013-02-221-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directly either you get a list of users or not
| * | | | | | | | | create keypair for ownCloud with empty passphrase, will be used for public ↵Björn Schießle2013-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | link shares
| * | | | | | | | | add post_unshareALll hook, update recursively all keyfiles if a folder was ↵Björn Schießle2013-02-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shared/unshared
| * | | | | | | | | add post_unshare hook, also add public link shares to the list of user with ↵Björn Schießle2013-02-131-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | access to a file
| * | | | | | | | | add option to keep duplicates in the list of users with access to a file, ↵Björn Schießle2013-02-121-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e.g. for the unshare operation we need to know if access was granted more than once, for example as group share and as individual share
| * | | | | | | | | also find users with access to the file if a folder above the actual file ↵Björn Schießle2013-02-121-46/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was already shared
| * | | | | | | | | take group shares into account if we retrieve the list a all recipientsBjörn Schießle2013-02-121-35/+30
| | | | | | | | | |
| * | | | | | | | | Implementing sharing supportSam Tuke2013-02-111-7/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New file-specific methods in lib/public/share Changes to how keyfiles are stored
| * | | | | | | | | Work on post_share hook for files_encryptionSam Tuke2013-02-091-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New method in OCP\Share{}:: getUsersSharingFile() Development shapshot
* | | | | | | | | | small typo in the commentsAlessandro Cosentino2013-05-231-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3425 from owncloud/move-storagesMichael Gapczynski2013-05-234-33/+45
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Support for moving/copying folders between storages
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into move-storagesMichael Gapczynski2013-05-2316-30/+243
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/lib/files/view.php
| * | | | | | | | | | Switch to calling deleteAll via storage to avoid emitting delete hookMichael Gapczynski2013-05-231-1/+2
| | | | | | | | | | |
| * | | | | | | | | | Remove user name addition to paths in deleteAllMichael Gapczynski2013-05-201-12/+6
| | | | | | | | | | |
| * | | | | | | | | | Fix undefined variable for copying empty foldersMichael Gapczynski2013-05-191-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Add support for copying/moving folders between storages, move isIgnoredDir() ↵Michael Gapczynski2013-05-193-21/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to Filesystem
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-2435-35/+39
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | cleanup codestyleJörn Friedrich Dreyer2013-05-222-4/+4
| | | | | | | | | |
* | | | | | | | | | use to_char only for oracle, whitespaceJörn Friedrich Dreyer2013-05-223-9/+18
| | | | | | | | | |