Commit Graph

227 Commits

Author SHA1 Message Date
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