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

770 commits

Author SHA1 Message Date
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
Bjoern Schiessle
d3e887a7cf reset init status before login 2015-04-07 13:30:30 +02:00
Bjoern Schiessle
5ea94b7c45 add priority to trashbin storage wrapper so that he is always on top 2015-04-07 13:30:30 +02:00
Thomas Müller
3458b5ab4c Remove old encryption left overs from trashbin 2015-04-07 13:30:29 +02:00
Thomas Müller
1b42b492dc kill OC_FileProxy 💥 2015-04-07 13:30:28 +02:00
Thomas Müller
00338f9dca Removing files_encryption left overs 2015-04-07 13:30:28 +02:00
Robin Appelman
3cb53b7756 setup storage wrappers before setting up the filesystem 2015-04-01 17:12:06 +02:00
Roeland Jago Douma
2b81d0f237 Move core apps from private to public functions 
Apps still use OC_Helper and OC_Util functions even when public ones are
already available. Sometimes the public one is even used in the same
file.
 2015-04-01 12:06:04 +02:00
Morris Jobke
e8109f0bc3 Merge pull request #13802 from owncloud/share-partfilepermissions 
Fix share permission checks
 2015-03-26 22:01:05 +01:00
Jenkins for ownCloud
b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Vincent Petry
f8f543945f Recreate trashbin folder after full deletion 2015-03-24 23:02:14 +01:00
Vincent Petry
a9e6eba018 Reenable trashbin after failed rename 
After a failed rename, the post_rename hook is not called.
This quickfix makes sure the trashbin storage logic is reenabled
also after a failed rename.
 2015-03-18 19:56:31 +01:00
Jenkins for ownCloud
8a95bf18b7 [tx-robot] updated from transifex 2015-03-18 01:55:22 -04:00
Thomas Müller
bbaf97ca43 Merge pull request #14644 from owncloud/trash-expire-command 
Expire files from the trash in the background
 2015-03-16 10:04:05 +01:00
Jenkins for ownCloud
c1a3394f48 [tx-robot] updated from transifex 2015-03-16 01:55:15 -04:00
Thomas Müller
1757d01604 Merge pull request #14640 from owncloud/rescanversionsonlyonce 
Only rescan versions once in trashbin
 2015-03-11 00:54:20 +01:00
Thomas Müller
4ffca58bc4 don't rely on \OCP\User::getUser() - it is not set properly in case of async operations 2015-03-10 11:47:52 +01:00
Thomas Müller
7cb6811a7b tearDown the filesystem right before setting it up again 2015-03-10 11:47:06 +01:00
Jenkins for ownCloud
174f8cef64 [tx-robot] updated from transifex 2015-03-09 01:54:36 -04:00
Vincent Petry
3f6e7d6a43 Add unit test for selection overlay actions in trashbin 2015-03-04 13:49:19 +01:00
Robin Appelman
c80522ed63 Expire files from the trash in the background 2015-03-02 15:25:50 +01:00
Vincent Petry
7432c73f5c Only rescan versions once in trashbin 
Whenever versions need to be rescanned, only do it once per PHP request.
Happens whenever multiple files need to be expired.
 2015-03-02 12:59:38 +01:00
Jenkins for ownCloud
ff85d38c2a [tx-robot] updated from transifex 2015-03-01 01:54:38 -05:00
Morris Jobke
06aef4e8b1 Revert "Updating license headers" 
This reverts commit 6a1a4880f0.
 2015-02-26 11:37:37 +01:00
Jenkins for ownCloud
8a4fddeb4a [tx-robot] updated from transifex 2015-02-26 01:55:50 -05:00
Jenkins for ownCloud
6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Jenkins for ownCloud
ef09e5d395 [tx-robot] updated from transifex 2015-02-22 01:54:42 -05:00
Jenkins for ownCloud
79ef5eda96 [tx-robot] updated from transifex 2015-02-20 01:55:01 -05:00
Lukas Reschke
602e563d99 Merge pull request #14366 from owncloud/remove-old-l10n-files 
Remove some old l10n files they arent loaded anymore
 2015-02-19 23:31:21 +01:00
Joas Schilling
e52a63eccb Remove some old l10n files they arent loaded anymore 2015-02-19 11:58:40 +01:00
Lukas Reschke
a7df23ceba Manually type-case all AJAX files 
This enforces proper types on POST and GET arguments where I considered it sensible. I didn't update some as I don't know what kind of values they would support 🙈

Fixes https://github.com/owncloud/core/issues/14196 for core
 2015-02-13 13:33:20 +01:00
Jenkins for ownCloud
e2d4b3c123 [tx-robot] updated from transifex 2015-02-09 01:54:53 -05:00
Jenkins for ownCloud
4bf7b2c130 [tx-robot] updated from transifex 2015-02-07 01:54:35 -05:00
Jenkins for ownCloud
bd60abbefc [tx-robot] updated from transifex 2015-02-06 01:57:07 -05:00
Jenkins for ownCloud
77e9c212ed [tx-robot] updated from transifex 2015-02-04 01:55:49 -05:00
Jenkins for ownCloud
6aef13fb07 [tx-robot] updated from transifex 2015-02-03 01:54:50 -05:00
Lukas Reschke
012d06e8a2 Merge pull request #13797 from owncloud/fix_move_del_of_remote_shares 
make sure that we get the correct user from the path
 2015-01-31 08:52:07 +01:00
Jenkins for ownCloud
c877fbdac8 [tx-robot] updated from transifex 2015-01-31 01:54:39 -05:00
Bjoern Schiessle
9ef96e4dd5 no need to initialize the same view twice 2015-01-30 14:39:31 +01:00
Robin Appelman
a59612752e Fix trash error when deleting files with the same name at the same time (happens in unit tests) 2015-01-28 15:16:55 +01:00
Jenkins for ownCloud
55142186de [tx-robot] updated from transifex 2015-01-28 01:55:53 -05:00
Robin Appelman
ce0aa02aac Dont do a cache rename if we cant delete the source file 2015-01-29 15:52:40 +01:00
Robin Appelman
215388f4e0 Make sure we delete the file when doing a cross storage trashbin move 2015-01-29 15:40:01 +01:00
Robin Appelman
d4c4e2a322 Detect failed deletes in the trashbin 2015-01-29 15:39:58 +01:00
Vincent Petry
acec40fe5a Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix 
Call final unlink in trash wrapper's storage
 2015-01-27 17:05:38 +01:00
Vincent Petry
02b9bad81b Fix bogus deletion on copy + unlink through rename 
Cross-storage rename would cause copy + unlink. That unlink operation
must not trigger the trashbin.
 2015-01-26 12:22:22 +01:00
Jenkins for ownCloud
a698637e91 [tx-robot] updated from transifex 2015-01-25 01:54:38 -05:00
Vincent Petry
a1cc9eea56 Add trashbin storage wrapper unit test for versions 2015-01-23 18:39:21 +01:00
Vincent Petry
1f39a7aabe Simplify trash storage unit tests 
Needed to make it properly init the mount points
 2015-01-23 18:08:59 +01:00
Robin Appelman
87a1b2bdc4 Preserve mtime when doing cross storage move 2015-01-23 15:11:27 +01:00
Vincent Petry
2e8c70327a Remove storage wrapper for oc_trashbin in unit test 2015-01-23 14:55:38 +01:00
Robin Appelman
91f3952ac1 Only move files from the current user to the trashbin 2015-01-23 14:19:36 +01:00
Vincent Petry
67f1534e0f Call final unlink in trash wrapper's storage 
In the case of cross-storage delete, the files are copied to the trash,
then deleted. The final delete on the source storage would still reach
the trash wrapper.

This fix makes forwards that second call to the wrapped storage to make
the final delete work.

It fixes the issue with remote shares, local shares and external
storage.

Also, it uses a new function "renameRecursive" that renames the files
and preserves the mtimes (like "copy_recursive" did in the past))
 2015-01-23 12:20:54 +01:00
Jenkins for ownCloud
b8ab21d3ad [tx-robot] updated from transifex 2015-01-21 01:55:15 -05:00
Jenkins for ownCloud
2ac015256f [tx-robot] updated from transifex 2015-01-20 01:54:37 -05:00
Bjoern Schiessle
15ae6b47ed replace hook with storage wrapper 2015-01-19 09:16:15 +01:00
Jenkins for ownCloud
60c4cb1dd6 [tx-robot] updated from transifex 2015-01-17 01:54:40 -05:00
Vincent Petry
a76f0a0ba7 Fix preview route for trashbin 2015-01-15 18:45:24 +01:00
Jenkins for ownCloud
4c233fef2a [tx-robot] updated from transifex 2015-01-15 01:54:41 -05:00
Vincent Petry
87f81e5926 Remove unneeded addTranslations() calls 2015-01-14 14:36:23 +01:00
Jenkins for ownCloud
f367bbb49d [tx-robot] updated from transifex 2015-01-14 01:55:16 -05:00
Jenkins for ownCloud
3ece0a7767 [tx-robot] updated from transifex 2015-01-13 01:56:58 -05:00
Jenkins for ownCloud
9e550ab844 [tx-robot] updated from transifex 2015-01-12 01:55:52 -05:00
Volkan Gezer
d8adc76125 l10n: delete permanently fix 2015-01-11 17:15:58 +01:00
Jenkins for ownCloud
3425c73815 [tx-robot] updated from transifex 2015-01-11 01:54:32 -05:00
Jenkins for ownCloud
22e5220c1f [tx-robot] updated from transifex 2015-01-10 01:54:35 -05:00
Jenkins for ownCloud
d4fc2f555b [tx-robot] updated from transifex 2015-01-09 01:55:22 -05:00
Jenkins for ownCloud
6bda95037f [tx-robot] updated from transifex 2015-01-08 01:56:00 -05:00
Morris Jobke
fe4592937a Merge pull request #12653 from owncloud/full_content_search_results 
Full content width search results
 2015-01-06 16:44:58 +01:00
Jörn Friedrich Dreyer
357fbd88be use class for no results div instead of id. the elements are not unique. 2015-01-06 14:34:35 +01:00
Jörn Friedrich Dreyer
23900a5a39 filter trashbin and share views 2015-01-05 13:11:50 +01:00
Jenkins for ownCloud
8776271103 [tx-robot] updated from transifex 2015-01-05 01:54:36 -05:00
Jenkins for ownCloud
84ed1034b4 [tx-robot] updated from transifex 2015-01-04 01:54:53 -05:00
Jenkins for ownCloud
ec6e70889a [tx-robot] updated from transifex 2015-01-01 01:54:30 -05:00
Jenkins for ownCloud
573be9092d [tx-robot] updated from transifex 2014-12-31 01:54:33 -05:00
Jenkins for ownCloud
c8e946f633 [tx-robot] updated from transifex 2014-12-29 01:54:27 -05:00
Jenkins for ownCloud
d2e53d1022 [tx-robot] updated from transifex 2014-12-27 01:54:33 -05:00
Jenkins for ownCloud
e0fc26a5cb [tx-robot] updated from transifex 2014-12-25 01:54:29 -05:00
Morris Jobke
5352b4b2b8 Merge pull request #10292 from owncloud/external-share-delete 
Fix trashbin when deleting a file over an external share
 2014-12-23 11:21:06 +01:00
Jenkins for ownCloud
d8f04f5a97 [tx-robot] updated from transifex 2014-12-23 01:55:23 -05:00
Jenkins for ownCloud
92c8cd3933 [tx-robot] updated from transifex 2014-12-22 01:54:49 -05:00
Jenkins for ownCloud
312891c603 [tx-robot] updated from transifex 2014-12-21 01:54:36 -05:00
Jenkins for ownCloud
5a54ca380d [tx-robot] updated from transifex 2014-12-20 01:56:24 -05:00
Jenkins for ownCloud
028b0efd5c [tx-robot] updated from transifex 2014-12-19 01:56:51 -05:00
Morris Jobke
3036a8714d Merge pull request #12941 from owncloud/wave-accessibility-compliance 
Wave accessibility compliance
 2014-12-19 00:30:56 +01:00
Morris Jobke
75e8b39826 Merge pull request #12879 from owncloud/mountconfig 
Add mount specific options
 2014-12-18 23:38:14 +01:00
Jörn Friedrich Dreyer
49318b4d93 Merge pull request #12896 from owncloud/drop-deprecated 
first step to drop \OCP\Config:: in favour of IConfig
 2014-12-18 23:01:49 +01:00
Jan-Christoph Borchardt
7faf3d17e5 fix accessibility for deleted files 2014-12-18 16:54:39 +01:00
Jenkins for ownCloud
5c6e08213e [tx-robot] updated from transifex 2014-12-18 01:56:40 -05:00
Jan-Christoph Borchardt
38931176df apply empty state for 'Deleted files' 2014-12-17 21:45:34 +01:00
Robin Appelman
fd85424742 Add getMountPoint to FileInfo 2014-12-17 14:03:50 +01:00
Morris Jobke
d41082f4d6 first step to drop \OCP\Config:: in favour of IConfig 2014-12-17 11:12:37 +01:00
Jenkins for ownCloud
6d80524e67 [tx-robot] updated from transifex 2014-12-17 01:56:41 -05:00
Robin Appelman
3bf0922b13 Merge pull request #12527 from owncloud/js-pluginsystem 
Simple Plugin system for Javascript
 2014-12-12 11:43:31 +01:00
Jenkins for ownCloud
ea95bb0189 [tx-robot] updated from transifex 2014-12-10 01:55:34 -05:00
Joas Schilling
78a307995c Fix namespace of Files_Encryption outside of the app 2014-12-09 09:47:26 +01:00
Morris Jobke
0d4f0ab871 reduce OC_Preferences, OC_Config and \OCP\Config usage 
* files_encryption
* files_versions
* files_trashbin
* tests
* status.php
* core
* server container
 2014-12-08 22:42:37 +01:00
Robin Appelman
baf5c44bec Merge pull request #12696 from owncloud/trashbin-selected-delete 
Fix deleting selected files in the trashbin
 2014-12-08 16:30:53 +01:00
Robin Appelman
b2d4e53f66 Fix deleting selected files in the trashbin 2014-12-08 15:16:15 +01:00
Lukas Reschke
d3188159d2 Merge pull request #12394 from owncloud/files-fileactionsimprovements 
Improve FileActions JS to allow for custom rendering
 2014-12-08 11:30:21 +01:00
Morris Jobke
3fdb1937a3 Merge pull request #12382 from owncloud/enc_reorganize_folders2 
[encryption] reorganize folder structure (second try to make Jenkins happy)
 2014-12-03 16:08:40 +01:00
Joas Schilling
1bd018a70c Autoload exception from files_trashbin 2014-12-02 17:26:42 +01:00
Vincent Petry
c02ef69521 Simple Plugin system for Javascript 2014-12-01 16:20:44 +01:00
Jenkins for ownCloud
96b0328d39 [tx-robot] updated from transifex 2014-11-28 01:55:29 -05:00
Bjoern Schiessle
fd86d76f98 new folder structure for keys 
all keys are now in files_encryption/key/path_to_file/filename/
share keys are named: user.shareKey
file key is named: fileKey
 2014-11-26 10:57:47 +01:00
Joas Schilling
2c39aec8cb Replace deprecated constant with new class constant 2014-11-25 16:30:21 +01:00
Vincent Petry
e689bc745f Improve FileActions JS to allow for custom rendering 
This improves the OCA.Files.FileActions class to support passing a
"render" function in the action object.

The default function "_defaultRenderFunction" is used by default and
renders actions in the usual actions container.

Moved "Rename" and "Delete" to custom render functions.
 2014-11-24 16:26:50 +01:00
Jenkins for ownCloud
f8421958b3 [tx-robot] updated from transifex 2014-11-21 02:54:26 -05:00
Lukas Reschke
713c8e0dac Merge pull request #12325 from owncloud/removeunneccessarylang 
cleanup languages. closes #11274
 2014-11-20 16:12:49 +01:00
Volkan Gezer
995fe4a176 cleanup languages. closes #11274 2014-11-20 14:46:17 +01:00
Joas Schilling
76ebd3a050 Make apps/ extend the \Test\TestCase and fix overwritten methods 2014-11-19 14:52:09 +01:00
Morris Jobke
dc9eaf59dc Merge pull request #12276 from owncloud/undelete-only-if-files-trashin-is-enabled 
Only show undelete capability if files_trashbin is enabled
 2014-11-19 11:42:19 +01:00
Jenkins for ownCloud
705976ba0a [tx-robot] updated from transifex 2014-11-19 01:54:59 -05:00
Lukas Reschke
61641293f4 Only show undelete capability if files_trashbin is enabled 
Fixes the OCS capability API at /ocs/v1.php/cloud/capabilities
 2014-11-18 23:06:39 +01:00
Vincent Petry
5ca869c324 Merge pull request #9177 from owncloud/jsdocexperiment 
Improved JS Docs + added build script for JS Docs
 2014-11-13 11:16:08 +01:00
Vincent Petry
97cbec8b8d Merge pull request #11853 from owncloud/close-session-for-trashbin 
Close session for files_trashbin
 2014-11-05 12:44:10 +01:00
Vincent Petry
97a51c46ed Only rescan trash folder when checking deleted versions 
This fix prevents the file scanner to rescan the WHOLE storage and reset
the etags by mistake.
 2014-11-04 12:29:42 +01:00
Vincent Petry
0f3e6cb50a Improved Javascript docs for JSDoc 
Added namespaces so that JSDoc can find them.
Fixed a few warnings.
Improved some comments.
 2014-10-31 13:43:30 +01:00
Thomas Müller
f776bcd4a0 remove unnecessary require calls - the ownCloud class loader is supposed to take care of this 2014-10-30 17:20:40 +01:00
Jenkins for ownCloud
ea55848fa1 [tx-robot] updated from transifex 2014-10-30 01:55:14 -04:00
Lukas Reschke
2cd35e94b4 Close session for files_trashbin 
When restoring huge folders the interface will be unresponsive otherwise
 2014-10-29 22:53:59 +01:00
Thomas Müller
9f7c571e40 update all translation files to js and json 2014-10-29 10:13:50 +01:00
Vincent Petry
ec1a73fab9 Added OC.L10N namespace with translation functions 
Added addTranslations and fixed de.js file

Fixed de.js to use OC.L10N.register() and use to correct expected
format.

Added JS unit tests for OC.L10N class

Include translations JS script for all apps
 2014-10-29 10:09:12 +01:00
Lukas Reschke
b3a04840b5 Add type hinting to functions 
It's only reasonable to have proper type hinting here which might even help us to catch bugs.
 2014-10-24 14:13:40 +02:00
Jenkins for ownCloud
e75c2edba6 [tx-robot] updated from transifex 2014-10-23 01:55:51 -04:00
Robin Appelman
c71deea0d5 Fix SPACE_UNKNOWN constant 2014-10-16 12:26:26 +02:00
Jörn Friedrich Dreyer
0254a3c406 make trashbin compatible with objectstore, replace glob with search in cache, make unknown free space work like unlimited free space 2014-10-16 10:15:43 +02:00
Thomas Müller
b091394a90 introduce new app page layout 
filter installed and not-installed apps properly

kill unneeded file

load category 'Installed' on page load

adding documentation links

new apps mgmt: first style adjustment

apps mgmt: only show license and preview if they exist

adding buttons

new apps mgmt: fix for mobile

use app icon if available

new apps mgmt: position enable/disable toggle to the right

new apps mgmt: proper display of icons or previews

new apps mgmt: fix loading spinner

reenable group selection for apps

new apps mgmt: position enable button normally again

new apps mgmt: clarify wording from 'Installed' to 'Enabled'

reintroduce enable/disable

Move rating image path generation to client-side

Move expression outside of l10n

fix group handling

add buttons for 'More apps' and 'Add your app' again

disable changed date of app for now

adding recommended label

style 'Recommended' app tag

fixing php warning

sort by rating

adding meta-category 'Recommended'

 Only show existing documentation links

lacy loading of screenshots

making group based app activation work again

adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg'

adding app.svg for all core apps

query string '?installed' is not longer needed

update and uninstall is back + error feedback

remove unneeded parameter

fix alignment of 'recommended' label
 2014-10-15 15:21:40 +02:00
Lukas Reschke
16cd749065 Add support for keys in the info.xml 
This allows to have links to different doc base URLs

a.
 2014-10-09 15:48:30 +02:00
Morris Jobke
b11cf6f838 Merge pull request #11474 from owncloud/fix_trash_permission_check 
check if I can create a file at the location
 2014-10-09 08:59:48 +02:00
MTRichards
511ad6e106 Forgot a '.' 2014-10-08 21:08:20 -04:00
MTRichards
3a2d50b76f Updated info.xml app description 
Made app description paralell in structure to other app descriptions
 2014-10-08 21:07:12 -04:00