summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
Commit message (Expand)AuthorAgeFilesLines
* add event.preventDefault to undelete functionGeorg Ehrke2013-05-271-0/+1
* fix https://github.com/owncloud/core/issues/3320Georg Ehrke2013-05-271-0/+1
* [tx-robot] updated from transifexJenkins for ownCloud2013-05-256-9/+11
* Merge pull request #3416 from owncloud/files_encryptionThomas Müller2013-05-248-84/+143
|\
| * added static function registerHooks() for better unit tests handlingFlorin Peter2013-05-222-5/+12
| * Merge branch 'master' into files_encryptionBjörn Schießle2013-05-212-2/+16
| |\
| * \ Merge branch 'master' into files_encryptionFlorin Peter2013-05-201-16/+1
| |\ \
| * \ \ Merge branch 'files_encryption' of https://github.com/owncloud/core into file...Florin Peter2013-05-158-84/+131
| |\ \ \
| | * | | 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
| | * | | merged files_trashbinFlorin Peter2013-05-011-86/+309
| | * | | revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is ...Florin Peter2013-05-017-323/+94
| | * | | Merge branch 'master' into files_encryption to get the latest files_trashbin appFlorin Peter2013-04-307-94/+323
| | |\ \ \
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-241-1/+3
| |_|_|_|/ |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-211-1/+9
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-201-1/+2
| |_|_|/ |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-181-16/+1
|/ / /
* | | Merge branch 'master' into update_etags_on_restoreBjörn Schießle2013-05-132-0/+12
|\ \ \
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-122-0/+12
* | | | touch() needs to be performed relative to user/files otherwise ownCloud doesn...Björn Schießle2013-05-101-1/+4
|/ / /
* | | Use $dir instead of $fullpathLukas Reschke2013-05-061-2/+1
* | | Use the internal ownCloud viewLukas Reschke2013-05-061-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-041-0/+1
| |/ |/|
* | 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
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-301-0/+5
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-04-281-0/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-04-274-8/+8
* | [tx-robot] updated from transifexJenkins for ownCloud2013-04-241-1/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-231-1/+9
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-221-0/+6
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-201-4/+4
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-181-1/+2
* improved free space calculation if no quota is set, discussed in #2936Björn Schießle2013-04-171-23/+43
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-172-0/+4
* add explenation of the expire function to the apps descriptionBjörn Schießle2013-04-161-1/+14
* write a info message to the log if a file gets removed from the trash bin aut...Björn Schießle2013-04-161-0/+2
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-161-2/+2
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-131-1/+10
* cleanup the trash bin tables in the database after a user was deletedBjörn Schießle2013-04-113-1/+33
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-111-0/+6
* size of the trash bin could be incorrect, remove it for all users to enforce ...Björn Schießle2013-04-102-36/+6