Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge master | Lukas Reschke | 2013-02-28 | 4 | -31/+71 | |
|\| | | ||||||
| * | | Trash: fix opening folders | Robin Appelman | 2013-02-28 | 1 | -2/+4 | |
| * | | Trash: disable text editor from trash for now | Robin Appelman | 2013-02-27 | 1 | -0/+4 | |
| * | | Trash: fix download.php | Robin Appelman | 2013-02-27 | 1 | -1/+1 | |
| * | | Trash: fix trash when default quota is used | Robin Appelman | 2013-02-27 | 1 | -1/+1 | |
| * | | Merge master into trash_fileactions | Robin Appelman | 2013-02-27 | 72 | -223/+796 | |
| |\| | ||||||
| * | | merge master into trash_fileactions | Robin Appelman | 2013-02-08 | 66 | -15/+543 | |
| |\ \ | ||||||
| * | | | Trash: use the same sorting algoritm as files | Robin Appelman | 2013-01-31 | 1 | -0/+12 | |
| * | | | Trash: fix opening folders | Robin Appelman | 2013-01-31 | 1 | -0/+2 | |
| * | | | Trash: enable fileactions while viewing trash | Robin Appelman | 2013-01-31 | 1 | -9/+27 | |
| * | | | Trash: don't use depricated filesystem api classes | Robin Appelman | 2013-01-31 | 2 | -107/+107 | |
| * | | | Trash: highlight Files navigation entry while in trash | Robin Appelman | 2013-01-31 | 1 | -14/+16 | |
* | | | | [files_trashbin] From echo to p | Lukas Reschke | 2013-02-27 | 3 | -41/+41 | |
| |_|/ |/| | | ||||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-26 | 1 | -0/+7 | |
* | | | fix quota calculation | Björn Schießle | 2013-02-25 | 1 | -5/+5 | |
* | | | fix getVersion call | Björn Schießle | 2013-02-25 | 1 | -1/+1 | |
* | | | fix line endings | Björn Schießle | 2013-02-25 | 1 | -94/+94 | |
* | | | Merge branch 'master' into update-expire-function | Björn Schießle | 2013-02-25 | 4 | -104/+166 | |
|\ \ \ | ||||||
| * | | | some final code clean-up | Björn Schießle | 2013-02-25 | 1 | -4/+7 | |
| * | | | always use "===" | Björn Schießle | 2013-02-25 | 1 | -5/+5 | |
| * | | | Merge branch 'master' into trashbin_encryption | Björn Schießle | 2013-02-25 | 68 | -244/+357 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'master' into trashbin_encryption | Björn Schießle | 2013-02-21 | 7 | -37/+93 | |
| |\ \ \ \ | ||||||
| * | | | | | don't show empty trash bin message for sub folders | Björn Schießle | 2013-02-21 | 2 | -1/+2 | |
| * | | | | | update path to deleted files | Björn Schießle | 2013-02-20 | 1 | -3/+2 | |
| * | | | | | some fixes for the keyfile handling | Björn Schießle | 2013-02-20 | 1 | -10/+28 | |
| * | | | | | update script which copies all trash bin related files to user/files_trashbin | Björn Schießle | 2013-02-20 | 2 | -1/+41 | |
| * | | | | | reuse delete() function in expire() | Björn Schießle | 2013-02-20 | 1 | -21/+3 | |
| * | | | | | delete keyfiles if file in trash bin gets deleted permanently | Björn Schießle | 2013-02-20 | 1 | -5/+20 | |
| * | | | | | restore filekeys from trash bin | Björn Schießle | 2013-02-20 | 1 | -5/+17 | |
| * | | | | | put all trash bin content in user/files_trashbin | Björn Schießle | 2013-02-20 | 1 | -33/+31 | |
| * | | | | | move2trash() handles keyfiles | Björn Schießle | 2013-02-19 | 1 | -9/+18 | |
* | | | | | | Merge branch 'master' into update-expire-function | Björn Schießle | 2013-02-25 | 68 | -273/+388 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-25 | 1 | -0/+8 | |
| * | | | | | Merge pull request #1862 from owncloud/whitespace-cleanup | Thomas Müller | 2013-02-23 | 9 | -217/+216 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Whitespace fixes | Bart Visscher | 2013-02-22 | 9 | -217/+216 | |
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-23 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #1711 from owncloud/style-cleanup | Jörn Friedrich Dreyer | 2013-02-22 | 1 | -17/+36 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Style cleanup files_trashbin | Bart Visscher | 2013-02-21 | 1 | -17/+36 | |
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-22 | 58 | -57/+145 | |
| |/ / / / / | ||||||
| * | | | | | rename app to 'deleted files' | Björn Schießle | 2013-02-21 | 1 | -1/+1 | |
* | | | | | | use the same string lengths like the file cache | Björn Schießle | 2013-02-22 | 1 | -2/+2 | |
* | | | | | | increase db fileds for usernames | Björn Schießle | 2013-02-21 | 1 | -2/+2 | |
* | | | | | | calculate trashbin size per user | Björn Schießle | 2013-02-21 | 3 | -9/+71 | |
|/ / / / / | ||||||
* | / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-21 | 3 | -5/+16 | |
| |/ / / |/| | | | ||||||
* | | | | Merge branch 'master' into trash_bin_delete_selected | Thomas Mueller | 2013-02-20 | 2 | -3/+10 | |
|\ \ \ \ | ||||||
| * | | | | replaced for in loops with normal enumerating loops to fix #1803 | Bernhard Posselt | 2013-02-20 | 1 | -3/+3 | |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-20 | 1 | -1/+8 | |
| |/ / / | ||||||
* | | | | change for loop to make it hopefully work with IE | Björn Schießle | 2013-02-20 | 1 | -1/+1 | |
* | | | | switch to json encoded file list | Björn Schießle | 2013-02-20 | 3 | -6/+8 | |
* | | | | use "|" as delimiter instead of ";", since "|" is not allowed in file/folder ... | Björn Schießle | 2013-02-20 | 3 | -8/+4 |