Vincent Petry
0be9de5df5
Files, trashbin, public apps use ajax/JSON for the file list
...
Files app:
- removed file list template, now rendering list from JSON response
- FileList.addFile/addDir is now FileList.add() and takes a JS map with all required
arguments instead of having a long number of function arguments
- added unit tests for many FileList operations
- fixed newfile.php, newfolder.php and rename.php to return the file's
full JSON on success
- removed obsolete/unused undo code
- removed download_url / loading options, now using
Files.getDownloadUrl() for that
- server side now uses Helper::getFileInfo() to prepare file JSON response
- previews are now client-side only
Breadcrumbs are now JS only:
- Added BreadCrumb class to handle breadcrumb rendering and events
- Added unit test for BreadCrumb class
- Moved all relevant JS functions to the BreadCrumb class
Public page now uses ajax to load the file list:
- Added Helper class in sharing app to make it easier to authenticate
and retrieve the file's real path
- Added ajax/list.php to retrieve the file list
- Fixed FileActions and FileList to work with the ajax list
Core:
- Fixed file picker dialog to use the same list format as files app
2014-04-02 15:33:47 +02:00
icewind1991
d87001a093
Merge pull request #7768 from owncloud/trashempty-nocache
...
Use a more efficient way to determine that the trashbin is empty that doesn't rely on the cache
2014-03-24 13:34:30 +01:00
Robin Appelman
6b66b42f6e
catch the case where files_trashbin/files doesn't exist
2014-03-24 12:33:44 +01:00
Robin Appelman
214357ca68
Improve sorting performance of large lists of files
2014-03-19 13:53:59 +01:00
Robin Appelman
38b1529c2a
More robust way to check if the folder is empty
2014-03-17 17:03:32 +01:00
Robin Appelman
332c14a878
Use a more efficient way to determine that the trashbin is empty that doesn't rely on the cache
2014-03-17 16:35:08 +01:00
Georg Ehrke
0f864c38bb
add preDelete hook for files_trashbin app
2014-03-11 14:10:12 +01:00
Bjoern Schiessle
5ddabd7cd0
fix mimetype detection, introduce fake etag to identify preview images
2014-03-10 15:13:28 +01:00
Bjoern Schiessle
4562909a20
get trash size from file cache
2014-03-10 15:13:28 +01:00
Bjoern Schiessle
abad625cac
only enable previews if the encryption is disabled
2014-03-10 15:13:28 +01:00
Bjoern Schiessle
eab844e226
if file is not in db, fall back to restore file to the users root
2014-03-10 15:13:28 +01:00
Thomas Müller
c6f4f85e27
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
Thomas Müller
1e84d6b14b
Merge pull request #7190 from owncloud/appconfig-legacy-apps
...
Remove usage of legacy OC_Appconfig
2014-02-18 18:10:22 +01:00
Thomas Müller
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
Robin Appelman
181bbd4325
Remove usage of legacy OC_Appconfig
2014-02-13 16:28:49 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
Vincent Petry
d49c7ad4fb
Fixed double file encoding for previews
2014-01-30 16:34:37 +01:00
Vincent Petry
ca57a849ff
When reading the size of "files" mountpoints need to be excluded
...
The versions and trashbin app are now passing "includeMountPoints=false"
to "getFileInfo()" to make sure that the calculated total size doesn't
include mount points like Shared or external storage.
This is because the default call (legacy) used to return the size of
mount points as well.
Fixes #6731
2014-01-20 17:11:33 +01:00
Bjoern Schiessle
592ae16603
remove old code
2014-01-15 14:35:17 +01:00
Bjoern Schiessle
f11f65c6a5
copy files to owner trash recursively
2014-01-15 14:27:23 +01:00
Bjoern Schiessle
6b7fdda4f5
config switch to disable auto expire for the trash bin
2013-12-04 16:11:40 +01:00
Bjoern Schiessle
ee66db447f
make it possible to select folders
2013-12-02 16:30:03 +01:00
Bjoern Schiessle
8ce3ea3e2c
fix delete files from trash bin
2013-12-02 11:50:55 +01:00
Bjoern Schiessle
5d2299eab8
only create complete share key if we know the exact path
2013-11-26 13:30:59 +01:00
Bjoern Schiessle
f8fcd567a7
move files to owners trash
2013-11-25 16:51:31 +01:00
Georg Ehrke
90fac1f371
replace $path with '/files_trashbin/files/' . $file
2013-11-12 14:03:50 +01:00
Georg Ehrke
feee4b865b
add delete hook for trash bin app
2013-11-12 14:00:36 +01:00
Thomas Müller
db39fede97
Merge branch 'master' into appframework-master
...
Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
2013-09-25 09:52:12 +02:00
Jörn Friedrich Dreyer
4b3e56bcf9
remove unneccessary lib in namespace
2013-09-20 16:46:33 +02:00
Jörn Friedrich Dreyer
9e39118b52
namespaces use upcasefirst parts
...
when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app
its magic!
2013-09-20 16:37:07 +02:00
Thomas Müller
9b420e8660
use \OC::$server->getPreviewManager() instead of \OCP\Preview
2013-09-17 13:33:47 +02:00
Vincent Petry
1304b511e9
Ajax calls for "files" and "files_trashbin" apps
...
Frontend:
- The files app list now uses ajax calls to refresh the list.
- Added support the browser back button (history API).
- Added mask + spinner while loading file list
Backend:
- Added utility function in core JS for parsing query strings.
- Moved file list + breadcrumb template data code to helper
functions
- Fixed some file paths in trashbin app to be similar to the files app
2013-09-13 19:59:14 +02:00
Georg Ehrke
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
Bjoern Schiessle
aed71bb420
also move empty folders to the trash bin as discussed here #4590
2013-08-28 15:46:44 +02:00
Bjoern Schiessle
316d9bfed6
the trash bin can also contain empty files. Don't use the trash bin size as indicator to decide if the trash bin is empty or not
2013-08-27 14:39:43 +02:00
Georg Ehrke
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
Bjoern Schiessle
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
Georg Ehrke
af983b843d
fix merge conflicts
2013-08-05 14:27:38 +02:00
Jörn Friedrich Dreyer
895d9ba1b9
Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-app
...
Use !== and === in files_trashbin app
2013-08-02 03:14:24 -07:00
Thomas Müller
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +02:00
Georg Ehrke
2ea8ee6139
add class='preview-icon' in trashbin app as well
2013-07-29 16:27:40 +02:00
Björn Schießle
2c8e5ec84f
user interface to allow user to decrypt all his files once the encryption app was disabled
...
Conflicts:
settings/templates/personal.php
2013-07-29 13:36:06 +02:00
Björn Schießle
0a9bb8ba73
reduce time for auto expire to 30 days by default
2013-07-26 15:15:47 +02:00
Björn Schießle
a5d9b985c3
make 'restored' extension translatable
2013-07-26 12:01:45 +02:00
Björn Schießle
0182a503a6
expire trash bin if trash bin exceeds max size after a new file was added to ownCloud
2013-07-26 11:45:38 +02:00
Björn Schießle
a00cff7c05
disable "deleted files" button if trash bin is empty
2013-07-26 11:14:29 +02:00
Björn Schießle
96e175ffbf
don't move empty folders to the trash bin
2013-07-25 16:27:40 +02:00
Björn Schießle
bf668eb14f
nicer format of unique names, use 'file (restored).txt' instead of 'files.txt.restored'
2013-07-25 16:20:06 +02:00
Georg Ehrke
a357e5b284
merge conflicts ...
2013-07-10 12:41:53 +02:00
Georg Ehrke
cf449d42e8
properly encode path
2013-07-10 12:30:20 +02:00
kondou
2f11f56d32
Use !== and === in files_trashbin-app
2013-07-10 02:34:00 +02:00
Georg Ehrke
04292ff16c
implement use of preview icons in thrashbin app
2013-07-08 10:53:53 +02:00
Björn Schießle
ae30eb48f2
make trash bin aware of system wide mounts with respect to encryption keys
2013-07-05 16:00:25 +02:00
Björn Schießle
99c62dfd76
Merge branch 'master' into fix_glob_escaping
...
Conflicts:
apps/files_trashbin/lib/trash.php
2013-06-17 14:51:08 +02:00
Morris Jobke
c99e7e97a3
Merge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folder
...
Fix inexisting trashbin's sub-folders
2013-06-15 01:31:32 -07:00
Björn Schießle
c3371812a0
fix indention
2013-06-14 15:14:23 +02:00
Björn Schießle
f91b02e9b6
only escape glob pattern
2013-06-14 15:07:06 +02:00
Florin Peter
842d0608f1
added static function registerHooks() for better unit tests handling
2013-05-22 23:50:45 +02:00
Florin Peter
01f1153b08
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
...
Conflicts:
apps/files/l10n/ar.php
apps/files/l10n/bn_BD.php
apps/files/l10n/de.php
apps/files/l10n/de_DE.php
apps/files/l10n/el.php
apps/files/l10n/es.php
apps/files/l10n/fa.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/id.php
apps/files/l10n/ko.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/sl.php
apps/files/l10n/uk.php
apps/files/l10n/vi.php
apps/files_encryption/l10n/ca.php
apps/files_sharing/lib/cache.php
apps/files_sharing/lib/sharedstorage.php
apps/user_ldap/l10n/tr.php
core/l10n/cs_CZ.php
core/l10n/de.php
core/l10n/de_DE.php
core/l10n/ru.php
core/l10n/sk_SK.php
core/l10n/tr.php
core/l10n/vi.php
core/l10n/zh_CN.php
l10n/af_ZA/files.po
l10n/ar/files.po
l10n/be/files.po
l10n/bg_BG/files.po
l10n/bn_BD/files.po
l10n/ca/files.po
l10n/ca/files_encryption.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/da/files.po
l10n/da/settings.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_encryption.po
l10n/de/files_external.po
l10n/de/files_sharing.po
l10n/de/files_trashbin.po
l10n/de/files_versions.po
l10n/de/lib.po
l10n/de/settings.po
l10n/de/user_ldap.po
l10n/de_DE/files.po
l10n/de_DE/files_encryption.po
l10n/de_DE/files_external.po
l10n/de_DE/files_sharing.po
l10n/de_DE/files_trashbin.po
l10n/de_DE/lib.po
l10n/de_DE/settings.po
l10n/de_DE/user_ldap.po
l10n/el/files.po
l10n/eo/files.po
l10n/es/files.po
l10n/es/lib.po
l10n/es/settings.po
l10n/es_AR/files.po
l10n/eu/files.po
l10n/fa/files.po
l10n/fi/files.po
l10n/fi_FI/files.po
l10n/fr/core.po
l10n/fr/files.po
l10n/gl/files.po
l10n/gl/settings.po
l10n/he/core.po
l10n/he/files.po
l10n/he/user_ldap.po
l10n/hi/files.po
l10n/hr/files.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hu_HU/settings.po
l10n/hy/files.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/files_trashbin.po
l10n/ia/settings.po
l10n/id/files.po
l10n/is/files.po
l10n/it/files.po
l10n/ja_JP/files.po
l10n/ja_JP/user_ldap.po
l10n/ka/files.po
l10n/ka_GE/files.po
l10n/kn/files.po
l10n/ko/files.po
l10n/ko/files_trashbin.po
l10n/ko/settings.po
l10n/ku_IQ/files.po
l10n/lb/files.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lv/files.po
l10n/mk/files.po
l10n/ms_MY/files.po
l10n/my_MM/files.po
l10n/nb_NO/files.po
l10n/ne/files.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nn_NO/files.po
l10n/oc/files.po
l10n/pl/files.po
l10n/pl_PL/files.po
l10n/pt_BR/files.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/files_external.po
l10n/pt_PT/settings.po
l10n/ro/files.po
l10n/ru/core.po
l10n/ru/files.po
l10n/si_LK/files.po
l10n/sk/files.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sq/files.po
l10n/sr/files.po
l10n/sr@latin/files.po
l10n/sv/files.po
l10n/sw_KE/files.po
l10n/ta_LK/files.po
l10n/te/files.po
l10n/th_TH/files.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/lib.po
l10n/tr/settings.po
l10n/tr/user_ldap.po
l10n/uk/files.po
l10n/ur_PK/files.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/settings.po
l10n/zh_HK/files.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/files_versions.po
l10n/zh_TW/settings.po
l10n/zh_TW/user_ldap.po
lib/base.php
lib/files/filesystem.php
lib/files/view.php
lib/public/share.php
settings/l10n/es.php
settings/l10n/pt_PT.php
settings/l10n/tr.php
settings/l10n/zh_CN.php
settings/personal.php
2013-05-15 10:18:25 +02:00
Björn Schießle
cc433d47cb
touch() needs to be performed relative to user/files otherwise ownCloud doesn't execute the hooks which means that etags aren't updated properly
2013-05-10 12:05:11 +02:00
Bastien Ho
bb640df06e
duplicate verification
2013-05-10 11:16:18 +02:00
Bastien Ho
6082a09e62
Fix inexisting trashbin's sub-folders
2013-05-10 11:12:42 +02:00
Björn Schießle
d649f77898
make sure to find the correct path for shared files
2013-05-03 17:14:43 +02:00
Björn Schießle
050258f003
remove encryption keys if a file gets deleted permanently
2013-05-03 16:33:18 +02:00
Björn Schießle
8a1223181b
disable proxys before copying files to the trash bin
2013-05-03 15:18:05 +02:00
Björn Schießle
a2516e549b
get original path in case of shared files when restoring file from trash bin
2013-05-03 14:03:42 +02:00
Björn Schießle
996a557475
get original path in case of shared files
2013-05-03 13:00:04 +02:00
Florin Peter
9f8f052f0d
merged files_trashbin
2013-05-01 01:52:06 +02:00
Florin Peter
3c100af132
revert changes to fbbc76f281 because master is very unstable right now
2013-05-01 01:38:06 +02:00
Florin Peter
7a3ecd0429
delete and restore of versions and share-keys now works
...
fix restore of the same file name
2013-04-28 20:48:30 +02:00
Florin Peter
5e11948598
added handling for share-keys
...
this works only with latest files_encryption branch up from 813641e6e8
2013-04-28 20:48:30 +02:00
Florin Peter
26e5ef193d
restore fixed
2013-04-28 20:48:30 +02:00
Florin Peter
228c501515
fixed some problems and broken code
2013-04-28 20:48:30 +02:00
Björn Schießle
680ba4bea1
restore encryption keys from trash bin (development snapshot)
2013-04-28 20:48:29 +02:00
Björn Schießle
cb65b7ca9d
move encryption keys to trash bin
2013-04-28 20:45:51 +02:00
Björn Schießle
a3999036f7
improved free space calculation if no quota is set, discussed in #2936
2013-04-17 10:42:59 +02:00
Björn Schießle
032c54273c
write a info message to the log if a file gets removed from the trash bin automatically
2013-04-16 12:31:22 +02:00
Björn Schießle
1b3b766244
cleanup the trash bin tables in the database after a user was deleted
2013-04-11 14:40:06 +02:00
Björn Schießle
16b0855992
only add filesize to trashbin size if the file was moved to the trash bin successfully
2013-04-10 10:09:22 +02:00
Björn Schießle
5924d1d95c
add backticks around table names
2013-03-25 12:29:13 +01:00
Brice Maron
1631aa2434
Add backtick for trash app to prevent pg errors
2013-03-15 00:03:37 +01:00
Björn Schießle
d23702d324
make trashbin work with different user homes
2013-03-04 12:57:32 +01:00
Björn Schießle
21bad1fcc0
fix type in var name
2013-03-04 12:33:16 +01:00
Björn Schießle
94dab96dba
fix quota calculation for trash and versions
2013-03-04 12:17:57 +01:00
Björn Schießle
df2a9a3c60
add additional parameter to signal
2013-03-01 12:44:43 +01:00
Björn Schießle
7c360c2491
add post_moveToTrash and post_restore signals to the trash bin
2013-03-01 12:20:29 +01:00
Robin Appelman
d2fe600789
Trash: fix trash when default quota is used
2013-02-27 20:29:49 +01:00
Robin Appelman
429bf42e98
Merge master into trash_fileactions
2013-02-27 20:29:19 +01:00
Björn Schießle
b917646516
fix quota calculation
2013-02-25 16:12:44 +01:00
Björn Schießle
272f854ce6
fix getVersion call
2013-02-25 15:34:36 +01:00
Björn Schießle
e30b3f64e0
fix line endings
2013-02-25 14:29:31 +01:00
Björn Schießle
4c980a4851
Merge branch 'master' into update-expire-function
...
Conflicts:
apps/files_trashbin/appinfo/version
apps/files_trashbin/lib/trash.php
2013-02-25 14:26:59 +01:00
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
