summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* added helper class and moved hook registration to itFlorin Peter2013-05-092-11/+81
* Fixes to code formatting and indentationSam Tuke2013-05-091-67/+99
* Improvements to code formatting & indentationSam Tuke2013-05-091-109/+114
* Implemented initial recoveryAdmin functionality in crypto file proxySam Tuke2013-05-092-25/+80
* Fixed bugs with pre_share hook usageSam Tuke2013-05-092-79/+115
* Added pre_share hookSam Tuke2013-05-084-67/+130
* added test for share folderFlorin Peter2013-05-071-0/+73
* added test for re-shareFlorin Peter2013-05-071-6/+69
* Merge branch 'files_encryption' of https://github.com/owncloud/core into file...Florin Peter2013-05-071-132/+171
|\
| * Made code formatting of new methods more consistentSam Tuke2013-05-071-132/+171
* | fix for tearDownFS, after filesystem::tearDown() the root is not mountedFlorin Peter2013-05-071-0/+1
|/
* Added facility to manually encrypt all files from personal settingsSam Tuke2013-05-077-24/+127
* test for share is now able to run with autotest.shFlorin Peter2013-05-071-10/+20
* fix for wrong file infosFlorin Peter2013-05-072-5/+6
* fix empty pathFlorin Peter2013-05-071-0/+5
* added test for shareFlorin Peter2013-05-071-0/+115
* fix file info put on streamFlorin Peter2013-05-061-1/+13
* merge my fix from master b4649701423c2e75373a5ecf7640c6e2b781a970Florin Peter2013-05-062-2/+2
* handling for re-share and re-unshare should work nowFlorin Peter2013-05-052-60/+120
* improved pre_unshare and post_unshare hookFlorin Peter2013-05-051-0/+2
* Added support for user-specified password for adminRecovery account in admin ...Sam Tuke2013-05-0410-89/+215
* fixed re-share problemsFlorin Peter2013-05-042-11/+72
* make sure to find the correct path for shared filesBjörn Schießle2013-05-031-9/+19
* remove encryption keys if a file gets deleted permanentlyBjörn Schießle2013-05-031-26/+46
* disable proxys before copying files to the trash binBjörn Schießle2013-05-031-1/+5
* get original path in case of shared files when restoring file from trash binBjörn Schießle2013-05-031-18/+23
* get original path in case of shared filesBjörn Schießle2013-05-031-15/+30
* Fixed recoveryadmin settings in user and admin settings pages (js, templates,...Sam Tuke2013-05-0113-66/+176
* fixed re-share problemsFlorin Peter2013-05-012-8/+15
* Merge branch 'master' into files_encryptionFlorin Peter2013-05-0157-1000/+1086
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-05-0156-209/+253
* | fix duplicate login behavior if user not setupFlorin Peter2013-05-011-1/+3
* | merged files_trashbinFlorin Peter2013-05-011-86/+309
* | fixed some testsFlorin Peter2013-05-014-8/+19
* | revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is ...Florin Peter2013-05-011091-14109/+15371
* | fixed public-keys mount point errorFlorin Peter2013-05-011-1/+6
* | fixed tests after merge against masterFlorin Peter2013-04-304-8/+19
* | Merge branch 'master' into files_encryption to get the latest files_trashbin appFlorin Peter2013-04-301086-15362/+14084
|\|
| * Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_m...FlorinPeter2013-04-301-86/+309
| |\
| | * delete and restore of versions and share-keys now worksFlorin Peter2013-04-281-20/+37
| | * added handling for share-keysFlorin Peter2013-04-281-13/+88
| | * restore fixedFlorin Peter2013-04-281-22/+40
| | * fixed some problems and broken codeFlorin Peter2013-04-281-42/+83
| | * restore encryption keys from trash bin (development snapshot)Björn Schießle2013-04-281-45/+72
| | * move encryption keys to trash binBjörn Schießle2013-04-281-31/+76
| * | Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cacheFlorinPeter2013-04-292-2/+2
| |\ \
| | * | fix for infinite loop causing on files_encryption branch when testing "apps/f...Florin Peter2013-04-292-2/+2
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-30118-631/+852
| |/ /
| * | Merge pull request #3159 from owncloud/rewordJan-Christoph Borchardt2013-04-291-1/+1
| |\ \
| | * | Reword sentence and move HTML out of translationLukas Reschke2013-04-291-1/+1
| | |/
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 14:51:55 +0000