summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge master into oc_previewGeorg Ehrke2013-08-291-9/+5
|\
| * also move empty folders to the trash bin as discussed here #4590Bjoern Schiessle2013-08-281-5/+0
| * the trash bin can also contain empty files. Don't use the trash bin size as i...Bjoern Schiessle2013-08-271-4/+5
* | Merge master into oc_previewGeorg Ehrke2013-08-191-1/+1
|\|
| * Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-172-42/+97
| |\
| * | user interface to allow user to decrypt all his files once the encryption app...Björn Schießle2013-07-291-1/+1
* | | fix merge conflictsGeorg Ehrke2013-08-051-2/+2
|\ \ \ | | |/ | |/|
| * | Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-appJörn Friedrich Dreyer2013-08-021-2/+2
| |\ \
| | * | Use !== and === in files_trashbin-appkondou2013-07-101-2/+2
| | |/
* | | Merge branch 'master' into oc_previewThomas Müller2013-07-302-40/+95
|\| |
| * | reduce time for auto expire to 30 days by defaultBjörn Schießle2013-07-261-1/+1
| * | make 'restored' extension translatableBjörn Schießle2013-07-261-2/+3
| * | expire trash bin if trash bin exceeds max size after a new file was added to ...Björn Schießle2013-07-262-7/+34
| * | disable "deleted files" button if trash bin is emptyBjörn Schießle2013-07-261-0/+15
| * | don't move empty folders to the trash binBjörn Schießle2013-07-251-0/+5
| * | nicer format of unique names, use 'file (restored).txt' instead of 'files.txt...Björn Schießle2013-07-251-32/+39
| |/
* | add class='preview-icon' in trashbin app as wellGeorg Ehrke2013-07-291-1/+1
* | merge conflicts ...Georg Ehrke2013-07-101-319/+325
|\|
| * make trash bin aware of system wide mounts with respect to encryption keysBjörn Schießle2013-07-051-7/+21
| * Merge branch 'master' into fix_glob_escapingBjörn Schießle2013-06-171-1/+8
| |\
| * | fix indentionBjörn Schießle2013-06-141-319/+310
| * | only escape glob patternBjörn Schießle2013-06-141-5/+7
* | | properly encode pathGeorg Ehrke2013-07-101-1/+1
* | | implement use of preview icons in thrashbin appGeorg Ehrke2013-07-081-0/+4
| |/ |/|
* | Merge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folderMorris Jobke2013-06-151-2/+9
|\ \ | |/ |/|
| * duplicate verificationBastien Ho2013-05-101-3/+0
| * Fix inexisting trashbin's sub-foldersBastien Ho2013-05-101-2/+12
* | added static function registerHooks() for better unit tests handlingFlorin Peter2013-05-221-1/+10
* | Merge branch 'files_encryption' of https://github.com/owncloud/core into file...Florin Peter2013-05-151-68/+122
|\ \
| * | 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-011-309/+86
| |/
* / touch() needs to be performed relative to user/files otherwise ownCloud doesn...Björn Schießle2013-05-101-1/+4
|/
* 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
* improved free space calculation if no quota is set, discussed in #2936Björn Schießle2013-04-171-23/+43
* 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
* cleanup the trash bin tables in the database after a user was deletedBjörn Schießle2013-04-112-0/+30
* only add filesize to trashbin size if the file was moved to the trash bin suc...Björn Schießle2013-04-101-2/+4
* add backticks around table namesBjörn Schießle2013-03-251-9/+9
* Add backtick for trash app to prevent pg errorsBrice Maron2013-03-151-11/+11
* make trashbin work with different user homesBjörn Schießle2013-03-041-4/+4
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-07 12:23:05 +0000