summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
Commit message (Expand)AuthorAgeFilesLines
* Trash: fix opening foldersRobin Appelman2013-02-281-2/+4
* Trash: disable text editor from trash for nowRobin Appelman2013-02-271-0/+4
* Trash: fix download.phpRobin Appelman2013-02-271-1/+1
* Trash: fix trash when default quota is usedRobin Appelman2013-02-271-1/+1
* Merge master into trash_fileactionsRobin Appelman2013-02-2772-223/+796
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-02-261-0/+7
| * fix quota calculationBjörn Schießle2013-02-251-5/+5
| * fix getVersion callBjörn Schießle2013-02-251-1/+1
| * fix line endingsBjörn Schießle2013-02-251-94/+94
| * Merge branch 'master' into update-expire-functionBjörn Schießle2013-02-254-104/+166
| |\
| | * some final code clean-upBjörn Schießle2013-02-251-4/+7
| | * always use "==="Björn Schießle2013-02-251-5/+5
| | * Merge branch 'master' into trashbin_encryptionBjörn Schießle2013-02-2568-244/+357
| | |\
| | * \ Merge branch 'master' into trashbin_encryptionBjörn Schießle2013-02-217-37/+93
| | |\ \
| | * | | don't show empty trash bin message for sub foldersBjörn Schießle2013-02-212-1/+2
| | * | | update path to deleted filesBjörn Schießle2013-02-201-3/+2
| | * | | some fixes for the keyfile handlingBjörn Schießle2013-02-201-10/+28
| | * | | update script which copies all trash bin related files to user/files_trashbinBjörn Schießle2013-02-202-1/+41
| | * | | reuse delete() function in expire()Björn Schießle2013-02-201-21/+3
| | * | | delete keyfiles if file in trash bin gets deleted permanentlyBjörn Schießle2013-02-201-5/+20
| | * | | restore filekeys from trash binBjörn Schießle2013-02-201-5/+17
| | * | | put all trash bin content in user/files_trashbinBjörn Schießle2013-02-201-33/+31
| | * | | move2trash() handles keyfilesBjörn Schießle2013-02-191-9/+18
| * | | | Merge branch 'master' into update-expire-functionBjörn Schießle2013-02-2568-273/+388
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-251-0/+8
| | * | | Merge pull request #1862 from owncloud/whitespace-cleanupThomas Müller2013-02-239-217/+216
| | |\ \ \
| | | * | | Whitespace fixesBart Visscher2013-02-229-217/+216
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-231-1/+1
| | |/ / /
| | * | | Merge pull request #1711 from owncloud/style-cleanupJörn Friedrich Dreyer2013-02-221-17/+36
| | |\ \ \
| | | * | | Style cleanup files_trashbinBart Visscher2013-02-211-17/+36
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-2258-57/+145
| | |/ / /
| | * | | rename app to 'deleted files'Björn Schießle2013-02-211-1/+1
| * | | | use the same string lengths like the file cacheBjörn Schießle2013-02-221-2/+2
| * | | | increase db fileds for usernamesBjörn Schießle2013-02-211-2/+2
| * | | | calculate trashbin size per userBjörn Schießle2013-02-213-9/+71
| |/ / /
| * | / [tx-robot] updated from transifexJenkins for ownCloud2013-02-213-5/+16
| | |/ | |/|
| * | Merge branch 'master' into trash_bin_delete_selectedThomas Mueller2013-02-202-3/+10
| |\ \
| | * | replaced for in loops with normal enumerating loops to fix #1803Bernhard Posselt2013-02-201-3/+3
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-02-201-1/+8
| | |/
| * | change for loop to make it hopefully work with IEBjörn Schießle2013-02-201-1/+1
| * | switch to json encoded file listBjörn Schießle2013-02-203-6/+8
| * | use "|" as delimiter instead of ";", since "|" is not allowed in file/folder ...Björn Schießle2013-02-203-8/+4
| * | add timestamp to function call; fix trash.js to handle multiple delete operat...Björn Schießle2013-02-192-5/+5
| * | initialize $resultBjörn Schießle2013-02-191-0/+1
| * | rebase to masterBjörn Schießle2013-02-192-3/+32
| |\|
| | * Merge pull request #1740 from houqp/issue#1688Björn Schießle2013-02-192-3/+24
| | |\
| | | * check filename and timestamp in Trashbin's file_exists methodQingping Hou2013-02-181-3/+11
| | | * Properly delete empty directories in TrashbinQingping Hou2013-02-161-1/+3
| | | * add file_exists method to files_trashbin appQingping Hou2013-02-161-2/+13
| | * | Merge pull request #1764 from owncloud/Undelete_directory_fixLukas Reschke2013-02-191-0/+3
| | |\ \