Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-27 | 1 | -0/+1 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-26 | 4 | -0/+4 |
| | |||||
* | Merge pull request #3388 from roha4000/master | Michael Gapczynski | 2013-05-25 | 1 | -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 Hager | 2013-05-22 | 1 | -2/+2 |
| | | | | | | | | move(). Add storage id to the where clause to avoid updating entries of other users. | ||||
* | | Merge pull request #3493 from owncloud/bumpversion | Michael Gapczynski | 2013-05-25 | 1 | -1/+1 |
|\ \ | | | | | | | Bump version for files_encryption changes | ||||
| * | | Bump version for files_encryption changes | Michael Gapczynski | 2013-05-25 | 1 | -1/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-25 | 4 | -0/+4 |
| | | | |||||
* | | | Merge pull request #3416 from owncloud/files_encryption | Thomas Müller | 2013-05-24 | 5 | -11/+160 |
|\ \ \ | | | | | | | | | New files encryption app | ||||
| * | | | Merge branch 'master' into files_encryption | Björn Schießle | 2013-05-22 | 8 | -20/+47 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: lib/files/cache/cache.php | ||||
| * | | | Merge branch 'master' into files_encryption | Florin Peter | 2013-05-22 | 8 | -8/+162 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: lib/files/cache/cache.php | ||||
| * | | | Merge branch 'master' into files_encryption | Björn Schießle | 2013-05-21 | 2 | -0/+33 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_trashbin/l10n/nn_NO.php | ||||
| * \ \ \ | Merge branch 'master' into files_encryption | Florin Peter | 2013-05-20 | 6 | -10/+82 |
| |\ \ \ \ | |||||
| * | | | | | fix for webdav because initMounts() is triggered twice so we lost the root path | Florin Peter | 2013-05-20 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | Revert "fix for webdav and wrong reference for findByStorageId" | Florin Peter | 2013-05-20 | 2 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 079f918d5ca0d242e77717aaeac82bcf011dc745. | ||||
| * | | | | | fix for webdav and wrong reference for findByStorageId | Florin Peter | 2013-05-19 | 2 | -2/+4 |
| | | | | | | |||||
| * | | | | | revert changes | Florin Peter | 2013-05-17 | 1 | -28/+25 |
| | | | | | | |||||
| * | | | | | add pre-shared hooks | Björn Schießle | 2013-05-16 | 1 | -0/+22 |
| | | | | | | |||||
| * | | | | | allow admin to recover users files in case of password lost | Björn Schießle | 2013-05-16 | 1 | -3/+4 |
| | | | | | | |||||
| * | | | | | fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been ↵ | Florin Peter | 2013-05-15 | 1 | -25/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | correctly initialised in post_addToGroup | ||||
| * | | | | | merge changes for files_encryption | Florin Peter | 2013-05-15 | 1 | -40/+42 |
| | | | | | | |||||
| * | | | | | fix for losing mount point "/" | Florin Peter | 2013-05-15 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into files_encryption | Florin Peter | 2013-05-15 | 95 | -863/+1136 |
| |\ \ \ \ \ | |||||
| * | | | | | | added post rename proxy | Florin Peter | 2013-04-25 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | added unencrypted file size to file cache | Florin Peter | 2013-04-25 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | improved file size calculation and speeds | ||||
| * | | | | | | Added post proxy for getFileInfo. | Florin Peter | 2013-04-23 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for WebDAV and FileSize @samtuke and @schiesbn you guys know a better solution? | ||||
| * | | | | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-04-23 | 60 | -156/+522 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | fix encryption to owncloud user for public link shares | Björn Schießle | 2013-04-22 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | the owner uid is not interesting. We want to get all users who have access ↵ | Björn Schießle | 2013-04-22 | 1 | -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ßle | 2013-04-18 | 1 | -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_encryption | Sam Tuke | 2013-03-29 | 2 | -14/+17 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into files_encryption | Sam Tuke | 2013-03-28 | 123 | -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ßle | 2013-02-22 | 1 | -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ßle | 2013-02-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | link shares | ||||
| * | | | | | | | | | add post_unshareALll hook, update recursively all keyfiles if a folder was ↵ | Björn Schießle | 2013-02-13 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shared/unshared | ||||
| * | | | | | | | | | add post_unshare hook, also add public link shares to the list of user with ↵ | Björn Schießle | 2013-02-13 | 1 | -7/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | access to a file | ||||
| * | | | | | | | | | add option to keep duplicates in the list of users with access to a file, ↵ | Björn Schießle | 2013-02-12 | 1 | -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ßle | 2013-02-12 | 1 | -46/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was already shared | ||||
| * | | | | | | | | | take group shares into account if we retrieve the list a all recipients | Björn Schießle | 2013-02-12 | 1 | -35/+30 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Implementing sharing support | Sam Tuke | 2013-02-11 | 1 | -7/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New file-specific methods in lib/public/share Changes to how keyfiles are stored | ||||
| * | | | | | | | | | Work on post_share hook for files_encryption | Sam Tuke | 2013-02-09 | 1 | -0/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New method in OCP\Share{}:: getUsersSharingFile() Development shapshot | ||||
* | | | | | | | | | | small typo in the comments | Alessandro Cosentino | 2013-05-23 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #3425 from owncloud/move-storages | Michael Gapczynski | 2013-05-23 | 4 | -33/+45 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Support for moving/copying folders between storages | ||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into move-storages | Michael Gapczynski | 2013-05-23 | 16 | -30/+243 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/lib/files/view.php | ||||
| * | | | | | | | | | | Switch to calling deleteAll via storage to avoid emitting delete hook | Michael Gapczynski | 2013-05-23 | 1 | -1/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Remove user name addition to paths in deleteAll | Michael Gapczynski | 2013-05-20 | 1 | -12/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fix undefined variable for copying empty folders | Michael Gapczynski | 2013-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add support for copying/moving folders between storages, move isIgnoredDir() ↵ | Michael Gapczynski | 2013-05-19 | 3 | -21/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to Filesystem | ||||
* | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-24 | 35 | -35/+39 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | cleanup codestyle | Jörn Friedrich Dreyer | 2013-05-22 | 2 | -4/+4 |
| | | | | | | | | | | |||||
* | | | | | | | | | | use to_char only for oracle, whitespace | Jörn Friedrich Dreyer | 2013-05-22 | 3 | -9/+18 |
| | | | | | | | | | |