summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* style fixes for preview libGeorg Ehrke2013-08-198-48/+55
|
* Merge master into oc_previewGeorg Ehrke2013-08-19797-13781/+10494
|\
| * Merge pull request #4239 from owncloud/decrypt_files_againBjörn Schießle2013-08-1823-123/+565
| |\ | | | | | | Enable user to decrypt files again after encryption app was disabled
| | * revert changes to 3rdparty submodule referenceBjoern Schiessle2013-08-181-0/+0
| | |
| | * don't change the etags if a file gets encrypted/decrypted to avoid that the ↵Bjoern Schiessle2013-08-181-24/+32
| | | | | | | | | | | | sync client downloads all files again
| | * Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-171514-17058/+24960
| | |\ | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php
| | * | remove whitespaces and some leftover code from testingBjoern Schiessle2013-08-152-2/+2
| | | |
| | * | throw exception if encryption was disabled but files are still encrypted to ↵Bjoern Schiessle2013-08-141-1/+11
| | | | | | | | | | | | | | | | prevent the client from syncing unreadable files
| | * | check if some encrypted files are left after the app was disabled and warn ↵Bjoern Schiessle2013-08-126-7/+42
| | | | | | | | | | | | | | | | the user
| | * | preserve mtime if file gets encrypted/decryptedBjoern Schiessle2013-08-121-1/+13
| | | |
| | * | fix array declarationBjoern Schiessle2013-08-121-1/+1
| | | |
| | * | don't know why it works locally but not on the build server... let's keep it ↵Bjoern Schiessle2013-07-311-0/+3
| | | | | | | | | | | | | | | | out for the moment
| | * | use OC\Files\View to read encrypted file, so that it also works with ↵Bjoern Schiessle2013-07-311-4/+7
| | | | | | | | | | | | | | | | external storages
| | * | this hopefully fixes testRecoveryForUser(), works locallyBjoern Schiessle2013-07-311-7/+10
| | | | | | | | | | | | | | | | for now I disabled testRecoveryFile(), no idea why jenkins deletes complete folders... Works nicely in the real world
| | * | this test works locally, let's see what out build server says...Bjoern Schiessle2013-07-311-3/+0
| | | |
| | * | fix searchUsers() call in group.phpBjoern Schiessle2013-07-311-1/+1
| | | |
| | * | fixing some unit testsBjoern Schiessle2013-07-302-6/+6
| | | |
| | * | we need to use the path relative to data/Bjoern Schiessle2013-07-301-4/+1
| | | |
| | * | handle error if we can't handle the given pathBjoern Schiessle2013-07-302-2/+7
| | | |
| | * | remove unused method, the right one is in util.phpBjoern Schiessle2013-07-301-4/+0
| | | |
| | * | adapt unit tests to the modified stream wrapperBjoern Schiessle2013-07-305-35/+35
| | | |
| | * | only show decrypt all files option if encrypted files are availableBjoern Schiessle2013-07-301-2/+1
| | | |
| | * | encrypt/decrypt file versionsBjoern Schiessle2013-07-301-3/+124
| | | |
| | * | check if app is enabledBjoern Schiessle2013-07-301-7/+8
| | | |
| | * | only write keyfiles if it was a new file, otherwise nothing changedBjoern Schiessle2013-07-301-38/+45
| | | |
| | * | use path relative to data/Bjoern Schiessle2013-07-301-4/+1
| | | |
| | * | improved error handlingBjoern Schiessle2013-07-302-14/+34
| | | |
| | * | working decrypt files methodBjoern Schiessle2013-07-296-37/+173
| | | |
| | * | add decryptall.phpBjörn Schießle2013-07-291-0/+14
| | | |
| | * | register decrypt all routeBjörn Schießle2013-07-291-0/+2
| | | |
| | * | add ajax call to decrypt all filesBjörn Schießle2013-07-293-1/+18
| | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/crypt.php
| | * | user interface to allow user to decrypt all his files once the encryption ↵Björn Schießle2013-07-296-9/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | app was disabled Conflicts: settings/templates/personal.php
| * | | Merge pull request #4498 from owncloud/uploadprogress-near-uploadbuttonChristopher2013-08-181-4/+14
| |\ \ \ | | | | | | | | | | move upload progress bar near upload button, more contextual
| | * | | remove unneeded extra ID selectorsJan-Christoph Borchardt2013-08-181-2/+2
| | | | |
| | * | | move upload progress bar near upload button, more contextualJan-Christoph Borchardt2013-08-181-3/+13
| | | | |
| * | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondouKondou2013-08-1875-75/+75
| |\ \ \ \ | | | | | | | | | | | | Add newlines at the end of files
| | * | | | Add _many_ newlines at the end of fileskondou2013-08-1875-75/+75
| | | | | |
| * | | | | Port DAV groupMemberSet fix to master #4458Thomas Tanghus2013-08-181-6/+8
| | | | | |
| * | | | | Merge pull request #4496 from owncloud/fixing-error-page-layout-masterKondou2013-08-181-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | fixing error page layout
| | * | | | | fixing error page layoutThomas Müller2013-08-181-0/+1
| | |/ / / /
| * | | | | Merge pull request #4485 from guruz/class_autoloader_optimizationMarkus Goetz2013-08-182-1/+54
| |\ \ \ \ \ | | | | | | | | | | | | | | Class Auto Loader: Cache paths in APC
| | * | | | | Class Auto Loader: Cache paths in APCMarkus Goetz2013-08-182-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using benchmark_single.php (from administration repo) I can measure a speed improvement of 5% to 20% loading the /index.php when logged in. (when using APC and php-fpm).
| * | | | | | Merge pull request #4483 from owncloud/compare-true-falseBart Visscher2013-08-189-16/+16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Compare result are already true/false
| | * | | | | | Use boolean casting for bitwise and result.Andreas Fischer2013-08-171-1/+1
| | | | | | | |
| | * | | | | | Add trailing comma for all touched array lines.Andreas Fischer2013-08-171-1/+1
| | | | | | | |
| | * | | | | | Fix spacing of all touched lines.Andreas Fischer2013-08-173-3/+3
| | | | | | | |
| | * | | | | | Compare result are already true/falseBart Visscher2013-08-179-16/+16
| | | | | | | |
| * | | | | | | Merge pull request #4486 from owncloud/ldap_adjust_cacheBart Visscher2013-08-181-1/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | LDAP: use memcache if available
| | * | | | | | | LDAP: use memcache if availableArthur Schiwon2013-08-171-1/+6
| | |/ / / / / /
| * | | | | | | Merge pull request #4493 from owncloud/fixing-initL10n-masterOwen Winkler2013-08-181-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | fixing undefined js error
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 11:15:00 +0000