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

1865 commits

Author SHA1 Message Date
Lukas Reschke
a67627140c Revert "Add OCS sharing info to capabilities" 2015-02-07 00:12:26 +01:00
Frank Karlitschek
0b421e821b Merge pull request #13692 from rullzer/capabilities 
Add OCS sharing info to capabilities
 2015-02-06 16:46:47 -05:00
Jenkins for ownCloud
988027fdca [tx-robot] updated from transifex 2015-02-06 15:26:04 -05:00
Roeland Jago Douma
fe2aca5aa8 Updated unit tests 2015-02-06 12:13:53 +01:00
Roeland Jago Douma
3be3e20c0f Bit better formatting when using json output 2015-02-06 10:55:33 +01:00
Roeland Jago Douma
d4e361db44 Updated sharing capabilities 
Moved to files_sharing
Added more capabilities.
Tried to order to capabilities more OO style
 2015-02-06 10:33:08 +01:00
Jenkins for ownCloud
bd60abbefc [tx-robot] updated from transifex 2015-02-06 01:57:07 -05:00
Jenkins for ownCloud
9adff77040 [tx-robot] updated from transifex 2015-02-05 01:54:49 -05: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
Jenkins for ownCloud
77e9c212ed [tx-robot] updated from transifex 2015-02-04 01:55:49 -05: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
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
Jenkins for ownCloud
c877fbdac8 [tx-robot] updated from transifex 2015-01-31 01:54:39 -05:00
Jenkins for ownCloud
f4d20dc1f3 [tx-robot] updated from transifex 2015-01-30 01:55:06 -05: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
Bjoern Schiessle
8a091629dc rename 'server-to-server sharing' to 'federated cloud' 2015-01-29 15:05:39 +01:00
Jenkins for ownCloud
65871ffea3 [tx-robot] updated from transifex 2015-01-29 01:54:35 -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
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
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
Jenkins for ownCloud
a698637e91 [tx-robot] updated from transifex 2015-01-25 01:54:38 -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
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
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
Thomas Müller
87a754c72e avoid $this->cache being null - fixes #13491 2015-01-20 12:38:54 +01:00
Jenkins for ownCloud
2ac015256f [tx-robot] updated from transifex 2015-01-20 01:54:37 -05:00
Georg Ehrke
374ddbff55 show animated gifs on public sharing page 2015-01-19 16:20:06 +01:00
Bjoern Schiessle
15ae6b47ed replace hook with storage wrapper 2015-01-19 09:16:15 +01:00
Jenkins for ownCloud
3404bd8cdd [tx-robot] updated from transifex 2015-01-19 01:54:31 -05:00
Jenkins for ownCloud
60c4cb1dd6 [tx-robot] updated from transifex 2015-01-17 01:54:40 -05:00
Robin McCorkell
2b99fc76ec Cleanup of PHPDoc return types 2015-01-16 20:30:43 +00:00
Jenkins for ownCloud
a65f666834 [tx-robot] updated from transifex 2015-01-16 01:55:51 -05:00
Morris Jobke
9b7c1a0093 Merge pull request #13347 from owncloud/share-scanpermissionsfromsource 
Use source storage permissions when scanning shared storage
 2015-01-15 11:15:15 +01:00
Jenkins for ownCloud
4c233fef2a [tx-robot] updated from transifex 2015-01-15 01:54:41 -05:00
Robin McCorkell
9d0915013b Merge pull request #13352 from owncloud/hhvm-array-key 
HHVM: Do not use key() on array as the result depends on the internal array pointer.
 2015-01-15 01:06:45 +00:00
Andreas Fischer
b4a52e889a Do not use key() on array as the result depends on the internal array pointer. 2015-01-15 00:48:10 +01:00
Morris Jobke
455ad005a0 Merge pull request #13350 from owncloud/autoload-translations 
Autoload app's js translations
 2015-01-14 18:12:05 +01:00
Vincent Petry
a9f0582e3e Use source storage permissions when scanning shared storage 2015-01-14 18:11:23 +01:00
Vincent Petry
87f81e5926 Remove unneeded addTranslations() calls 2015-01-14 14:36:23 +01:00
Thomas Müller
25806346c2 remove deprecated code - fixes #13119 2015-01-14 13:56:49 +01:00
Thomas Müller
9b7421972b Merge pull request #13332 from oparoz/fix-download-button 
Download the current public folder only
 2015-01-14 12:24:06 +01:00
Björn Schießle
9a487f0445 Merge pull request #13286 from owncloud/sharing_upgrade 
update script for new server-to-server sharing
 2015-01-14 11:57:30 +01:00
Olivier Paroz
356bfb36dc Download the current public folder only 
From within a shared/public directory, when drilling down folders, some
users want to be able to download what they're currently looking at, not
the whole shared folder. The whole archive is always a click away anyway
since a user can click on the home button.
 2015-01-14 11:28:36 +01:00
Jenkins for ownCloud
f367bbb49d [tx-robot] updated from transifex 2015-01-14 01:55:16 -05:00
Bjoern Schiessle
d50e70ba3a set accept to 1 (=true) for all server-to-server shares on update, at this point in time all shares are created by the first version of server-to-server sharing and are accepted if they were added to the table 2015-01-13 17:24:00 +01:00
Jenkins for ownCloud
3ece0a7767 [tx-robot] updated from transifex 2015-01-13 01:56:58 -05:00
Thomas Müller
ddf81c2ed9 Merge pull request #13254 from owncloud/fixsharel10n 
make Share/Download buttons localized again
 2015-01-12 09:31:35 +01:00
Jenkins for ownCloud
9e550ab844 [tx-robot] updated from transifex 2015-01-12 01:55:52 -05:00
Volkan Gezer
691fab8be3 make Share button localized again 
it seems we have forgotten to use named FileAction
 2015-01-11 15:57:45 +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
Thomas Müller
6b0ae34de6 Merge pull request #13170 from owncloud/extstorage-fixsharedmountpointrootleadingslash 
Fix source path when share is a mount point
 2015-01-08 15:02:16 +01:00
Vincent Petry
01c83158bb Fix source path when share is a mount point 
Whenever an external storage mount point is shared directly, its path is
empty which causes a leading slash to appear in the source path.

This fix removes the bogus leading slash in such situation.
 2015-01-08 11:46:11 +01:00
Jenkins for ownCloud
6bda95037f [tx-robot] updated from transifex 2015-01-08 01:56:00 -05:00
Morris Jobke
bfb6e350d5 Merge pull request #13016 from owncloud/sharing_fixes 
don't delete share table entries for the unique name if re-share permission was removed
 2015-01-07 18:14:53 +01:00
Bjoern Schiessle
b6f63e9b3d don't delete share table entries for the unique name if re-share permission was removed 2015-01-07 16:36:13 +01:00
Joas Schilling
70dcebbf92 Correctly return false when translating a foreign activity 2015-01-07 15:02:25 +01:00
Jenkins for ownCloud
2daf90dae6 [tx-robot] updated from transifex 2015-01-07 01:55:42 -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
Jenkins for ownCloud
6a3f69c2d0 [tx-robot] updated from transifex 2015-01-06 01:54:59 -05:00
Jörn Friedrich Dreyer
23900a5a39 filter trashbin and share views 2015-01-05 13:11:50 +01:00
Morris Jobke
28c8f5a0f9 Check for version before mounting a public link 
* ownCloud 7.0.0 is needed - version of merge of server <-> server
  sharing - https://github.com/owncloud/core/pull/8399
* adjust error message
 2015-01-05 11:50:05 +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
05ffa3ab7a [tx-robot] updated from transifex 2015-01-03 01:54:29 -05:00
Jenkins for ownCloud
4b357274bb [tx-robot] updated from transifex 2015-01-02 01:54:28 -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
Thomas Müller
688a4022df Merge pull request #13012 from owncloud/small_fix 
only send activity if we have a valid path and the file is readable
 2014-12-27 21:38:47 +01:00
Jenkins for ownCloud
d2e53d1022 [tx-robot] updated from transifex 2014-12-27 01:54:33 -05:00
Jenkins for ownCloud
0836ce9cd8 [tx-robot] updated from transifex 2014-12-26 01:54:28 -05:00
Jenkins for ownCloud
e0fc26a5cb [tx-robot] updated from transifex 2014-12-25 01:54:29 -05:00
Jenkins for ownCloud
801b9e0494 [tx-robot] updated from transifex 2014-12-24 01:54:33 -05:00