Björn Schießle
|
7da97550df
|
some final code clean-up
|
2013-02-25 14:12:56 +01:00 |
|
Björn Schießle
|
7ebbecd81f
|
always use "==="
|
2013-02-25 14:09:20 +01:00 |
|
Björn Schießle
|
4dea6a6228
|
Merge branch 'master' into trashbin_encryption
Conflicts:
apps/files_trashbin/index.php
apps/files_trashbin/lib/trash.php
|
2013-02-25 12:14:51 +01:00 |
|
Björn Schießle
|
632ca9f06d
|
Merge branch 'master' into update-expire-function
Conflicts:
apps/files_trashbin/lib/trash.php
|
2013-02-25 11:14:06 +01:00 |
Bart Visscher
|
bb75dfc021
|
Whitespace fixes
|
2013-02-22 19:05:36 +01:00 |
|
Bart Visscher
|
fb7de77474
|
Style cleanup files_trashbin
|
2013-02-21 23:47:21 +01:00 |
|
Björn Schießle
|
2436d01985
|
calculate trashbin size per user
|
2013-02-21 12:37:13 +01:00 |
|
Björn Schießle
|
b685aa8bcb
|
some fixes for the keyfile handling
|
2013-02-20 22:17:04 +01:00 |
|
Björn Schießle
|
5ce6d1fb57
|
reuse delete() function in expire()
|
2013-02-20 18:00:15 +01:00 |
|
Björn Schießle
|
4b5a662e09
|
delete keyfiles if file in trash bin gets deleted permanently
|
2013-02-20 17:58:04 +01:00 |
|
Björn Schießle
|
c49e73d43c
|
restore filekeys from trash bin
|
2013-02-20 15:14:32 +01:00 |
|
Björn Schießle
|
4d0df9614b
|
put all trash bin content in user/files_trashbin
|
2013-02-20 13:34:32 +01:00 |
|
Björn Schießle
|
686254ac11
|
move2trash() handles keyfiles
|
2013-02-19 18:45:46 +01:00 |
Björn Schießle
|
95751874a1
|
Merge pull request #1740 from houqp/issue#1688
Bug fix for Issue#1688
|
2013-02-19 03:09:03 -08:00 |
Victor Dubiniuk
|
e2f87e456f
|
Calculate size for existing directories only
|
2013-02-18 23:48:08 +03:00 |
Qingping Hou
|
c0ac98066e
|
check filename and timestamp in Trashbin's file_exists method
|
2013-02-18 09:49:50 -05:00 |
|
Qingping Hou
|
50759607e4
|
add file_exists method to files_trashbin app
|
2013-02-16 17:42:06 -05:00 |
|
Bart Visscher
|
cd35d257bb
|
Fix NoSpaceAfterComma and SpaceBeforeComma
|
2013-02-14 08:36:26 +01:00 |
|
Bart Visscher
|
d3ef967993
|
Fix indentation style
|
2013-02-14 08:36:26 +01:00 |
|
Björn Schießle
|
b24e3f1d32
|
comment added
|
2013-02-09 11:07:47 +01:00 |
Robin Appelman
|
f93f9dd50c
|
merge master into trash_fileactions
|
2013-02-08 00:11:54 +01:00 |
|
Björn Schießle
|
808de17aeb
|
use never more that 50% of available disc space for the trash bin
|
2013-02-07 17:37:46 +01:00 |
|
Björn Schießle
|
ca43e09276
|
keep track of trash bin size
|
2013-02-07 15:16:29 +01:00 |
|
Björn Schießle
|
7e874af2c8
|
rename OCA_Trash to OCA\Files_Trashbin
|
2013-02-07 13:14:45 +01:00 |
|
Björn Schießle
|
c81d7b0b90
|
OCA_Versions is now known as OCA\Files_Versions
|
2013-02-07 12:45:27 +01:00 |
|
Björn Schießle
|
fd171a4f34
|
copy&paste bug, no fetchAll() needed here
|
2013-02-06 16:50:16 +01:00 |
|
Björn Schießle
|
e2516a2b65
|
allow to delete single files from the trash bin permanently
|
2013-02-06 16:23:22 +01:00 |
|
Robin Appelman
|
73cd116968
|
Trash: don't use depricated filesystem api classes
|
2013-01-31 18:04:00 +01:00 |
|
Björn Schießle
|
c8a4878b77
|
is_writable() is now isUpdatable() with the new filesystem
|
2013-01-31 14:55:14 +01:00 |
|
Björn Schießle
|
9c83b307f6
|
keep mtime
|
2013-01-31 10:50:02 +01:00 |
|
Björn Schießle
|
e6f1544f51
|
fix OC_Log::ERROR call
|
2013-01-30 13:04:32 +01:00 |
|
Björn Schießle
|
0c8bcacdc8
|
added some additional error handling
|
2013-01-29 13:36:33 +01:00 |
|
Björn Schießle
|
d10e137939
|
icons added; empty trash bin message added
|
2013-01-29 10:03:04 +01:00 |
|
Björn Schießle
|
dbb0d04073
|
restore file in the root folder if the origin folder is not writable
|
2013-01-24 15:29:22 +01:00 |
|
Björn Schießle
|
b694f996d9
|
allow admin to change retention obligation for the trash bin, default value is 180 days
|
2013-01-22 15:33:54 +01:00 |
|
Björn Schießle
|
81ab0affef
|
allow to restore single files/folder from a deleted folder
|
2013-01-22 15:33:54 +01:00 |
|
Björn Schießle
|
1255791ef2
|
handle group restore
|
2013-01-22 15:33:54 +01:00 |
|
Björn Schießle
|
655a20f963
|
expire files in trash bin after 30 days
|
2013-01-22 15:33:54 +01:00 |
|
Björn Schießle
|
a3da82261b
|
remove item in the trash bin view after successful undelete
|
2013-01-22 15:33:53 +01:00 |
|
Björn Schießle
|
d605228937
|
first version of the trash bin app
|
2013-01-22 15:33:53 +01:00 |