Arthur Schiwon
2bcb786214
no fruitless count attempts, and notification should disappear
2015-02-05 16:25:22 +01:00
Jenkins for ownCloud
9adff77040
[tx-robot] updated from transifex
2015-02-05 01:54:49 -05:00
Lukas Reschke
cc80ce70b4
Catch exception properly
...
`\OCA\Files\Helper::buildFileStorageStatistics` might throw an exception from `OC_Helper::getStorageInfo`, previously this lead to a uncatched exception being thrown when invoking this methods.
This was user triggable by for example calling `/index.php/apps/files/ajax/delete.php` with a not existing dir (for example `dir=asdf/../&allfiles=true`)
2015-02-04 15:58:16 +01:00
Roeland Jago Douma
bcae79a85a
Split up unit tests
2015-02-04 15:49:20 +01:00
Roeland Jago Douma
083ebca812
Added unit test to test getCapabilities for files_sharing
2015-02-04 14:56:31 +01:00
Roeland Jago Douma
0452fde212
Converted getCapabilities to non static function
2015-02-04 14:56:31 +01:00
Roeland Jago Douma
4801d9c02a
Use single quotes
2015-02-04 14:56:31 +01:00
Roeland Jago Douma
ea1f726b7d
Only return capabilities if they are set
2015-02-04 14:56:31 +01:00
Roeland Jago Douma
b3ea849a87
Added capabilities whether a server allows public links
...
This fixes #13673 .
It now lists link sharing, passwords enforced, and if public uploads are
allowed.
2015-02-04 14:56:31 +01:00
blizzz
09216ef49b
Merge pull request #13849 from owncloud/ldap-oc8-update
...
no update routine needed from OC 7 to 8
2015-02-04 14:19:58 +01:00
Jenkins for ownCloud
77e9c212ed
[tx-robot] updated from transifex
2015-02-04 01:55:49 -05:00
Morris Jobke
166c4e266f
Reduce log level of bind failed to WARN - fixes #11624
2015-02-03 11:44:28 +01:00
Arthur Schiwon
02a1cc01b6
no update routine needed from OC 7 to 8
2015-02-03 11:43:47 +01:00
Thomas Müller
a24d73aa0c
Merge pull request #13837 from owncloud/endless-redirect
...
Add callCheck to testremote.php
2015-02-03 11:28:15 +01:00
Jenkins for ownCloud
6aef13fb07
[tx-robot] updated from transifex
2015-02-03 01:54:50 -05:00
Lukas Reschke
4270188252
Add callCheck to testremote.php
...
Without CSRF check this file might be tricked into requesting itself which would result in an endless loop and thus potentially ending in a Denial of Service.
2015-02-02 19:39:41 +01:00
Morris Jobke
1bb8d5978c
Merge pull request #13817 from owncloud/core-apps-dependencies
...
encryption requires openssl and user_ldap requires ldap 🙊
2015-02-02 12:49:45 +01:00
Joas Schilling
12f835b198
toggle back when the action was not performed
2015-02-02 11:17:55 +01:00
Morris Jobke
8e2b99c3a9
fix response for tags and show error message
2015-02-02 11:17:54 +01:00
Joas Schilling
df75a6e5f3
Only update favorite icon if the operation was successful
...
Also shows a notification in case an error occured on updating the tags
2015-02-02 11:17:54 +01:00
Thomas Müller
c9543c9e8e
encryption requires openssl and user_ldap requires ldap 🙊
2015-02-02 09:20:05 +01:00
Jenkins for ownCloud
800829d93d
[tx-robot] updated from transifex
2015-02-02 01:54:32 -05:00
Jenkins for ownCloud
a3067b3b9f
[tx-robot] updated from transifex
2015-02-01 01:54:33 -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
Bjoern Schiessle
ed29c6ce86
get correct user for paths to the trash bin, needed for remote shares if the size of of trash gets calculated
2015-01-30 14:39:09 +01:00
Morris Jobke
e7900ba255
Merge pull request #13508 from owncloud/failed-delete-cache
...
Dont remove a file from cache if the delete operation failed
2015-01-30 14:08:44 +01:00
Jenkins for ownCloud
f4d20dc1f3
[tx-robot] updated from transifex
2015-01-30 01:55:06 -05:00
Morris Jobke
b1d8d88df8
Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares
...
make sure that we always create a public share key for remote shares
2015-01-29 17:54:04 +01:00
Joas Schilling
333f4e7913
Fix intendation
2015-01-29 16:57:46 +01:00
Joas Schilling
4a5f626979
Fix more assertions
2015-01-29 16:54:27 +01:00
Joas Schilling
9a7dd57bc8
Fix 2 assertions
2015-01-29 16:09:35 +01:00
Thomas Müller
5c8e5e223d
Merge pull request #13728 from owncloud/federated_cloud
...
rename 'server-to-server sharing' to 'federated cloud'
2015-01-29 15:54:19 +01: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
Bjoern Schiessle
8a091629dc
rename 'server-to-server sharing' to 'federated cloud'
2015-01-29 15:05:39 +01:00
Bjoern Schiessle
c78e3c4a7f
make sure that we always create a public share key for remote shares
2015-01-29 14:23:14 +01:00
Thomas Müller
a25063a8ed
Merge pull request #13746 from owncloud/no-groups-provisioning-api
...
disallow provisioning api to be enabled for groups only
2015-01-29 12:47:54 +01:00
Thomas Müller
099d43b1f9
Merge pull request #13604 from owncloud/encryption-key-migration-as-repair-step
...
adding console command to migrate encryption keys - refs #13450
2015-01-29 10:30:12 +01:00
Thomas Müller
f60406102f
disallow provisioning api to be enabled for groups only
2015-01-29 10:00:54 +01:00
Jenkins for ownCloud
65871ffea3
[tx-robot] updated from transifex
2015-01-29 01:54:35 -05:00
Sugaroverdose
e57e273a40
Prevent 1px padding between button and dropdown in ie11 when zooming
2015-01-28 22:44:12 +03:00
Thomas Müller
659f958d01
Merge pull request #13401 from is-apps/amazon_s3_checkboxes
...
Tidy formatting of Amazon S3 checkboxes
2015-01-28 18:50:14 +01:00
Sugaroverdose
0418c9da3d
Play with z-index to make proper dropdown overlap
2015-01-28 20:24:12 +03: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
Morris Jobke
87b39e8f03
Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorage
...
Catch storage exception in scanner for remote shares
2015-01-28 00:31:37 +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
3764515365
Allow saving incomplete external storage config
...
This is needed for Dropbox and others that need a token.
2015-01-27 13:44:05 +01:00
Vincent Petry
c4b02176dc
Fix mount config unit test failures
...
Because setStorageId now instantiates storages, they might throw
exceptions if arguments are missing.
This fixes the unit test to not throw exceptions and have their default
config arguments set.
2015-01-27 13:44:05 +01:00
Thomas Müller
1add2f3f58
Merge pull request #13679 from owncloud/public-disablesharejsplugin
...
Disable JS plugin for sharing in public mode
2015-01-27 09:33:38 +01:00
Thomas Müller
29f49ddc3d
Merge pull request #13691 from owncloud/s2s-acceptsinglefile
...
Only reload file list after remote share accept request returns
2015-01-27 09:32:33 +01:00
Jenkins for ownCloud
c8f58054b0
[tx-robot] updated from transifex
2015-01-27 01:54:34 -05:00
Vincent Petry
182b1937bb
Only reload file list after remote share accept request returns
...
When accepting a remote share, an ajax request is sent to the server.
Only once this request returns should the file list be reloaded.
2015-01-26 21:22:22 +01:00
Vincent Petry
efcd89cb18
Do not disclose share owner in public file list
2015-01-26 19:55:48 +01:00
Vincent Petry
86689ef400
Disable JS plugin for sharing in public mode
...
This removes the logic that registers the share action and modifies the
rows. Share actions aren't needed in the public file list.
2015-01-26 19:55:48 +01:00
Vincent Petry
bd888748bd
Merge pull request #13490 from owncloud/fix_reshare_s2s_share
...
use uid provided by setupfs hook to mount server2server shares
2015-01-26 19:54:14 +01:00
Bjoern Schiessle
5ba19ba7fc
certificate manager should always use a \OC\Files\View otherwise we will get problems for different primary storages
2015-01-26 16:58:52 +01:00
Bjoern Schiessle
67da1f7e5a
certificate manager only needs the user-id, no need to pass on the complete user object
2015-01-26 16:58:52 +01:00
Bjoern Schiessle
66f0db30b2
use uid provided by setupfs hook to mount server2server shares, otherwise mount will fail for public link shares
2015-01-26 16:54:50 +01:00
Vincent Petry
d5b61f9afe
Prevent double slash in shareinfo request URL
2015-01-26 16:19:38 +01:00
Vincent Petry
5376b0b123
Add back exit()
2015-01-26 16:07:28 +01:00
Vincent Petry
f6e644b43f
Catch storage exception in scanner for remote shares
...
Whenever an exception occurs during scan of a remote share, the share is
checked for availability. If the storage is gone, it will be removed
automatically.
Also, getDirectoryContent() will now skip unavailable storages.
2015-01-26 13:59:49 +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
Joas Schilling
d6939d67da
Remove duplicated definition of APIController
2015-01-26 10:20:01 +01:00
Sugaroverdose
8605e84547
Fix #13632 and make new file menu more consistent with button
2015-01-25 20:15:08 +03:00
Jenkins for ownCloud
a698637e91
[tx-robot] updated from transifex
2015-01-25 01:54:38 -05:00
Jenkins for ownCloud
b8e1dd9c87
[tx-robot] updated from transifex
2015-01-24 01:54:51 -05:00
Bjoern Schiessle
73a058e301
by default send mail for new server-to-server share
2015-01-23 21:59:07 +01: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
Vincent Petry
1a06edd712
Unregister trashbin storage wrapper at the end of tests
...
Some more tests that uses the storage wrapper now remove it afterwards
2015-01-23 15:36:09 +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
Joas Schilling
7e6d2c73d2
Ignore favorites that are not available when creating the favorites list
...
Also correctly return the exception for all cases when adding/removing favos
2015-01-23 10:11:14 +01:00
Jenkins for ownCloud
bc93a8f140
[tx-robot] updated from transifex
2015-01-23 01:55:06 -05:00
Arthur Schiwon
9c7cd702c3
user fs must be setup up, so that the real user folder is mounted on the username based path
2015-01-22 19:16:28 +01:00
Thomas Müller
fc1865449d
adding console command to migrate encryption keys - refs #13450
2015-01-22 16:10:45 +01:00
Jenkins for ownCloud
5f3c6a97b2
[tx-robot] updated from transifex
2015-01-22 01:55:09 -05:00
Morris Jobke
c931eafc1f
Merge pull request #13517 from owncloud/keymanager-storage
...
Bypass the view when storing encryption keys
2015-01-22 00:41:48 +01:00
Morris Jobke
4dac664002
Merge pull request #13568 from owncloud/s2s_delete_shares_jenkins
...
[ignore] delete all server-to-server shares if a user gets deleted
2015-01-22 00:37:39 +01:00
Lukas Reschke
762949afd9
Make naming of encryption app consistent
...
Fixes https://github.com/owncloud/core/issues/13580
2015-01-21 23:29:09 +01:00
Bjoern Schiessle
7216983a08
delete all server-to-server shares if a user gets deleted
2015-01-21 17:11:34 +01:00
Thomas Müller
8ba42abbe4
Merge pull request #13432 from owncloud/animate_gifs_public_sharing
...
show animated gifs on public sharing page
2015-01-21 17:09:46 +01:00
Thomas Müller
9921308c62
Merge pull request #13540 from owncloud/s2s-fixpasswordfromdialog
...
External share dialog must properly read entered password
2015-01-21 16:51:56 +01:00
Vincent Petry
c48307027c
Fixed external cache test namespace
2015-01-21 15:52:56 +01:00
Vincent Petry
9fbdd1072e
Fix webdav mkdir for remote shares
2015-01-21 15:14:57 +01:00
Vincent Petry
f3d696599a
Add unit test for external share JS dialog
...
Moved external share JS code into a small plugin to make it testable.
Added unit test for the external share dialog logic + ajax calls.
2015-01-21 11:26:54 +01:00
Vincent Petry
23ea45760f
External share dialog must properly read entered password
2015-01-21 11:26:36 +01:00
Jenkins for ownCloud
b8ab21d3ad
[tx-robot] updated from transifex
2015-01-21 01:55:15 -05:00
Lukas Reschke
2ed2a7c7a8
Merge pull request #13520 from owncloud/fix-comparison-op
...
this must be larger then (>), since buggy behaviour occurs when the para...
2015-01-20 20:15:04 +01:00
Arthur Schiwon
9cb1ef5675
this must be larger then (>), since buggy behaviour occurs when the parameter is a small number
2015-01-20 17:50:53 +01:00
Robin Appelman
750cff0e3e
Bypass the view when storing encryption keys
2015-01-20 16:20:49 +01:00
Thomas Müller
87a754c72e
avoid $this->cache being null - fixes #13491
2015-01-20 12:38:54 +01:00
Lukas Reschke
e25a0303f4
Streamline CSRF and login check
...
Let's make this consistent with other pieces of the code to make it easier to auditable.
2015-01-20 12:24:13 +01:00
Jenkins for ownCloud
2ac015256f
[tx-robot] updated from transifex
2015-01-20 01:54:37 -05:00
