wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
26924 commits 157 branches 562 tags 714 MiB
Commit graph

720 commits

Author SHA1 Message Date
Jenkins for ownCloud
7c072510d3 [tx-robot] updated from transifex 2014-04-10 01:55:39 -04:00
Jenkins for ownCloud
796f719548 [tx-robot] updated from transifex 2014-04-09 01:56:49 -04:00
Vincent Petry
35ab6fe5a9 Disable sharing in trashbin app 2014-04-08 17:13:59 +02:00
Jenkins for ownCloud
4ad4b9768c [tx-robot] updated from transifex 2014-04-08 01:57:51 -04:00
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
Björn Schießle
0757f87dba Merge pull request #7872 from owncloud/trash-disablestoragestats 
Do not retrieve storage stats for trash bin
 2014-03-28 11:22:19 +01:00
Vincent Petry
f3d6b2f3e9 Do not retrieve storage stats for trash bin 2014-03-28 11:21:33 +01:00
Thomas Müller
5fa8f7cf12 Merge pull request #7107 from owncloud/load-apps-proper-master 
Load apps proper master
 2014-03-28 10:33:55 +01:00
Jenkins for ownCloud
ed0cba0ff4 [tx-robot] updated from transifex 2014-03-27 01:56:30 -04: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
Thomas Müller
6ff96b34ad Merge branch 'master' into load-apps-proper-master 
Conflicts:
	apps/files/ajax/rawlist.php
	cron.php
	ocs/v1.php
 2014-03-21 14:05:08 +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
Jenkins for ownCloud
4b802aa7cb [tx-robot] updated from transifex 2014-03-13 17:12:37 -04:00
Vincent Petry
881739cbac Merge pull request #7668 from owncloud/trashbin_predelete 
add preDelete hook for files_trashbin app
 2014-03-12 17:23:38 +01:00
Jenkins for ownCloud
8320b8eb7a [tx-robot] updated from transifex 2014-03-12 01:57:17 -04:00
Georg Ehrke
0f864c38bb add preDelete hook for files_trashbin app 2014-03-11 14:10:12 +01:00
Jenkins for ownCloud
b0ec38e202 [tx-robot] updated from transifex 2014-03-11 01:59:39 -04: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
Vincent Petry
44441b56d6 Fixed trashbin title 2014-02-20 15:16:45 +01:00
Vincent Petry
952584e9c7 Merge pull request #7195 from owncloud/files-selectall 
Do not send file list for select all on Download/delete
 2014-02-19 14:33:24 +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
Vincent Petry
94b3296a71 Trashbin select all now doesn't send file list 
- Fixed "delete" and "restore" actions to not send the file list when
  all files are selected
- When some files are selected, sends the current dir
- Removed "dirListing" attribute as the backend is able to compute the
  value based on the current dir
 2014-02-17 18:34:59 +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
Vincent Petry
d7f4547717 Merge pull request #6726 from owncloud/fix_6630 
don't urldecode get var, php does this automatically
 2014-02-14 14:34:20 +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
Thomas Müller
21207c6a73 remove superfluous $RUNTIME_APPTYPES 2014-02-06 09:50:11 +01:00
Vincent Petry
c5767b67b1 Fixed image preview in trashbin subdirs 2014-01-30 17:03:13 +01:00
Vincent Petry
d49c7ad4fb Fixed double file encoding for previews 2014-01-30 16:34:37 +01:00
Georg Ehrke
c5742520e1 don't urldecode get var, php does this automatically 2014-01-30 16:32:45 +01:00
Bjoern Schiessle
28b6434f46 increase size of mimetype column 2014-01-23 18:28:59 +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
Thomas Müller
92969052d7 remove ru_RU - it has bee removed from transifex 2014-01-13 16:41:10 +01:00
Vincent Petry
1042733634 Fixed various file name escaping issues in core apps 
- Refactored file tr lookup into FileList.findFileEl that uses
  filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
  attributes
 2014-01-10 15:02:26 +01:00
Thomas Müller
2d5427efa9 Merge pull request #6290 from owncloud/files-androidcontentdisposition 
Files androidcontentdisposition
 2014-01-07 11:06:20 -08:00
Jenkins for ownCloud
d2f2645a6a [tx-robot] updated from transifex 2014-01-07 01:56:11 -05:00
Jenkins for ownCloud
0e843b9d7d [tx-robot] updated from transifex 2014-01-06 01:55:59 -05:00
Jenkins for ownCloud
e4616199df [tx-robot] updated from transifex 2014-01-05 01:55:53 -05:00
Jenkins for ownCloud
095f9b8ee0 [tx-robot] updated from transifex 2014-01-02 01:56:21 -05:00
Jenkins for ownCloud
e345f3f511 [tx-robot] updated from transifex 2013-12-29 01:55:36 -05:00
Jenkins for ownCloud
37cdbc3be0 [tx-robot] updated from transifex 2013-12-19 01:57:03 -05:00
Bjoern Schiessle
3831b8b1be always show 'Deleted Files' breadcrumb 2013-12-13 12:17:10 +01:00
Bjoern Schiessle
79719d9ae5 toggle select all checkbox 2013-12-12 17:33:04 +01:00
Vincent Petry
409b510889 Moved content disposition code+workarounds to OCP\Response 
Added new OC\Response API called setContentDispositionHeader() that
contains the needed workarounds for UTF8 and IE.

Refactored download code to use the new API.

Removed unused trashbin download file.
 2013-12-10 12:42:26 +01:00
Bjoern Schiessle
6b7fdda4f5 config switch to disable auto expire for the trash bin 2013-12-04 16:11:40 +01:00
Jenkins for ownCloud
83ec234f53 [tx-robot] updated from transifex 2013-12-02 17:28:29 -05:00
Bjoern Schiessle
ee66db447f make it possible to select folders 2013-12-02 16:30:03 +01:00
Bjoern Schiessle
fac2f2a626 check explicitely all possible dir values 2013-12-02 12:13:32 +01:00
Bjoern Schiessle
edc4447d6a set delete all to true if a complete folder was deleted 2013-12-02 11:59:09 +01:00
Bjoern Schiessle
8ce3ea3e2c fix delete files from trash bin 2013-12-02 11:50:55 +01:00
Bjoern Schiessle
71589e65d2 fix restore from files in sub-folders 2013-11-29 16:43:50 +01:00
Bjoern Schiessle
b3724cd9c6 remove duplicate 2013-11-28 20:58:32 +01:00
Bjoern Schiessle
863aedf784 detect mimetype from the original filename, without the delete timestamp 2013-11-28 18:59:12 +01:00
Björn Schießle
34a8c3c4cd Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trash 
move files to owners trash
 2013-11-27 10:24:55 -08: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
Björn Schießle
31d0ba0344 Merge pull request #5641 from owncloud/filestrash-emptytrash 
Deleting all files in trash now only sends a single flag
 2013-11-25 05:24:11 -08:00
Thomas Müller
c67b8f2b22 fixed documentation 2013-11-22 14:58:36 +01:00
Jenkins for ownCloud
5d9731cef2 [tx-robot] updated from transifex 2013-11-21 10:05:34 -05:00
Jenkins for ownCloud
c3746e866a [tx-robot] updated from transifex 2013-11-15 22:56:31 -05: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
Vincent Petry
80c8666d3a Deleting all files in trash now only sends a single flag 
To prevent having to send the list of all files for deletion, only set a
flag "allfiles". This should make it a bit smoother when deleting 5000+
files.

Also fixes some "empty trash" message issues.
 2013-11-11 17:58:33 +01:00
Jenkins for ownCloud
e431ba5ce8 [tx-robot] updated from transifex 2013-11-11 05:47:59 -05:00
Jenkins for ownCloud
e89f080f09 [tx-robot] updated from transifex 2013-11-03 14:39:28 -05:00
Jenkins for ownCloud
b0b76fe064 [tx-robot] updated from transifex 2013-10-29 07:31:51 -04:00
Vincent Petry
e41ea20ce4 Fixed clicking on the "Home" breadcrumb in the trash app 
Clicking on the "home" breadcrumb now correctly brings the user back to
the files app.
 2013-10-28 20:24:06 +01:00
Jenkins for ownCloud
119ecc6f34 [tx-robot] updated from transifex 2013-10-27 02:32:11 -04:00
Jenkins for ownCloud
6aee83cadf [tx-robot] updated from transifex 2013-10-19 08:27:13 -04:00
Vincent Petry
b2986e1994 Merge pull request #5274 from owncloud/files-ie8-deletecheckbox 
Fixed delete icon alignment in IE8
 2013-10-11 08:24:57 -07:00
Vincent Petry
39b150921d Moved IE8 inline styles in files.css 2013-10-11 14:10:00 +02:00
Jenkins for ownCloud
44a5b0bad0 [tx-robot] updated from transifex 2013-10-10 22:30:58 -04:00
Vincent Petry
75629a1f00 Fixed delete icon alignment in IE8 
Removed old inline CSS that forced every td to have position:static in
the files app. (#5056)
 2013-10-11 00:16:41 +02:00
Bjoern Schiessle
7ab4fef7a9 update file summary after group delete/restore 2013-10-09 16:17:43 +02:00
Bjoern Schiessle
46bce8e540 fix checkbox 2013-10-09 13:15:53 +02:00
Bjoern Schiessle
51cfdb32b1 fix indention 2013-10-09 12:43:56 +02:00
Bjoern Schiessle
31a91ef892 fix group delete/restore 2013-10-09 12:35:15 +02:00
Bjoern Schiessle
9e3d28871e fix delete/restore individual files 2013-10-09 12:01:25 +02:00
Bjoern Schiessle
4404963918 fix trashbin layout 2013-10-09 11:11:55 +02:00
Jenkins for ownCloud
c655eec3d1 [tx-robot] updated from transifex 2013-10-07 12:21:38 -04:00
Jenkins for ownCloud
3613e79e10 [tx-robot] updated from transifex 2013-10-06 19:16:10 -04:00
Jenkins for ownCloud
a711399e62 [tx-robot] updated from transifex 2013-09-30 10:19:22 -04:00
Thomas Müller
687ba053b7 Merge branch 'master' into appframework-master 2013-09-27 14:25:47 +02:00
Jenkins for ownCloud
f31d31844e [tx-robot] updated from transifex 2013-09-27 00:02:30 -04: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
Jenkins for ownCloud
28918d61d2 [tx-robot] updated from transifex 2013-09-22 12:58:42 -04:00
Thomas Müller
2a0c51a8bf Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading 
namespaces use upcasefirst parts
 2013-09-21 11:54:06 -07:00
Jenkins for ownCloud
5b95e7aa0f [tx-robot] updated from transifex 2013-09-20 10:50:14 -04: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
Jenkins for ownCloud
6b1843d91b [tx-robot] updated from transifex 2013-09-18 11:50:02 -04:00
Thomas Müller
9b420e8660 use \OC::$server->getPreviewManager() instead of \OCP\Preview 2013-09-17 13:33:47 +02:00
Thomas Müller
a0c2c2473a Merge pull request #4501 from owncloud/ajaxfilelist 
Ajax calls for "files" and "files_trashbin" apps
 2013-09-14 12:51:16 -07:00
Jenkins for ownCloud
556bd1ef23 [tx-robot] updated from transifex 2013-09-13 21:49:24 -04:00
Vincent Petry
ec2f20f720 Fixed files_trashbin to also use hash URL part for IE8 2013-09-13 21:00:15 +02:00
Vincent Petry
30a2f2f352 Use hash part of URL for IE8 in files app 
Before this fix, the URL wasn't updated in IE8 when navigating into
folders.

This fix makes use of the hash part of URLs to make this work in IE8,
since IE8 doesn't support the history API nor changing the URL without
redirecting.

From now, both the regular query URL "?dir=somedir" and "#?dir=somedir"
will work in both IE8 and non-IE8 browsers.

In IE8, query based URLs are automatically converted to hash URLs upon
page load. The conversion is done on the server side by redirecting the
user to the updated URL.

When loading a page directly using a hash URL in the form
"#?dir=somedir" in IE8, the server doesn't get the hash, so it will not
return any results in that case and rely on ajax to load the first page.
 2013-09-13 20:48:35 +02:00
Vincent Petry
4549cf519e Added missing "files" JS to files_trashbin module 
The recent refactoring for the breadcrumb resizing relies on the "Files"
object which is in the "files" Javascript file.

This fix includes it here as well.
 2013-09-13 19:59:15 +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
Thomas Müller
d5ddbfb045 Merge pull request #4719 from owncloud/port_4701_master 
Always check variable type before using readdir to avoid surprises
 2013-09-12 15:44:20 -07:00
Thomas Müller
9d661eab23 adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing 2013-09-12 00:40:35 +02:00
Jenkins for ownCloud
72689f643b [tx-robot] updated from transifex 2013-09-10 10:42:16 -04:00
Jenkins for ownCloud
92f6c3bb10 [tx-robot] updated from transifex 2013-09-08 21:37:53 -04:00
Jenkins for ownCloud
e895cf9188 [tx-robot] updated from transifex 2013-09-07 04:46:57 -04:00
Jenkins for ownCloud
0527fb05ad [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
Arthur Schiwon
ec3639dc7a Always check variable type before using readdir to avoid surprises 2013-09-04 13:06:04 +02:00
Jenkins for ownCloud
fe0b8ac2c0 [tx-robot] updated from transifex 2013-09-03 07:46:55 -04:00
Bernhard Posselt
f038cb9aea Merge pull request #4671 from owncloud/emptycontent 
centers text message in empty-content page (files and files_trashbin apps)
 2013-09-01 17:47:55 -07:00
Jenkins for ownCloud
e68b5f8b0d [tx-robot] updated from transifex 2013-09-01 13:30:40 -04:00
Alessandro Cosentino
b10a646bc8 rename emptyfolder to emptycontent 2013-08-31 11:25:11 -04:00
Georg Ehrke
8ef40277b2 Merge master into oc_preview 2013-08-30 18:11:18 +02:00
Jenkins for ownCloud
dbc78b1a58 [tx-robot] updated from transifex 2013-08-30 09:38:20 -04:00
Georg Ehrke
b7758d0f8d Merge master into oc_preview 2013-08-29 10:50:55 +02:00
Thomas Müller
81cab5ada8 Merge pull request #3926 from owncloud/improve_filesummary 
Improve filelist summary
 2013-08-28 15:11:09 -07:00
Bjoern Schiessle
aed71bb420 also move empty folders to the trash bin as discussed here #4590 2013-08-28 15:46:44 +02:00
kondou
6bd0f3cba7 Reimplement filesummary in JS 
Fix #993
 2013-08-28 15:10:17 +02:00
Jenkins for ownCloud
d5062b9e0e [tx-robot] updated from transifex 2013-08-27 11:23:18 -04: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
Thomas Müller
c9123263ab kill zh_CN.GB2312 2013-08-27 01:27:05 +02:00
Georg Ehrke
6f0c1e8d45 Merge master into oc_preview 2013-08-26 12:24:33 +02:00
Jenkins for ownCloud
d587146a5a [tx-robot] updated from transifex 2013-08-25 19:21:52 -04:00
Georg Ehrke
6ffa2a28d0 Merge branch 'master' into oc_preview 2013-08-23 23:10:37 +02:00
Jenkins for ownCloud
02b2b5a808 [tx-robot] updated from transifex 2013-08-22 10:37:23 -04:00
Georg Ehrke
224b80f906 move isMimeSupported out of template files 2013-08-21 15:55:59 +02:00
Jenkins for ownCloud
a89199cc7b [tx-robot] updated from transifex 2013-08-21 08:14:27 -04:00
Thomas Müller
884c6b5a82 Merge pull request #4512 from owncloud/readdir-strict-equals 
use strict equals in readdir loops to prevent issues with '0' files
 2013-08-20 01:17:25 -07:00
Jenkins for ownCloud
e9644c2f52 [tx-robot] updated from transifex 2013-08-19 15:14:38 -04:00
Georg Ehrke
d9e8ebabdc outsource sharing and deleted files previews to apps 2013-08-19 13:24:07 +02:00
Robin Appelman
c5402f4575 use strict equals in readdir loops to prevent issues with '0' files 2013-08-19 12:04:53 +02:00
Georg Ehrke
f2702ff1ca Merge master into oc_preview 2013-08-19 11:24:17 +02:00
Björn Schießle
9be836814c Merge pull request #4239 from owncloud/decrypt_files_again 
Enable user to decrypt files again after encryption app was disabled
 2013-08-18 09:51:48 -07:00
kondou
9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +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
Thomas Müller
de52157e76 remove ru_RU - fixes #3135 2013-08-17 11:43:37 +02:00
Jenkins for ownCloud
6bd0ba79df [tx-robot] updated from transifex 2013-08-16 01:32:30 -04:00
Thomas Müller
ada13a4d40 fixing all broken translation files 2013-08-15 15:41:45 +02:00
Jenkins for ownCloud
680ac48856 [tx-robot] updated from transifex 2013-08-15 04:53:54 -04:00
Georg Ehrke
4b5fb08c2c Merge master into oc_preview 2013-08-14 20:56:44 +02:00
Jörn Friedrich Dreyer
8f3f47e868 Merge pull request #4376 from owncloud/use_plurals 
Use plural translations
 2013-08-14 10:23:19 -07:00
Jenkins for ownCloud
9492aeffe9 [tx-robot] updated from transifex 2013-08-13 09:13:11 -04:00
kondou
9549bd3e68 Use plural translations 2013-08-09 20:37:18 +02:00
Jenkins for ownCloud
98f836363a [tx-robot] updated from transifex 2013-08-09 08:06:31 -04:00
Jenkins for ownCloud
0deae7b86f [tx-robot] updated from transifex 2013-08-07 09:04:32 -04:00
Georg Ehrke
af983b843d fix merge conflicts 2013-08-05 14:27:38 +02:00
Jenkins for ownCloud
17fe748abc [tx-robot] updated from transifex 2013-08-03 01:56:46 -04: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
Jenkins for ownCloud
16726ab793 [tx-robot] updated from transifex 2013-08-02 02:00:45 -04:00
Jenkins for ownCloud
b037f2dc6e [tx-robot] updated from transifex 2013-08-01 01:57:04 -04:00
Jenkins for ownCloud
761f40328c [tx-robot] updated from transifex 2013-07-31 02:01:45 -04:00
Bjoern Schiessle
6f20e081e4 added missing isEmpty ajax file 2013-07-30 12:48:41 +02: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
efd8ad6696 found some more places where we can disable buttons while performing a action 2013-07-26 14:54:27 +02:00
Björn Schießle
9d24b9c7e8 Hide Delete Permanently button when Restore happens 2013-07-26 13:17:09 +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
Jenkins for ownCloud
29d8ae2f95 [tx-robot] updated from transifex 2013-07-14 02:10:41 +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
70b4f85911 Use isIgnoredDir() 2013-07-10 02:36:43 +02:00
kondou
2f11f56d32 Use !== and === in files_trashbin-app 2013-07-10 02:34:00 +02:00
Victor Dubiniuk
257096f1d4 Encode current trashbin directory 2013-07-09 17:46:11 +03:00
Victor Dubiniuk
582631323a Migrate to encodePath 2013-07-09 17:46:11 +03:00
Jan-Christoph Borchardt
8d8f99fbc4 Merge pull request #3757 from owncloud/icon-cleanup 
Icon cleanup
 2013-07-08 06:56:29 -07:00
Georg Ehrke
d699135c5e fix for previews in trashbin app 2013-07-08 15:14:25 +02:00
Georg Ehrke
04292ff16c implement use of preview icons in thrashbin app 2013-07-08 10:53:53 +02:00
Jenkins for ownCloud
3cb4a72960 [tx-robot] updated from transifex 2013-07-08 02:09:41 +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
Jenkins for ownCloud
c3b8f2bf64 [tx-robot] updated from transifex 2013-06-25 02:13:40 +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
Jan-Christoph Borchardt
2a57763542 use history icon in Deleted Files template as well 2013-06-17 13:30:57 +02:00
Jan-Christoph Borchardt
d9dcba9a39 remove unused loading spinners, just have one 2013-06-17 12:35:25 +02:00
Jan-Christoph Borchardt
257ebc2830 use consistent icon for 'restore'/versions/history, also SVG 2013-06-17 12:18:45 +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
Jenkins for ownCloud
67c085417c [tx-robot] updated from transifex 2013-06-07 02:17:50 +02:00
Jenkins for ownCloud
666a5c1cc7 [tx-robot] updated from transifex 2013-06-05 02:01:42 +02:00
Georg Ehrke
841b420bc4 add event.preventDefault to undelete function 2013-05-27 16:37:43 +02:00
Georg Ehrke
d408cd7f37 fix https://github.com/owncloud/core/issues/3320 2013-05-27 15:24:37 +02:00
Jenkins for ownCloud
6a6c18dfab [tx-robot] updated from transifex 2013-05-25 02:11:52 +02:00
Thomas Müller
4911305887 Merge pull request #3416 from owncloud/files_encryption 
New files encryption app
 2013-05-24 02:21:19 -07:00
Jenkins for ownCloud
b47729c5fc [tx-robot] updated from transifex 2013-05-24 02:02:43 +02:00
Florin Peter
842d0608f1 added static function registerHooks() for better unit tests handling 2013-05-22 23:50:45 +02:00
Björn Schießle
5cd14425f9 Merge branch 'master' into files_encryption 
Conflicts:
	apps/files_trashbin/l10n/nn_NO.php
 2013-05-21 15:30:19 +02:00
Jenkins for ownCloud
afdad5c74d [tx-robot] updated from transifex 2013-05-21 02:04:52 +02:00
Florin Peter
31037241e1 Merge branch 'master' into files_encryption 2013-05-20 02:25:56 +02:00
Jenkins for ownCloud
6609de28d8 [tx-robot] updated from transifex 2013-05-20 02:10:11 +02:00
Jenkins for ownCloud
9428d813ba [tx-robot] updated from transifex 2013-05-18 02:03:28 +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
0ef8590773 Merge branch 'master' into update_etags_on_restore 2013-05-13 10:48:06 +02:00
Jenkins for ownCloud
74f92d0c7f [tx-robot] updated from transifex 2013-05-12 02:05:29 +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
Lukas Reschke
db1e6b5f3b Use $dir instead of $fullpath 2013-05-06 14:28:01 +03:00
Lukas Reschke
b13b19c58b Use the internal ownCloud view 2013-05-06 13:43:23 +03:00
Jenkins for ownCloud
a876240b32 [tx-robot] updated from transifex 2013-05-04 02:00:54 +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
b2da07fe95 Merge branch 'master' into files_encryption to get the latest files_trashbin app 
Conflicts:
	apps/files/l10n/bn_BD.php
	apps/files/l10n/da.php
	apps/files/l10n/de.php
	apps/files/l10n/de_DE.php
	apps/files/l10n/fa.php
	apps/files/l10n/fi_FI.php
	apps/files/l10n/hr.php
	apps/files/l10n/ms_MY.php
	apps/files/l10n/ro.php
	apps/files/l10n/si_LK.php
	apps/files/l10n/sl.php
	apps/files/l10n/ta_LK.php
	apps/files_external/l10n/de_DE.php
	apps/files_external/l10n/et_EE.php
	apps/user_ldap/l10n/tr.php
	core/l10n/bg_BG.php
	l10n/af_ZA/files.po
	l10n/af_ZA/files_external.po
	l10n/ar/core.po
	l10n/ar/files.po
	l10n/ar/files_external.po
	l10n/be/files.po
	l10n/be/files_external.po
	l10n/bg_BG/core.po
	l10n/bg_BG/files.po
	l10n/bg_BG/files_external.po
	l10n/bg_BG/files_trashbin.po
	l10n/bg_BG/files_versions.po
	l10n/bg_BG/settings.po
	l10n/bn_BD/core.po
	l10n/bn_BD/files.po
	l10n/bn_BD/files_external.po
	l10n/ca/core.po
	l10n/ca/files.po
	l10n/ca/files_external.po
	l10n/cs_CZ/core.po
	l10n/cs_CZ/files.po
	l10n/cs_CZ/files_external.po
	l10n/cs_CZ/lib.po
	l10n/cy_GB/core.po
	l10n/cy_GB/files.po
	l10n/cy_GB/files_external.po
	l10n/cy_GB/settings.po
	l10n/da/core.po
	l10n/da/files.po
	l10n/da/files_external.po
	l10n/de/core.po
	l10n/de/files.po
	l10n/de/files_external.po
	l10n/de_DE/core.po
	l10n/de_DE/files.po
	l10n/de_DE/files_external.po
	l10n/el/core.po
	l10n/el/files.po
	l10n/el/files_external.po
	l10n/eo/core.po
	l10n/eo/files.po
	l10n/eo/files_external.po
	l10n/es/core.po
	l10n/es/files.po
	l10n/es/files_external.po
	l10n/es_AR/core.po
	l10n/es_AR/files.po
	l10n/es_AR/files_external.po
	l10n/et_EE/core.po
	l10n/et_EE/files.po
	l10n/et_EE/files_external.po
	l10n/eu/core.po
	l10n/eu/files.po
	l10n/eu/files_external.po
	l10n/fa/core.po
	l10n/fa/files.po
	l10n/fa/files_external.po
	l10n/fi/files.po
	l10n/fi_FI/core.po
	l10n/fi_FI/files.po
	l10n/fi_FI/files_external.po
	l10n/fr/core.po
	l10n/fr/files.po
	l10n/fr/files_external.po
	l10n/gl/core.po
	l10n/gl/files.po
	l10n/gl/files_external.po
	l10n/he/core.po
	l10n/he/files.po
	l10n/he/files_external.po
	l10n/hi/files.po
	l10n/hi/files_external.po
	l10n/hr/core.po
	l10n/hr/files.po
	l10n/hr/files_external.po
	l10n/hu_HU/core.po
	l10n/hu_HU/files.po
	l10n/hu_HU/files_external.po
	l10n/hy/files.po
	l10n/hy/files_external.po
	l10n/ia/core.po
	l10n/ia/files.po
	l10n/ia/files_external.po
	l10n/id/core.po
	l10n/id/files.po
	l10n/id/files_external.po
	l10n/is/core.po
	l10n/is/files.po
	l10n/is/files_external.po
	l10n/it/core.po
	l10n/it/files.po
	l10n/it/files_external.po
	l10n/ja_JP/core.po
	l10n/ja_JP/files.po
	l10n/ja_JP/files_external.po
	l10n/ka/files.po
	l10n/ka/files_external.po
	l10n/ka_GE/core.po
	l10n/ka_GE/files.po
	l10n/ka_GE/files_external.po
	l10n/kn/files.po
	l10n/kn/files_external.po
	l10n/ko/core.po
	l10n/ko/files.po
	l10n/ko/files_external.po
	l10n/ku_IQ/files.po
	l10n/ku_IQ/files_external.po
	l10n/lb/core.po
	l10n/lb/files.po
	l10n/lb/files_external.po
	l10n/lt_LT/core.po
	l10n/lt_LT/files.po
	l10n/lt_LT/files_external.po
	l10n/lv/core.po
	l10n/lv/files.po
	l10n/lv/files_external.po
	l10n/mk/core.po
	l10n/mk/files.po
	l10n/mk/files_external.po
	l10n/ms_MY/core.po
	l10n/ms_MY/files.po
	l10n/ms_MY/files_external.po
	l10n/my_MM/files.po
	l10n/my_MM/files_external.po
	l10n/nb_NO/core.po
	l10n/nb_NO/files.po
	l10n/nb_NO/files_external.po
	l10n/ne/files.po
	l10n/ne/files_external.po
	l10n/nl/core.po
	l10n/nl/files.po
	l10n/nl/files_external.po
	l10n/nn_NO/files.po
	l10n/nn_NO/files_external.po
	l10n/oc/core.po
	l10n/oc/files.po
	l10n/oc/files_external.po
	l10n/pl/core.po
	l10n/pl/files.po
	l10n/pl/files_external.po
	l10n/pl_PL/files.po
	l10n/pt_BR/core.po
	l10n/pt_BR/files.po
	l10n/pt_BR/files_external.po
	l10n/pt_PT/core.po
	l10n/pt_PT/files.po
	l10n/pt_PT/files_external.po
	l10n/ro/core.po
	l10n/ro/files.po
	l10n/ro/files_external.po
	l10n/ru/core.po
	l10n/ru/files.po
	l10n/ru/files_external.po
	l10n/ru_RU/core.po
	l10n/ru_RU/files.po
	l10n/si_LK/core.po
	l10n/si_LK/files.po
	l10n/si_LK/files_external.po
	l10n/sk/files.po
	l10n/sk/files_external.po
	l10n/sk_SK/core.po
	l10n/sk_SK/files.po
	l10n/sk_SK/files_external.po
	l10n/sl/core.po
	l10n/sl/files.po
	l10n/sl/files_external.po
	l10n/sq/core.po
	l10n/sq/files.po
	l10n/sq/files_external.po
	l10n/sr/core.po
	l10n/sr/files.po
	l10n/sr/files_external.po
	l10n/sr@latin/files.po
	l10n/sr@latin/files_external.po
	l10n/sv/core.po
	l10n/sv/files.po
	l10n/sv/files_external.po
	l10n/sw_KE/files.po
	l10n/sw_KE/files_external.po
	l10n/ta_LK/core.po
	l10n/ta_LK/files.po
	l10n/ta_LK/files_external.po
	l10n/te/files.po
	l10n/te/files_external.po
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/files_encryption.pot
	l10n/templates/files_external.pot
	l10n/templates/files_sharing.pot
	l10n/templates/files_trashbin.pot
	l10n/templates/files_versions.pot
	l10n/templates/lib.pot
	l10n/templates/settings.pot
	l10n/templates/user_ldap.pot
	l10n/templates/user_webdavauth.pot
	l10n/th_TH/core.po
	l10n/th_TH/files.po
	l10n/th_TH/files_external.po
	l10n/tr/core.po
	l10n/tr/files.po
	l10n/tr/files_external.po
	l10n/tr/user_ldap.po
	l10n/uk/core.po
	l10n/uk/files.po
	l10n/uk/files_external.po
	l10n/ur_PK/files.po
	l10n/ur_PK/files_external.po
	l10n/vi/core.po
	l10n/vi/files.po
	l10n/vi/files_external.po
	l10n/zh_CN.GB2312/core.po
	l10n/zh_CN.GB2312/files.po
	l10n/zh_CN.GB2312/files_external.po
	l10n/zh_CN/core.po
	l10n/zh_CN/files.po
	l10n/zh_CN/files_external.po
	l10n/zh_HK/core.po
	l10n/zh_HK/files.po
	l10n/zh_HK/files_external.po
	l10n/zh_TW/core.po
	l10n/zh_TW/files.po
	l10n/zh_TW/files_external.po
	lib/base.php
	lib/files/mount/mount.php
 2013-04-30 20:53:56 +02:00
FlorinPeter
4ab3614248 Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_master 
Trashbin for encryption keys now against master
 2013-04-30 11:39:21 -07:00
Jenkins for ownCloud
5764bf088e [tx-robot] updated from transifex 2013-04-30 01:59:18 +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
Jenkins for ownCloud
901e0c598d [tx-robot] updated from transifex 2013-04-28 02:01:38 +02:00
Jenkins for ownCloud
7b2c64236c [tx-robot] updated from transifex 2013-04-27 02:24:29 +02:00
Jenkins for ownCloud
a7b4469b2e [tx-robot] updated from transifex 2013-04-24 02:01:20 +02:00
Jenkins for ownCloud
05ab9d2de7 [tx-robot] updated from transifex 2013-04-23 02:00:31 +02:00
Jenkins for ownCloud
f6808617b3 [tx-robot] updated from transifex 2013-04-22 02:00:20 +02:00
Jenkins for ownCloud
03c7a52bc5 [tx-robot] updated from transifex 2013-04-20 02:02:09 +02:00
Jenkins for ownCloud
cbd8b792d9 [tx-robot] updated from transifex 2013-04-18 02:09:28 +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
Jenkins for ownCloud
37868818ff [tx-robot] updated from transifex 2013-04-17 02:29:17 +02:00
Björn Schießle
01d203c773 add explenation of the expire function to the apps description 2013-04-16 12:31:33 +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
Jenkins for ownCloud
d0b3e8aceb [tx-robot] updated from transifex 2013-04-16 02:17:30 +02:00
Jenkins for ownCloud
19afc216cf [tx-robot] updated from transifex 2013-04-13 02:15:54 +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
Jenkins for ownCloud
b02db643d0 [tx-robot] updated from transifex 2013-04-11 02:10:41 +02:00
Björn Schießle
48dabd2c14 size of the trash bin could be incorrect, remove it for all users to enforce a recalculation during next usage. 2013-04-10 10:09:37 +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
Jenkins for ownCloud
c06bc81c79 [tx-robot] updated from transifex 2013-04-10 02:09:39 +02:00
Jenkins for ownCloud
5ef389610f [tx-robot] updated from transifex 2013-04-09 02:14:02 +02:00
Bart Visscher
46a552fd56 Merge pull request #2738 from Kondou-ger/fix_alert_issues 
Fixed things in alert-messages
 2013-04-06 08:24:43 -07:00
kondou
de2e546617 Translate 'Error' in core 2013-04-06 16:52:55 +02:00
root
74b02db337 Fixed things in alert-messages 
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".

Also fixed missing translation.
 2013-04-05 01:56:32 +02:00
Jenkins for ownCloud
c745bfa821 [tx-robot] updated from transifex 2013-04-05 00:22:48 +02:00
Jenkins for ownCloud
5e74ec26a8 [tx-robot] updated from transifex 2013-03-30 00:06:29 +01:00
Jenkins for ownCloud
0c666cb764 [tx-robot] updated from transifex 2013-03-27 00:11:05 +01:00
Björn Schießle
5924d1d95c add backticks around table names 2013-03-25 12:29:13 +01:00
Jenkins for ownCloud
4f6e13e673 [tx-robot] updated from transifex 2013-03-23 00:06:16 +01:00
Björn Schießle
4a1a23ce1b add some error logs to the trash bin app 2013-03-18 12:08:34 +01:00
Jenkins for ownCloud
2a48aa322d [tx-robot] updated from transifex 2013-03-18 00:06:55 +01:00
Jenkins for ownCloud
1427af4a22 [tx-robot] updated from transifex 2013-03-16 22:18:26 +01:00
Björn Schießle
23fe98a562 Merge pull request #2336 from eMerzh/fix_trashpg 
Add backtick for trash app to prevent pg errors
 2013-03-15 03:17:54 -07:00
Jenkins for ownCloud
0c123ebf9d [tx-robot] updated from transifex 2013-03-15 00:06:36 +01:00
Brice Maron
1631aa2434 Add backtick for trash app to prevent pg errors 2013-03-15 00:03:37 +01:00
Jenkins for ownCloud
9a0cb2ccaa [tx-robot] updated from transifex 2013-03-14 00:06:29 +01:00
Jenkins for ownCloud
569c7ab138 [tx-robot] updated from transifex 2013-03-12 00:14:05 +01:00
Jenkins for ownCloud
6bdb84ab28 [tx-robot] updated from transifex 2013-03-10 00:06:53 +01:00
Jenkins for ownCloud
0629ff4dd9 [tx-robot] updated from transifex 2013-03-09 00:06:34 +01:00
Jenkins for ownCloud
308c85090e [tx-robot] updated from transifex 2013-03-08 00:26:35 +01:00
Björn Schießle
ba9f5f5885 add dirlisting var to file list 2013-03-07 14:54:59 +01:00
Björn Schießle
dda4c6bf4b no dir parameter needed 2013-03-07 13:51:18 +01:00
Björn Schießle
7188303651 let the home icon link to the files view in the trash bin 2013-03-07 13:48:02 +01:00
Frank Karlitschek
33c62bf110 Merge pull request #2090 from owncloud/fixing-2089-master 
fixes #2089
 2013-03-04 13:17:35 -08:00
Bernhard Posselt
10b108ed8a Merge pull request #2030 from j-ed/master 
suppress log messages like `include path for class ... starts with "apps/"`
 2013-03-04 12:59:39 -08:00
Thomas Mueller
a118906f26 fixes #2089 2013-03-04 21:45:21 +01:00
raghunayyar
d9c11a93c6 Corrects Files Layout in Trashbin 2013-03-04 21:34:50 +05:30
Björn Schießle
d23702d324 make trashbin work with different user homes 2013-03-04 12:57:32 +01:00
Lukas Reschke
2a9c3c1660 Merge pull request #2069 from owncloud/fix_sanitize_call 
use p() for the output and not for the comparison
 2013-03-04 03:41:47 -08: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
ccc4102cd9 fix p() call 2013-03-04 12:12:27 +01:00
Jenkins for ownCloud
b738aaba2a [tx-robot] updated from transifex 2013-03-04 00:07:35 +01:00
j-ed
4c03c3a31d Update app.php 
suppress log messages like `include path for class \"OCA\\Files_Trashbin\\Hooks\" starts with \"apps\/\"`.
 2013-03-02 12:24:12 +01:00
Lukas Reschke
5e7970f761 Merge master 2013-03-01 23:11:03 +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
Lukas Reschke
dee16deacd Merge master 2013-02-28 20:03:06 +01:00
Robin Appelman
12fd47af39 Trash: fix opening folders 2013-02-28 13:32:08 +01:00
Lukas Reschke
3ba8881bac [files_trashbin] From echo to p 2013-02-27 21:46:37 +01:00
Robin Appelman
923c51773a Trash: disable text editor from trash for now 2013-02-27 20:37:50 +01:00
Robin Appelman
f497970e30 Trash: fix download.php 2013-02-27 20:31:21 +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
Jenkins for ownCloud
63d9feb8c0 [tx-robot] updated from transifex 2013-02-26 00:06:26 +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
Jenkins for ownCloud
21f3291eee [tx-robot] updated from transifex 2013-02-25 00:06:17 +01:00
Thomas Müller
a417028ccd Merge pull request #1862 from owncloud/whitespace-cleanup 
Whitespace cleanup
 2013-02-23 11:39:13 -08:00
Jenkins for ownCloud
6aa0ecc9b8 [tx-robot] updated from transifex 2013-02-23 00:05:33 +01:00
Bart Visscher
bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Jörn Friedrich Dreyer
e8da90d0f4 Merge pull request #1711 from owncloud/style-cleanup 
Codestyle cleanup
 2013-02-22 07:02:51 -08:00
Björn Schießle
df76e0d1c3 use the same string lengths like the file cache 2013-02-22 10:05:08 +01:00
Jenkins for ownCloud
734a463297 [tx-robot] updated from transifex 2013-02-22 00:08:47 +01:00
Bart Visscher
fb7de77474 Style cleanup files_trashbin 2013-02-21 23:47:21 +01:00
Björn Schießle
629097bee7 increase db fileds for usernames 2013-02-21 22:44:44 +01:00
Björn Schießle
89ef06cd79 rename app to 'deleted files' 2013-02-21 16:34:22 +01:00
Björn Schießle
2436d01985 calculate trashbin size per user 2013-02-21 12:37:13 +01:00
Jenkins for ownCloud
dcd93a53e4 [tx-robot] updated from transifex 2013-02-21 00:15:58 +01:00
Björn Schießle
6aed7abfbe Merge branch 'master' into trashbin_encryption 2013-02-21 00:05:30 +01:00
Björn Schießle
fc1fba2304 don't show empty trash bin message for sub folders 2013-02-21 00:02:52 +01:00
Thomas Mueller
3eb9cd035f Merge branch 'master' into trash_bin_delete_selected 2013-02-20 23:46:15 +01:00
Björn Schießle
c1847aaf51 change for loop to make it hopefully work with IE 2013-02-20 22:32:44 +01:00
Björn Schießle
2d6efae257 update path to deleted files 2013-02-20 22:19:23 +01:00
Björn Schießle
b685aa8bcb some fixes for the keyfile handling 2013-02-20 22:17:04 +01:00
Bernhard Posselt
3b9d9eea09 replaced for in loops with normal enumerating loops to fix #1803 2013-02-20 21:57:50 +01:00
Björn Schießle
5329c9ea31 update script which copies all trash bin related files to user/files_trashbin 2013-02-20 19:18:34 +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
273e1a146b switch to json encoded file list 2013-02-20 16:33:45 +01:00
Björn Schießle
3a364639b7 use "|" as delimiter instead of ";", since "|" is not allowed in file/folder names 2013-02-20 15:17:32 +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
Jenkins for ownCloud
99758dce2b [tx-robot] updated from transifex 2013-02-20 00:03:28 +01:00
Björn Schießle
686254ac11 move2trash() handles keyfiles 2013-02-19 18:45:46 +01:00
Björn Schießle
211e651d72 add timestamp to function call; fix trash.js to handle multiple delete operation at once 2013-02-19 12:38:00 +01:00
Björn Schießle
7bfbfe6562 initialize $result 2013-02-19 12:24:51 +01:00
Björn Schießle
f45b268b93 rebase to master 2013-02-19 12:16:54 +01:00
Björn Schießle
e6c39fc3e7 change $_REQUEST to $_POST; fix check if file was successfully deleted 2013-02-19 12:14:44 +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
Björn Schießle
ac1b2a74ef add missing paramenter to post request 2013-02-19 11:50:29 +01:00
Björn Schießle
815e964362 use instead of 2013-02-19 11:49:41 +01:00
Lukas Reschke
3d7545269b Merge pull request #1764 from owncloud/Undelete_directory_fix 
Fix for Undelete directory action
 2013-02-19 01:34:49 -08:00
Björn Schießle
51cef9d8f0 allow user to delete selected files from the trash bin permanently 2013-02-19 10:24:21 +01:00
Björn Schießle
9a93db9642 remove obsolete variables 2013-02-19 10:23:34 +01:00
Jenkins for ownCloud
76c4dc6296 [tx-robot] updated from transifex 2013-02-19 00:06:51 +01:00
Victor Dubiniuk
e2f87e456f Calculate size for existing directories only 2013-02-18 23:48:08 +03:00
Björn Schießle
37352bba96 close file handler after readdir() 2013-02-18 18:16:19 +01:00
Qingping Hou
c0ac98066e check filename and timestamp in Trashbin's file_exists method 2013-02-18 09:49:50 -05:00
Jenkins for ownCloud
c8e7b14ab3 [tx-robot] updated from transifex 2013-02-17 00:26:17 +01:00
Qingping Hou
4b4b1f8692 Properly delete empty directories in Trashbin 
Instead of checking delted file size, we do a real check.

this fixes #1688
 2013-02-16 17:44:51 -05:00
Qingping Hou
50759607e4 add file_exists method to files_trashbin app 2013-02-16 17:42:06 -05:00
Jenkins for ownCloud
b169073169 [tx-robot] updated from transifex 2013-02-15 00:06:50 +01:00
Bart Visscher
9058d398a7 Merge pull request #1662 from owncloud/style-cleanup 
Style cleanup
 2013-02-14 12:54:36 -08:00
Björn Schießle
ae172ce7de improved description of the trash bin app 2013-02-14 13:01:02 +01: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
Jenkins for ownCloud
bfe6334cd9 [tx-robot] updated from transifex 2013-02-14 00:06:51 +01:00
Jenkins for ownCloud
68fa0b7dcc [tx-robot] updated from transifex 2013-02-13 00:05:40 +01:00