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

801 commits

Author SHA1 Message Date
Jenkins for ownCloud
c378456137 [tx-robot] updated from transifex 2015-10-17 01:55:34 -04:00
Robin Appelman
e4364426e2 Fix listing of trash files in test 2015-10-16 21:41:51 +02:00
Robin Appelman
2e8232e803 Fix trashbin handling of unknown/unlimited free space 2015-10-16 21:41:51 +02:00
Robin Appelman
a87b34a059 dont assume home storage is local in trash test 2015-10-16 21:41:51 +02:00
Thomas Müller
0a5349eec6 Merge pull request #19647 from owncloud/trashbin-removesidebar 
Remove sidebar for trashbin view
 2015-10-14 12:50:46 +02:00
Thomas Müller
156108dcdb Merge pull request #19714 from owncloud/trash-deletesectionposition-2 
Revert "Revert "Move trashbin specific CSS that modifies sidebar""
 2015-10-14 12:49:56 +02:00
Thomas Müller
bc6f76250a Merge pull request #19701 from owncloud/trash-restoreactioninline 
Make trashbin's "Restore" an inline action
 2015-10-14 12:38:49 +02:00
Jenkins for ownCloud
f9dd750ed7 [tx-robot] updated from transifex 2015-10-14 01:55:36 -04:00
Thomas Müller
3444d62063 Revert "Revert "Move trashbin specific CSS that modifies sidebar"" 
This reverts commit 0738ddfb76.
 2015-10-12 16:21:27 +02:00
Thomas Müller
0738ddfb76 Revert "Move trashbin specific CSS that modifies sidebar" 2015-10-12 13:59:29 +02:00
Vincent Petry
783971422c Move trashbin specific CSS that modifies sidebar 
Only when trashbin is enabled, its sidebar nav element must be fixed at
the bottom.
 2015-10-12 11:39:04 +02:00
Vincent Petry
6b71efb2b1 Make trashbin's "Restore" an inline action 2015-10-12 11:27:23 +02:00
Vincent Petry
8e84ab8613 Remove sidebar for trashbin view 2015-10-08 12:59:13 +02:00
Jenkins for ownCloud
cd818e7419 [tx-robot] updated from transifex 2015-10-07 01:55:56 -04:00
Morris Jobke
b945d71384 update licence headers via script 2015-10-05 21:15:52 +02:00
Jenkins for ownCloud
e0084059b9 [tx-robot] updated from transifex 2015-10-03 01:56:20 -04:00
Thomas Müller
f9093688cc Merge pull request #19500 from owncloud/fix_trash_with_encryption2 
[trashbin] fix broken versions on restore
 2015-10-02 12:15:58 +02:00
Hendrik Leppelsack
d4ce713749 display checkboxes properly after file restore 2015-10-01 22:54:36 +02:00
Bjoern Schiessle
b940287ffa first copy to owner and then move to current user because the encryption 
wrapper always expect to work on the owner storage
 2015-10-01 17:09:17 +02:00
Morris Jobke
1051a3c6f5 Change small thumbnails to 32 px 
* fixes #16913
* fixes issues in IE8 where the thumbnail is too big
 2015-09-30 10:49:48 +02:00
Hendrik Leppelsack
24ee83db30 fix checkbox in trashbin 2015-09-28 13:45:24 +02:00
Jenkins for ownCloud
60f123193b [tx-robot] updated from transifex 2015-09-28 05:07:18 -04:00
Joas Schilling
1694f21387 Add the method to the mock 2015-09-25 11:16:26 +02:00
Martin
491250320a Replaces if ($file === '.' || $file === '..') by if(\OC\Files\Filesystem::isIgnoredDir($file)). Eases to find where this operation is used. 2015-09-22 17:53:15 +02:00
Vincent Petry
a35144e961 Properly translate file actions 2015-09-22 14:52:52 +02:00
Bjoern Schiessle
a174ba5a36 make sure to add the correct file size to the file info, otherwise we will not show the preview for every filetype 2015-09-21 12:41:19 +02:00
Victor Dubiniuk
b75a1b40a2 Log deleted files 2015-09-16 22:29:54 +03:00
Lukas Reschke
47caac10f5 Add PHPDoc 2015-09-16 17:37:21 +03:00
Victor Dubiniuk
764726ce01 Updates according to review 2015-09-16 17:37:21 +03:00
Victor Dubiniuk
867ed67aa5 Fix tests 2015-09-16 17:37:21 +03:00
Victor Dubiniuk
8ac3d5e36c Add expiration cronjob 2015-09-16 17:37:21 +03:00
Thomas Müller
40203d7d1e Remove languages which are no longer maintained on transifex 2015-08-26 12:19:24 +02:00
Jenkins for ownCloud
90e11ee005 [tx-robot] updated from transifex 2015-08-26 04:10:42 -04:00
Jenkins for ownCloud
2171cc02c3 [tx-robot] updated from transifex 2015-08-25 12:39:10 -04:00
Vincent Petry
5e6fa3c938 Fix trashbin sidebar 
Do not display size as it is not available.
Use display name instead of name to remove the ".d123456" suffix.
 2015-08-25 11:29:35 +02:00
Thomas Müller
326de6f9b4 Merge pull request #18065 from owncloud/new-trashbin-retention 
New trashbin retention
 2015-08-12 13:13:45 +02:00
Jan-Christoph Borchardt
d04a6bce6f Merge pull request #17709 from owncloud/fileactions-dropdown 
Move file actions to dropdown
 2015-08-11 15:13:59 +02:00
Victor Dubiniuk
b9f655d8ad Fix tests 2015-08-10 23:55:10 +03:00
Victor Dubiniuk
33c29d3da7 Migrate settings 2015-08-10 23:54:44 +03:00
Thomas Müller
bfb9a8e58e Merge pull request #18175 from owncloud/automatic-db-prefix-query-builder 
Automatic db prefix query builder
 2015-08-10 21:41:32 +02:00
Victor Dubiniuk
4ef2615788 Enhance trashbin expiration settings 2015-08-10 20:40:43 +02:00
Joas Schilling
e6eb74958f Remove unnecessary DB prefixes from existing query builder usages 2015-08-10 16:21:41 +02:00
Vincent Petry
ca34921cdf Implement file actions dropdown 
File actions now have two types "inline" and "dropdown". The default is
"dropdown".
The file actions will now be shown in a dropdown menu.
 2015-08-10 14:12:34 +02:00
Roeland Jago Douma
f0b617b508 Use DI 
* Register OCP\Capability\IManager at DIContainer
* Add register capabilities to appframework
* Register capabilities in DI way
* Make unit test pass again
* Remove CapabiltiesManager from OCP
 2015-08-10 10:45:16 +02:00
Roeland Jago Douma
e84cffc063 Moved core apps to the capabilities manager 
* Files
* Files_Sharing
* Files_Trashbin
* Files_Versions
 2015-08-10 10:45:16 +02:00
Roeland Jago Douma
bc91c5c2de Set proper mimetype for directories 2015-08-05 13:54:09 +02:00
Jenkins for ownCloud
a07254856c [tx-robot] updated from transifex 2015-07-30 01:55:20 -04:00
Jenkins for ownCloud
c683b1d3c9 [tx-robot] updated from transifex 2015-07-28 01:55:00 -04:00
Joas Schilling
f77e5f411d Fix existing usages by removing the quotes 2015-07-21 15:25:47 +02:00
Joas Schilling
de348180ae Use the public interface and our method instead of the doctrine thing 2015-07-21 15:25:47 +02:00
Bjoern Schiessle
db65eeb580 only move real files to the trash bin 2015-07-08 11:32:06 +02:00
Thomas Müller
d3ac73c0c9 Remove OC_Log 2015-07-03 18:00:16 +02:00
Björn Schießle
525745caf5 Merge pull request #17140 from owncloud/trashbin_occ 
add occ command to remove deleted files
 2015-07-03 15:10:50 +02:00
Joas Schilling
c7968d202f Merge pull request #17316 from owncloud/master-delete-ocsid-from-db-if-none-specified 
[Master] Delete OCS ID from DB if none is specified
 2015-07-02 12:37:31 +02:00
Lukas Reschke
b100036457 Bump versions 2015-07-02 09:18:41 +02:00
Lukas Reschke
68f8717056 [master] Remove OCS IDs 
While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307

Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
 2015-07-02 08:45:16 +02:00
Jenkins for ownCloud
d2e1cae331 [tx-robot] updated from transifex 2015-07-02 01:59:26 -04:00
Morris Jobke
044d2ece07 Merge pull request #15506 from rullzer/core_apps_oc_log2ocp_util 
Move core apps from OC_Log::write to OCP\Util
 2015-07-01 08:53:16 +02:00
Jenkins for ownCloud
733d59ed44 [tx-robot] updated from transifex 2015-06-29 01:54:44 -04:00
Morris Jobke
f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Bjoern Schiessle
407db913de add occ command to trashbin to remove deleted files 2015-06-24 19:09:20 +02:00
Robin Appelman
f02e110aea explain pre-hook scan 2015-06-15 15:43:19 +02:00
Robin Appelman
5efbab4ab8 ensure we dont have to scan a file in the trash wrapper 2015-06-15 14:32:29 +02:00
Jenkins for ownCloud
88d3c9ad40 [tx-robot] updated from transifex 2015-06-11 01:55:05 -04:00
Jenkins for ownCloud
3542148761 [tx-robot] updated from transifex 2015-06-07 01:55:03 -04:00
Thomas Müller
9899e10a04 Merge pull request #16753 from owncloud/issue-16752-check-for-existing-user-in-expire-tasks 
Check whether the user exists before trying to set up his file system
 2015-06-05 16:22:03 +02:00
Joas Schilling
bd0b9a0fe0 Add unit tests for non existing users 2015-06-05 13:23:50 +02:00
Joas Schilling
4e24486a89 Check whether the user exists before trying to set up his file system 2015-06-05 11:31:49 +02:00
Jenkins for ownCloud
66a24ff479 [tx-robot] updated from transifex 2015-06-04 01:56:24 -04:00
Vincent Petry
61356b5560 Keep versions when deleting as recipient 
The original owner could not be resolved because the original file was
already deleted, so no versions were retained.

This fix passes the owner and path to retainVersions() since it was
already resolved before the file deletion. This reactivates the versions
logic and creates a copy of the versions in each trashbin.
 2015-06-02 17:13:00 +02:00
Jenkins for ownCloud
baca5c60c0 [tx-robot] updated from transifex 2015-06-02 01:56:23 -04:00
Björn Schießle
9366dde875 Merge pull request #15985 from owncloud/hotfix/fix-encryption-references 
[enc2] fix references to legacy encryption app name
 2015-05-26 17:28:27 +02:00
Morris Jobke
39d1e99228 Merge pull request #16322 from owncloud/trash-view 
dont go trough the view when moving to trash
 2015-05-20 14:44:01 +02:00
Vincent Petry
7386257676 Merge pull request #16075 from owncloud/skeleton-copy-delay 
wait with copying the skeleton untill login and setupfs are done
 2015-05-20 13:52:08 +02:00
Robin Appelman
733784ae41 cleanup move/copy logic in trash 2015-05-19 14:22:09 +02:00
Scrutinizer Auto-Fixer
fdbc21fc6c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-05-19 11:23:06 +00:00
Robin Appelman
8f1a609512 adjust test 2015-05-18 17:16:13 +02:00
Robin Appelman
89959a856c fix target path for move 2015-05-18 17:16:13 +02:00
Robin Appelman
a0854b36f0 update cache after move to trash 2015-05-18 17:16:13 +02:00
Robin Appelman
b70e1ffc6d dont go trough the view when moving to trash 2015-05-18 17:16:12 +02:00
Clark Tomlinson
7d2666699b removing encryption preview check 2015-05-18 09:47:46 -04:00
Clark Tomlinson
d557519746 removing deletion of encryption keys 
this will be handled in the wrapper now
 2015-05-18 09:47:46 -04:00
Clark Tomlinson
a0c6c01137 fix references to legacy encryption app name 2015-05-18 09:45:41 -04:00
Robin Appelman
724f88d9ff fix tests 2015-05-18 12:11:32 +02:00
Roeland Jago Douma
7a8072e958 Move core apps from OC_Log::write to OCP\Util 2015-05-18 10:57:52 +02:00
Vincent Petry
f86699cd48 Fix restoring files from trash with unique name 
When restoring a file, a unique name needs to be generated if a file
with the same name already exists.

Also fixed the restore() method to return false if the file to restore
does not exist.

Added unit tests to cover restore cases.
 2015-05-15 12:42:27 +02:00
Vincent Petry
beb6a38d85 Added rmdir to trashbin storage wrapper 
This makes sure that folders are moved to trash when deleted with
rmdir() instead of unlink().

This happens for example when deleting a folder over WebDAV.
The web UI uses unlink() so it wasn't affected.
 2015-05-12 11:09:02 +02:00
Jenkins for ownCloud
3dee907b70 [tx-robot] updated from transifex 2015-05-07 01:56:44 -04:00
Jenkins for ownCloud
b60dcd91bb [tx-robot] updated from transifex 2015-05-05 01:55:36 -04:00
Robin Appelman
be55a90323 dont use our now non existing hook 2015-04-27 14:07:15 +02:00
Vincent Petry
18506387c0 Tear down FS after running trash expire 2015-04-24 12:09:09 +02:00
Vincent Petry
ffc796edcb Do not trash part files, delete directly 2015-04-21 18:28:15 +02:00
Morris Jobke
9cb260d310 Merge pull request #15717 from owncloud/issue/15716-fixing-ocp-api-namespace-usage 
Fixing OCS API namespace usage
 2015-04-20 09:43:19 +02:00
Jenkins for ownCloud
fd3c1484ad [tx-robot] updated from transifex 2015-04-19 01:54:41 -04:00
Joas Schilling
3f3f8c2f99 Fix usage of deprecated private constants 2015-04-18 10:30:02 +02:00
Jenkins for ownCloud
37a871127b [tx-robot] updated from transifex 2015-04-18 01:55:19 -04:00
Jenkins for ownCloud
7f3f191ee9 [tx-robot] updated from transifex 2015-04-14 18:19:31 -04:00
Robin Appelman
d26c6cab90 properly return false if we cant delete the source file 2015-04-13 15:13:03 +02:00
Vincent Petry
f8cfc03f36 Replace originalStorage in tests with a proper teardown 
The purpose of $originalStorage in unit tests was to remount the old
root.
However that storage itself is already wrapped by storage wrapper, so
remounting it would rewrap the storage several times.

This fix makes use of "loginAsUser()" and "logout()" from the TestCase
class to properly initialize and cleanup the FS as expected.
 2015-04-08 12:45:38 +02:00
Thomas Müller
54a3bdf1c5 fixing unit test execution related to trashbin 2015-04-07 13:30:31 +02:00