| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | improve encryption message | Morris Jobke | 2013-11-27 | 1 | -1/+1 |
| | | |||||
| * | some small js fixes | Bjoern Schiessle | 2013-11-27 | 1 | -2/+2 |
| | | |||||
| * | add spinner to the template so that it can be loaded in time | Bjoern Schiessle | 2013-11-27 | 1 | -1/+1 |
| | | |||||
| * | switch to large spinner | Bjoern Schiessle | 2013-11-27 | 1 | -2/+2 |
| | | |||||
| * | switch from "name" attribute to "id" | Bjoern Schiessle | 2013-11-27 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' into encryption_initial_enc_indicator | Bjoern Schiessle | 2013-11-27 | 7 | -101/+130 |
| |\ | |||||
| | * | Merge branch 'master' into encryption_enable_public_upload | Bjoern Schiessle | 2013-11-27 | 12 | -44/+71 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/helper.php apps/files_encryption/lib/keymanager.php apps/files_encryption/lib/stream.php apps/files_encryption/lib/util.php apps/files_encryption/tests/keymanager.php | ||||
| | | * | Merge pull request #5976 from owncloud/encryption_work_with_public_gallery | Thomas Müller | 2013-11-27 | 7 | -93/+123 |
| | | |\ | | | | | | | | | Encryption work with public gallery | ||||
| | | | * | typo fixed | Bjoern Schiessle | 2013-11-27 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | some small changes according to the review comments | Bjoern Schiessle | 2013-11-27 | 7 | -18/+19 |
| | | | | | |||||
| | | | * | Merge branch 'encryption_work_with_public_gallery' of ↵ | Bjoern Schiessle | 2013-11-25 | 3 | -19/+48 |
| | | | |\ | | | | | | | | | | | | | | | | github.com:owncloud/core into encryption_work_with_public_gallery | ||||
| | | | | * | Merge branch 'master' into encryption_work_with_public_gallery | Thomas Mueller | 2013-11-24 | 3 | -19/+48 |
| | | | | |\ | |||||
| | | | * | | | fix typo in comment | Bjoern Schiessle | 2013-11-25 | 1 | -1/+1 |
| | | | |/ / | |||||
| | * | | | | Merge branch 'encryption_work_with_public_gallery' into ↵ | Bjoern Schiessle | 2013-11-21 | 1 | -4/+10 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | encryption_enable_public_upload | ||||
| | | * | | | | check HTTP Referer to check if we come from public.php or from a internal page. | Bjoern Schiessle | 2013-11-21 | 1 | -4/+10 |
| | | | |/ / | | |/| | | | | | | | | | | | | Necessary to detect public access also if a user is logged in. | ||||
| | * | | | | Merge branch 'encryption_work_with_public_gallery' into ↵ | Bjoern Schiessle | 2013-11-21 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | | | | | encryption_enable_public_upload | ||||
| | | * | | | fix getFileKey() call | Bjoern Schiessle | 2013-11-21 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'encryption_work_with_public_gallery' into ↵ | Bjoern Schiessle | 2013-11-21 | 4 | -13/+15 |
| | |\| | | | | | | | | | | | | | | | | | | encryption_enable_public_upload | ||||
| | | * | | | Merge branch 'master' into encryption_work_with_public_gallery | Bjoern Schiessle | 2013-11-21 | 4 | -13/+15 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/keymanager.php apps/files_encryption/lib/stream.php apps/files_encryption/lib/util.php apps/files_encryption/tests/crypt.php | ||||
| | * | | | | | Merge branch 'encryption_work_with_public_gallery' into ↵ | Bjoern Schiessle | 2013-11-21 | 2 | -29/+34 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encryption_enable_public_upload Conflicts: apps/files_encryption/lib/stream.php | ||||
| | | * | | | | better distinction between userID and keyId | Bjoern Schiessle | 2013-11-21 | 2 | -28/+32 |
| | | | | | | | |||||
| | * | | | | | public upload now also works with encryption enabled | Bjoern Schiessle | 2013-11-21 | 5 | -23/+20 |
| | |/ / / / | |||||
| | * | | | | adapt tests to the new code | Bjoern Schiessle | 2013-11-20 | 1 | -9/+13 |
| | | | | | | |||||
| | * | | | | make sure that we always use the correct user id | Bjoern Schiessle | 2013-11-20 | 3 | -11/+21 |
| | | | | | | |||||
| | * | | | | fix some getShareKey() and getFileKey() calls | Bjoern Schiessle | 2013-11-20 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | [wip] make encryption work with public gallery sharing | Bjoern Schiessle | 2013-11-20 | 5 | -56/+65 |
| | | | | | | |||||
| * | | | | | with the latest changes in master $this-userID is always the correct ID, so ↵ | Bjoern Schiessle | 2013-11-27 | 2 | -25/+21 |
| | | | | | | | | | | | | | | | | | | | | | we no longer need the extra parameter | ||||
| * | | | | | Merge branch 'master' into encryption_initial_enc_indicator | Bjoern Schiessle | 2013-11-26 | 2 | -0/+2 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-26 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-26 | 1 | -0/+1 |
| | | |_|/ | |/| | | |||||
| * | | | | added a small version of the dark loading gif, looks nicer on the blue ↵ | Bjoern Schiessle | 2013-11-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | background | ||||
| * | | | | use POST instead of GET | Bjoern Schiessle | 2013-11-26 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | fix typo in var name | Bjoern Schiessle | 2013-11-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | remove debug output | Bjoern Schiessle | 2013-11-25 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | show a message at the log-in screen if inital encryption take place | Bjoern Schiessle | 2013-11-25 | 4 | -6/+70 |
| |/ / / | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-24 | 1 | -1/+10 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-21 | 3 | -18/+38 |
| | |/ |/| | |||||
| * | | Merge pull request #5967 from owncloud/encryption-extstorage-fixsizereset | Vincent Petry | 2013-11-20 | 2 | -1/+5 |
| |\ \ | | | | | | | Fix for extstorage + encryption where unencrypted size is not kept | ||||
| | * | | Fix for extstorage + encryption where unencrypted size is not kept | Vincent Petry | 2013-11-20 | 2 | -1/+5 |
| | |/ | | | | | | | | | | | | | Fix for external storage with encryption where the unencrypted size is first written in the DB, then set back to zero, causing performance issue because the file needs to be reopened every time to find out the unencrypted size (and potentially needs a full redownload) | ||||
| * | | check if it is a cached file or a version to resolve the correct path to the ↵ | Bjoern Schiessle | 2013-11-20 | 1 | -1/+5 |
| | | | | | | | | | file key | ||||
| * | | only check if the key file exists to decide if it is an encrypted file or not. | Bjoern Schiessle | 2013-11-20 | 4 | -25/+17 |
| |/ | | | | This solves problems with external storage which doesn't support fseek | ||||
| * | make sure that the owners home is mounted correctly | Bjoern Schiessle | 2013-11-19 | 1 | -0/+4 |
| | | |||||
| * | Merge pull request #5908 from owncloud/fix_errorpage_call | Vincent Petry | 2013-11-18 | 1 | -1/+1 |
| |\ | | | | | [encryption] fix redirectToErrorPage() call | ||||
| | * | call error page with session as parameter | Bjoern Schiessle | 2013-11-17 | 1 | -1/+1 |
| | | | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-15 | 2 | -0/+2 |
| | | | |||||
| * | | Merge pull request #5833 from owncloud/encryption_fixes | Björn Schießle | 2013-11-15 | 3 | -22/+83 |
| |\ \ | | | | | | | [encryption] preserve timestamps and etags during encryption/decryption | ||||
| | * | | remove debug output | Bjoern Schiessle | 2013-11-14 | 1 | -6/+0 |
| | | | | |||||
| | * | | test encryptAll() and decryptAll() to make sure that mtime and etag stay the ↵ | Bjoern Schiessle | 2013-11-14 | 1 | -0/+64 |
| | | | | | | | | | | | | | same | ||||
| | * | | Merge branch 'master' into encryption_fixes | Bjoern Schiessle | 2013-11-13 | 6 | -72/+107 |
| | |\| | |||||
| | * | | fixPartialFilePath() is now stripPartialFileExtension() | Bjoern Schiessle | 2013-11-12 | 1 | -1/+1 |
| | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |