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

2486 commits

Author SHA1 Message Date
Jenkins for ownCloud
c4cb34da9d [tx-robot] updated from transifex 2015-06-18 01:55:14 -04:00
Jan-Christoph Borchardt
b43bfaf132 fix look of 'Share with me via ownCloud' button, fix wording 2015-06-17 16:05:05 +02:00
Lukas Reschke
414896d8a0 Throw nicer error message instead 500 2015-06-17 15:39:13 +02:00
Lukas Reschke
2d648ed0eb Verify if path exists 
We need to verify if the specified path exists to gracefully prevent errors.
 2015-06-17 15:06:50 +02:00
Bjoern Schiessle
fa16c1f9b4 fix path to owncloud logo 2015-06-17 13:53:59 +02:00
Bjoern Schiessle
ac9733a8b8 make the click actions work 2015-06-17 13:53:59 +02:00
Jan-Christoph Borchardt
4599da9608 federated cloud ID: add icons, fix HTML & layout, fix wording 2015-06-17 13:53:59 +02:00
Bjoern Schiessle
06d0a41915 add social media button for diaspora, twitter, facebook and google+ 2015-06-17 13:53:59 +02:00
Jenkins for ownCloud
3898b8c9b8 [tx-robot] updated from transifex 2015-06-17 01:55:34 -04:00
Thomas Müller
433db48027 Merge pull request #16911 from oparoz/prettier-public-thumbnails 
Determine the size we need before asking for a thumbnail
 2015-06-15 13:30:44 +02:00
Jenkins for ownCloud
fe9b28a800 [tx-robot] updated from transifex 2015-06-14 01:54:49 -04:00
Olivier Paroz
7b84343cfc floats are not welcome when setting the size of a preview 2015-06-12 18:56:18 +02:00
Olivier Paroz
8ff4a66f01 Determine the size we need before asking for a thumbnail 
We need to set the size of the preview using the devicePixelRatio and use that as arguments when using the preview endpoint or that endpoint will use the default 36x36 and thumbnails will be blurry on high DPI devices
 2015-06-12 18:50:21 +02:00
Jenkins for ownCloud
abd70932c6 [tx-robot] updated from transifex 2015-06-12 01:55:11 -04:00
Jenkins for ownCloud
88d3c9ad40 [tx-robot] updated from transifex 2015-06-11 01:55:05 -04:00
Morris Jobke
7550bf0917 Disable video preview if previews are disabled 2015-06-09 17:49:59 +02:00
Morris Jobke
bacd5de453 Merge pull request #16811 from espenfjo/master 
Fix regression in preview height calculation
 2015-06-09 09:31:30 +02:00
Jenkins for ownCloud
75bd040f1c [tx-robot] updated from transifex 2015-06-09 01:55:06 -04:00
Espen Fjellvær Olsen
308b97db4c Fix regression in preview height calculation 
Fix regressions introduced in a672e9d regarding the image height calculation
 2015-06-08 20:57:19 +02:00
Jenkins for ownCloud
2fb1b0864a [tx-robot] updated from transifex 2015-06-08 01:55:01 -04:00
Jenkins for ownCloud
3542148761 [tx-robot] updated from transifex 2015-06-07 01:55:03 -04:00
Jenkins for ownCloud
e544d5b2c6 [tx-robot] updated from transifex 2015-06-05 01:55:04 -04:00
Jenkins for ownCloud
66a24ff479 [tx-robot] updated from transifex 2015-06-04 01:56:24 -04:00
Joas Schilling
d3e3a84cae Move the helpful method to the TestCase class 2015-06-03 12:33:29 +02:00
Lukas Reschke
1cccb227c3 Merge pull request #16686 from owncloud/show_cloud_id 
show federated cloud id in the personal settings
 2015-06-02 17:05:33 +02:00
Morris Jobke
70f0cf67a5 L10n for federated cloud ID and rtrim '/' on ID 2015-06-02 15:16:21 +02:00
Bjoern Schiessle
6e5ed81064 show federated cloud id in the personal settings 2015-06-02 14:09:53 +02:00
Jenkins for ownCloud
baca5c60c0 [tx-robot] updated from transifex 2015-06-02 01:56:23 -04:00
Robin Appelman
661c9e2444 add changeLock to the storage api 2015-06-01 13:24:02 +02:00
Robin Appelman
536e187e51 add locking to the storage api 2015-06-01 13:22:56 +02:00
Thomas Müller
c700f42b68 Merge pull request #16517 from owncloud/remove-logo-wide 
replace logo-wide on share page as well with better icon + text
 2015-05-29 12:15:02 +02:00
Thomas Müller
b95ebb76e5 Merge pull request #16607 from owncloud/ie9-textpreviewfallback 
Fallback to picture preview for IE <= 9
 2015-05-28 20:45:14 +02:00
Vincent Petry
29c68a4e61 Return 404 in shareinfo.php when outgoing s2s disabled 2015-05-28 17:59:43 +02:00
Vincent Petry
2daef7c7dc Fallback to picture preview for IE <= 9 
IE 9 and below do not provide window.btoa and there is currently no way
to generate base64 strings without introducting further dependencies.

So for now the solution is to fall back to the ugly picture mode for
text files whenever IE <= 9 is used.
 2015-05-28 15:36:28 +02:00
Jenkins for ownCloud
1726d84e73 [tx-robot] updated from transifex 2015-05-28 01:55:22 -04:00
Jenkins for ownCloud
06934e7c00 [tx-robot] updated from transifex 2015-05-24 01:55:03 -04:00
Roeland Jago Douma
41a8f45b93 OCS Share API link shares now always have an url 
To make sure clients have the correct and latest link add an url field
to all OCS Share API return statements on public link shares.

* Added unit tests
 2015-05-22 14:42:57 +02:00
Jenkins for ownCloud
156881efce [tx-robot] updated from transifex 2015-05-22 01:55:04 -04:00
Jan-Christoph Borchardt
78a0464354 replace logo-wide on share page as well with better icon + text 2015-05-22 00:04:47 +02:00
Vincent Petry
d560d1ef2a Merge pull request #16469 from oparoz/restore-minheight-for-single-public-previews 
Restore min-height for single previews
 2015-05-20 16:48:27 +02:00
Morris Jobke
1a67e5cdc3 Merge pull request #16465 from owncloud/s2s-returnpropererrorwhenpublicwebdavdisabled 
Return 401 when accessing public webdav and s2s is disabled
 2015-05-20 14:28:45 +02:00
Olivier Paroz
13ab251c6d Restore min-height for single previews 2015-05-20 14:09:31 +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
Vincent Petry
f2a900e04c Return 401 when accessing public webdav and s2s is disabled 2015-05-20 12:19:03 +02:00
Lukas Reschke
9be6d8cd39 Merge pull request #16446 from owncloud/fix-url-generation 
Fix URL generation
 2015-05-20 08:20:38 +02:00
Thomas Müller
f9d04f62a8 Merge pull request #16440 from owncloud/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2015-05-19 22:12:35 +02:00
Vincent Petry
f7a2b5e7a9 Added unit tests for download URL in public sharing page 2015-05-19 17:41:06 +02:00
Joas Schilling
d832c4ae23 Fix unexisting class and broken doc 2015-05-19 15:27:50 +02:00
Lukas Reschke
07483033c1 Fix URL generation 
`params` in the `OC.generateUrl` function call only replaces all specified occurences of a key just like the l10n PHP functionality does.

This means that to build a query string we have to use `OC.buildQueryString` instead of the params parameters.

Fixes https://github.com/owncloud/core/issues/16336 which is a regression introduced with 58a87d0bab of https://github.com/owncloud/core/pull/15652.

Without this fix downloading single files from a public shared folder is not possible.
 2015-05-19 15:12:08 +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
Joas Schilling
9e0cb4460e Merge pull request #16354 from owncloud/remove-browser-from-publicwebdav 
Show a empty response for GET on non-files instead of the Browser Plugin
 2015-05-19 10:54:11 +02:00
Robin Appelman
415f16eb24 fix tests 2015-05-18 12:11:31 +02:00
Roeland Jago Douma
dd3d0194a6 Move files sharing app (mostly) to OCP\DB 2015-05-18 11:06:23 +02:00
Roeland Jago Douma
be8d0a08ec Move away from private static deprecated functio 2015-05-18 11:03:48 +02:00
Roeland Jago Douma
7a8072e958 Move core apps from OC_Log::write to OCP\Util 2015-05-18 10:57:52 +02:00
Bjoern Schiessle
887be709f5 a new approach to display the error message 2015-05-18 10:15:17 +02:00
Lukas Reschke
e0a136d344 Show a empty response for GET on non-files instead of the Browser Plugin 
As discussed in https://github.com/owncloud/core/pull/14151, we missed to add this to the `files_sharing` S2S public WebDAV backend though.
 2015-05-14 14:02:32 +02:00
Jenkins for ownCloud
1596a1fd32 [tx-robot] updated from transifex 2015-05-14 01:54:47 -04:00
Lukas Reschke
5941e826b8 Merge pull request #16284 from owncloud/shared-storage-view 
dont go trough the view when renaming/copying on shared storages
 2015-05-13 10:37:04 +02:00
Jenkins for ownCloud
504586aec6 [tx-robot] updated from transifex 2015-05-13 01:55:14 -04:00
Robin Appelman
3b1dde7005 dont go trough the view when renaming/copying on shared storages 2015-05-12 17:09:37 +02:00
Jan-Christoph Borchardt
46e4d8818c Merge pull request #16127 from owncloud/fix-file-icons-in-shared-file-view 
Enable file icons & previews in "Shared ..." categories
 2015-05-12 15:17:43 +02:00
Morris Jobke
90d8e4bc00 Merge pull request #15815 from owncloud/unshare-etag-propagate 
Update etag of direct parent on unshare
 2015-05-11 13:42:20 +02:00
Jenkins for ownCloud
52fc45e6e3 [tx-robot] updated from transifex 2015-05-10 01:56:13 -04:00
Jenkins for ownCloud
6f5854a8de [tx-robot] updated from transifex 2015-05-09 01:55:35 -04:00
Morris Jobke
b1713b2f75 Enable file icons & previews in "Shared ..." categories 
* sharing API returns now the mimetype icon path
* file previews are now lazyloaded by default (as the doc says)
* fixes #16086
 2015-05-06 18:32:52 +02:00
Joas Schilling
efce8ff905 Merge pull request #16052 from owncloud/fix-phpdoc-sharecontroller 
Fix PHPDoc for the ext. share controller
 2015-05-05 10:52:28 +02:00
Jenkins for ownCloud
b60dcd91bb [tx-robot] updated from transifex 2015-05-05 01:55:36 -04:00
Lukas Reschke
d9746d8abd Fix PHPDoc for the ext. share controller 2015-05-04 18:06:16 +02:00
Morris Jobke
760ce3bd63 Fix DeleteOrphanedSharesJob 
* remove unneeded use statements
* the the interval properly in the constructor
* set the log level to debug (from info) - fixes #16036
 2015-05-04 13:58:58 +02:00
Lukas Reschke
17fedc80da Merge pull request #15652 from oparoz/better-text-previews 
Show a text preview instead of a bitmap preview of text
 2015-05-04 11:44:51 +02:00
Jenkins for ownCloud
7fa308977b [tx-robot] updated from transifex 2015-05-04 01:54:47 -04:00
Jenkins for ownCloud
aa0d439ed9 [tx-robot] updated from transifex 2015-05-02 01:54:49 -04:00
Jenkins for ownCloud
eda4d45836 [tx-robot] updated from transifex 2015-05-01 01:54:43 -04:00
Jenkins for ownCloud
ae853445ef [tx-robot] updated from transifex 2015-04-30 03:27:57 -04:00
Joas Schilling
b55ef51a27 Add tests for the correct share id on the call aswell 2015-04-28 14:56:13 +02:00
Joas Schilling
34181c3aef Correctly send Federate-Cloud Share Feedback against the remote share ID 2015-04-28 14:29:04 +02:00
Vincent Petry
65fbb5eda0 Update etag of direct parent on unshare 
Only call dirname() once instead of twice when propagating etags to the
recipient's parent folders.
 2015-04-28 13:11:23 +02:00
Joas Schilling
66dca76f72 check the called URL 2015-04-28 11:28:54 +02:00
Joas Schilling
8f7c64253e Correctly generate the feedback URL for remote share 
The trailing slash was added in c78e3c4a7f
to correctly generate the encryption keys
 2015-04-28 11:28:54 +02:00
Robin Appelman
5304afbecb dont pass floats as timestamp to the changepropagator 2015-04-27 15:18:25 +02:00
Robin Appelman
0789a6433e safer teardown 2015-04-27 14:07:16 +02:00
Robin Appelman
32067f9e80 use microtime to prevent race conditions 2015-04-27 14:07:16 +02:00
Robin Appelman
83b8ac0d7b cleanup hooks 2015-04-27 14:07:16 +02:00
Robin Appelman
2e897f05b1 triger propagation for webdav uploads 
use post hooks for share etag propagator
 2015-04-27 14:07:16 +02:00
Robin Appelman
dd9601ae8f fix merge 2015-04-27 14:07:16 +02:00
Robin Appelman
45784f213f fix propagation when renaming a directly reshared folder 2015-04-27 14:07:16 +02:00
Robin Appelman
f488624e5f minor fixes 2015-04-27 14:07:16 +02:00
Robin Appelman
526ea3fcba add rename hook for propagation 2015-04-27 14:07:16 +02:00
Robin Appelman
77fbb4125b propagate changes up reshares 2015-04-27 14:07:16 +02:00
Robin Appelman
8cb40f6043 Make sure the owner mountpoints are setup 2015-04-27 14:07:16 +02:00
Robin Appelman
d5434c9c4e more propagation tests 2015-04-27 14:07:16 +02:00
Robin Appelman
b5c62cdad6 remove duplicates from rebase 2015-04-27 14:07:15 +02:00
Robin Appelman
19486837b2 adjust test 2015-04-27 14:07:15 +02:00
Robin Appelman
30ad56813a propagate etags for all user of a share 2015-04-27 14:07:15 +02:00
Robin Appelman
518d5aadf5 Allow getting *all* share entries owned by a user 2015-04-27 14:07:15 +02:00
Robin Appelman
2dc11cf20e unit test for etag propagation across shared storage boundary 2015-04-27 14:07:15 +02:00
Jenkins for ownCloud
e58029f8ad [tx-robot] updated from transifex 2015-04-27 01:54:46 -04:00
Jenkins for ownCloud
37adf6df01 [tx-robot] updated from transifex 2015-04-26 01:54:49 -04:00
Jenkins for ownCloud
7855174879 [tx-robot] updated from transifex 2015-04-25 01:55:13 -04:00
Jenkins for ownCloud
33d197db29 [tx-robot] updated from transifex 2015-04-24 01:55:15 -04:00
Olivier Paroz
0729fc2fbc Remove overflow+watermark 2015-04-23 18:19:34 +02:00
Olivier Paroz
58a87d0bab Use authorization headers for better compatibility 
+ add ellipsis
+ fix OC.generateUrl calls
 2015-04-23 18:19:29 +02:00
Olivier Paroz
a968877a8b An idea to suggest that this is just a sample of the full text 2015-04-23 18:19:21 +02:00
Olivier Paroz
530c290555 Use webDAV to have access to HTTP byte ranges 2015-04-23 18:19:17 +02:00
Olivier Paroz
e113d67430 Cache the token value 2015-04-23 18:19:12 +02:00
Olivier Paroz
8d3f88cf16 Show a text preview instead of a bitmap preview of text 
+ fix the preview height
 2015-04-23 18:19:07 +02:00
Vincent Petry
a672e9d556 Merge pull request #15814 from owncloud/public-reshare-webdav 
Fix webdav access for public reshare
 2015-04-23 15:28:10 +02:00
Robin Appelman
7a3a8e4032 fix subfolder reshares over webdav 2015-04-23 13:42:51 +02:00
Jenkins for ownCloud
f8f354b351 [tx-robot] updated from transifex 2015-04-23 01:54:51 -04:00
Robin Appelman
57f49391dc remove unneeded readonlycache 2015-04-22 20:07:54 +02:00
Robin Appelman
2adb79c794 resolve reshares in public webdav 2015-04-22 16:19:52 +02:00
Robin Appelman
03b7f1d015 use the permissions mask cache wrapper instead of the read only cache 2015-04-22 15:28:06 +02:00
Thomas Müller
438cb27471 Merge pull request #15721 from oparoz/fix-readonly-cache 
Fix read-only cache
 2015-04-21 16:30:56 +02:00
Olivier Paroz
9695e33e34 Renamed class + split methods 2015-04-21 14:40:11 +02:00
Vincent Petry
53a23364ef Added empty content message for empty read-only folders 2015-04-21 14:31:13 +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
Olivier Paroz
80a1f1858e Tests for read-only cache 2015-04-18 19:43:20 +02:00
Morris Jobke
e837927ad5 fix followup issues with unneeded parameters 2015-04-18 17:02:39 +02:00
Olivier Paroz
fcc1b9b3cc Thou shalt not corrupt the answer of a cache request 2015-04-18 12:33:43 +02: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
da44df2cfa [tx-robot] updated from transifex 2015-04-17 01:55:37 -04:00
Jenkins for ownCloud
8606b7ca66 [tx-robot] updated from transifex 2015-04-16 01:54:43 -04:00
Jenkins for ownCloud
7f3f191ee9 [tx-robot] updated from transifex 2015-04-14 18:19:31 -04:00
Morris Jobke
82cab25762 Merge pull request #13360 from owncloud/cross-storage-move 
Proper copy/move between multiple local storages
 2015-04-14 14:35:08 +02:00
Robin Appelman
0f21303b75 a bit more phpdoc 2015-04-14 12:35:53 +02:00
Robin Appelman
f605c98531 Fix cross storage move with shared storages 2015-04-13 17:10:05 +02:00
Robin Appelman
8688660825 check that we know the parent 2015-04-13 17:10:02 +02:00
Robin Appelman
6b5daca7b7 check for source cache 2015-04-13 17:10:02 +02:00
Robin Appelman
d4c91dc835 add missing return for shared 2015-04-13 15:13:03 +02:00
Robin Appelman
d16ee4138d Fix test 2015-04-13 15:13:03 +02:00
Robin Appelman
d726db7459 Implement move/copyFromStorage for shared storage 2015-04-13 15:13:03 +02:00
Vincent Petry
2822d0579e Properly add trailing slash to mount point 
Fixes resolving mount points when shared mount point's target name has
the same prefix as the source name
 2015-04-13 12:36:47 +02:00
Arthur Schiwon
66bc8145a9 allow login names to be used for s2s with LDAP users 2015-04-13 11:50:09 +02:00
Morris Jobke
20a1a110de Merge pull request #15537 from owncloud/master-fixunittestrelatedtoorphanedshares2 
Fix master unit test: Clear leftover shares from other tests
 2015-04-10 15:42:16 +02:00
Vincent Petry
4a225aa12c Clear leftover shares from other tests 2015-04-10 14:53:17 +02:00
Vincent Petry
b51b5b64e6 Fix converting Guzzle error codes in s2s storage 2015-04-10 12:12:05 +02:00
Vincent Petry
73afca6207 Catch more exceptions when connecting to remote DAV server 
Added InvalidArgumentException to catch HTML parsing errors when XML was
expected.
Made convertSabreException more generic to be able to handle more
exception cases.
 2015-04-10 12:02:06 +02:00
Vincent Petry
4feb97d8e4 Properly catch guzzle 503 when querying share info 2015-04-09 18:55:28 +02:00
Vincent Petry
2865f09984 Merge pull request #15282 from owncloud/keepsharerelationshipondelete 
Keep shares when deleting shared folders
 2015-04-09 18:10:17 +02:00
Vincent Petry
5803a1f5f7 Remove trashbin storage wrapper when disabling it for tests 2015-04-09 15:02:24 +02:00
Vincent Petry
08a9d1d2dc Remove unused $toRemove 2015-04-09 12:34:19 +02:00
Jan-Christoph Borchardt
65dc958418 add admin documentation hints to Federated Cloud Sharing and cron 2015-04-09 12:07:05 +02:00
Vincent Petry
461302244e Keep shares when deleting shared folders 
The share entries will be linked with the fileid while they are kept in
the trashbin.

In the future a background just will scrape orphaned shares and delete
them.
 2015-04-09 10:16:40 +02:00
Morris Jobke
56f1ffe820 Merge pull request #14676 from owncloud/deleteorphanedshares 
Delete orphaned shares in a background job
 2015-04-09 00:18:53 +02:00
Morris Jobke
103d451459 Merge pull request #14987 from rullzer/ocs_password_fix2 
OCS Fixes to allow setting of password without removing additional settings
 2015-04-08 14:44:17 +02:00
Vincent Petry
4acf6747d2 Disable trashbin when testing orphaned shares deletion job 2015-04-08 13:04:06 +02:00
Vincent Petry
9c3893ce69 Added FIXME about registering jobs in apps.php 2015-04-08 12:09:42 +02:00
Vincent Petry
17b141337a Delete orphaned shares in a background job 2015-04-08 10:47:55 +02:00
Bjoern Schiessle
fac7ec3fc4 fix re-shares with encryption 2015-04-07 13:30:30 +02:00
Bjoern Schiessle
60d8a39f03 store init status per user 2015-04-07 13:30:30 +02:00
Bjoern Schiessle
8b1a12a224 use loginHelper from base class 2015-04-07 13:30:30 +02:00
Bjoern Schiessle
391fab35f0 reset storage for each unit test 2015-04-07 13:30:30 +02:00
Bjoern Schiessle
de4ec21c39 work arround to make sure that shares are initialized only once 2015-04-07 13:30:30 +02:00
Thomas Müller
00338f9dca Removing files_encryption left overs 2015-04-07 13:30:28 +02:00
Bjoern Schiessle
0eee3a2618 remove unencrypted_size from the cache, size will contain the unencrypted size 2015-04-07 13:30:28 +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
Joas Schilling
4c9c73bef9 Correct the app name for sharing events 2015-03-30 15:14:31 +02:00
Roeland Jago Douma
b0aa17b13f OCS Fixes to allow setting of password without removing additional settings 
- Added setPassword to share.php
- Fixed OCS API call
- Added unit tests
 2015-03-30 14:00:50 +02:00
Morris Jobke
cfe241a959 Merge pull request #13964 from rullzer/capabilities 
Add OCS sharing info to capabilities - take 2
 2015-03-30 10:06:05 +02:00
Morris Jobke
00b2be11dd Merge pull request #15239 from owncloud/see-no-evil 
Move federated cloud sharing, files externals and updater to special pos...
 2015-03-30 09:05:31 +02:00
Thomas Müller
4d12c4a38b Merge pull request #13938 from owncloud/deprecate-iappconfig 
Deprecated \OCP\IAppConfig - add missing methods to IConfig
 2015-03-27 16:07:41 +01:00
Jan-Christoph Borchardt
908538d863 fix layout for Sharing settings 2015-03-27 09:38:13 +01:00
Joas Schilling
495562f40c Move federated cloud sharing, files externals and updater to special positions 2015-03-27 09:38:09 +01:00
Morris Jobke
d082e37270 Merge pull request #15244 from owncloud/use_default_share_folder 
always fall back to default share folder
 2015-03-26 22:39:04 +01:00
Morris Jobke
e8109f0bc3 Merge pull request #13802 from owncloud/share-partfilepermissions 
Fix share permission checks
 2015-03-26 22:01:05 +01:00
Bjoern Schiessle
a3592534ef always fall back to default share folder 2015-03-26 21:56:44 +01:00
Thomas Müller
7bff0681fe Merge pull request #15001 from owncloud/kill-share-proxy 
Replace share proxy with a hook
 2015-03-26 21:20:05 +01:00
Robin Appelman
1be7da4a57 replace share proxy with hook 2015-03-26 19:56:57 +01:00
Robin Appelman
173c31e42a rename proxy test 2015-03-26 19:56:31 +01:00
Lukas Reschke
071a339593 Remove IDE autocomplete fail 
🙈 *cough* *cough*
 2015-03-26 19:39:15 +01:00
Jenkins for ownCloud
b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Morris Jobke
20f5290462 Merge pull request #15195 from owncloud/reanimate-add-guzzle 
Add wrapper for Guzzle
 2015-03-26 11:06:48 +01:00
Jenkins for ownCloud
40b77eb97a [tx-robot] updated from transifex 2015-03-26 01:55:29 -04:00
Lukas Reschke
5f044ebf1b Add wrapper for Guzzle 2015-03-25 16:04:41 +01:00
Morris Jobke
1db177b841 Merge pull request #15055 from owncloud/share-activity-grouping 
Group sharing activities by user/group and file respectively
 2015-03-24 20:23:36 +01:00
Morris Jobke
09ea260957 Merge pull request #15160 from owncloud/deduplicate-external-manager-tests 
Deduplicate external manager tests
 2015-03-24 20:15:56 +01:00
Robin Appelman
1bd141b655 Merge pull request #15158 from owncloud/fix-failing-master 
Fix failing master unit tests
 2015-03-24 17:54:11 +01:00
Joas Schilling
8c33f05e93 Merge the two tests into one 2015-03-24 17:26:38 +01:00
Joas Schilling
7de15f3125 *cough* 2015-03-24 17:08:03 +01:00
Morris Jobke
2370af62ea Merge pull request #14998 from rullzer/ocs_api_new_url 
OCS API should return fancy OC url
 2015-03-24 17:04:31 +01:00
Morris Jobke
965d97a8f5 Merge pull request #14580 from owncloud/issue/13765-duplicate-remote-share 
"Integrity constraint violation" when sharing the same item twice with the same user
 2015-03-24 15:05:58 +01:00
Robin Appelman
d46b7d73e7 when the path doesnt exist show a proper error page 2015-03-24 12:21:25 +01:00
Lukas Reschke
e2453d78c0 Properly catch whether a share is null 
Despite it's PHPDoc the function might return `null` which was not properly catched and thus in some situations the share was resolved to the sharing users root directory.

To test this perform the following steps:

* Share file in owncloud 7 (7.0.4.2)
* Delete the parent folder of the shared file
* The share stays is in the DB and the share via the sharelink is inaccessible. (which is good)
* Upgrade to owncloud 8 (8.0.2) (This step is crucial. The bug is not reproduceable without upgrading from 7 to 8. It seems like the old tokens are handled different than the newer ones)
* Optional Step: Logout, Reset Browser Session, etc.
* Access the share via the old share url: almost empty page, but there is a dowload button which adds a "/download" to the URL.
* Upon clicking, a download.zip is downloaded which contains EVERYTHING from the owncloud directory (of the user who shared the file)
* No exception is thrown and no error is logged.

This will add a check whether the share is a valid one and also adds unit tests to prevent further regressions in the future. Needs to be backported to ownCloud 8.

Adding a proper clean-up of the orphaned shares is out-of-scope and would probably require some kind of FK or so.

Fixes https://github.com/owncloud/core/issues/15097
 2015-03-24 11:21:58 +01:00
Jenkins for ownCloud
a79d973005 [tx-robot] updated from transifex 2015-03-22 01:55:21 -04:00
Roeland Jago Douma
bdde2156da Added extra unit test 2015-03-21 09:47:07 +01:00
Roeland Jago Douma
9ce8e1ddc7 OCS API should return fancy OC url 
* Also use the URLGenerator
 2015-03-21 09:47:06 +01:00
Thomas Müller
afa8872955 Merge pull request #14857 from owncloud/preview-provider-registration-in-manager 
Preview provider registration in manager
 2015-03-20 16:34:22 +01:00
Vincent Petry
67160e0861 Do not automatically add "update" permission to shared mounts 
In the past it seems the update permission was needed to be able to
rename shared mounts, but it doesn't seem to be the case any more.

Removing the "update" permission that used to be added automatically
fixes the read-only permission check when trying to overwrite a
read-only file over WebDAV.
 2015-03-20 12:33:59 +01:00
Vincent Petry
eef5851a67 Fix share permission related unit tests 2015-03-20 11:30:51 +01:00
Joas Schilling
7776e088d6 Group sharing activities by user/group and file respectively 2015-03-20 09:49:33 +01:00
Jenkins for ownCloud
e8680e6637 [tx-robot] updated from transifex 2015-03-20 01:55:23 -04:00
Vincent Petry
5f7b3a4dbe Rename must be possible with update-only permission 
and this as long as the rename is done within the same folder.
 2015-03-19 21:55:56 +01:00
Thomas Müller
857b22c61b Merge pull request #15025 from rullzer/ocs_respect_enforced_date 
Ocs respect enforced date
 2015-03-19 17:06:04 +01:00
Robin Appelman
be6edd465a Merge pull request #14537 from owncloud/oci-external-share 
Fix external shares without password on oracle
 2015-03-19 16:20:12 +01:00
Roeland Jago Douma
dd3307dd19 Added unit test 
Tests added to make sure that removing an expire date when this is
enforced is not allowed.
 2015-03-19 10:47:09 +01:00
Jenkins for ownCloud
e40b0701d7 [tx-robot] updated from transifex 2015-03-19 01:55:06 -04:00
Vincent Petry
c2315aa015 Fix shared storage permission checks 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
Morris Jobke
f4b6f3cfd1 fix unit tests 2015-03-17 18:55:44 +01:00
Joas Schilling
8ebb198ef3 Add a unit test for the naming conflict on the mountpoint name 2015-03-17 16:55:03 +01:00
Joas Schilling
ba3e4ede39 Use insertIfNotExists() instead of manual logic 2015-03-17 16:03:24 +01:00
Joas Schilling
05c4848954 Correctly get the unique mountpoint name when mounting the share 
Previously the mount name was checked for uniqueness prior to inserting the
share. This caused problems, when two shares with the same name where done
or folder, mount point, local share with the same name was done, between
sending and accepting of the remote share
 2015-03-17 16:03:24 +01:00
Lukas Reschke
9e2ebf2dce Cache \OC\URLGenerator::imagePath 
\OC\URLGenerator::imagePath is a really expensive operation due to all the I/O handling and can really benefit from caching.
 2015-03-17 12:35:47 +01:00
Lukas Reschke
db033e4e19 Fix PHPDoc and Co. 
Ref https://github.com/owncloud/core/pull/14929#discussion_r26501240
 2015-03-17 10:37:09 +01:00
Vincent Petry
b9d9405135 Fix scanFile signature warnings 2015-03-16 16:45:11 +01:00
Joas Schilling
3052b9571e Fix controller test 2015-03-16 12:45:18 +01:00
Joas Schilling
47af533183 Move mimetype check from template to controller 2015-03-16 12:45:18 +01:00
Joas Schilling
4c4c0fa120 Use the PreviewManager where possible 2015-03-16 12:44:10 +01:00
Jenkins for ownCloud
454a2563bc [tx-robot] updated from transifex 2015-03-12 01:55:59 -04:00
Roeland Jago Douma
ec31ee9117 Mark functions private 2015-03-11 16:30:54 +01:00
Lukas Reschke
cf25e6f569 Merge pull request #14773 from owncloud/allow-iframes-from-self-in-share-view 
Allow iframes from same domain in share view
 2015-03-11 15:13:59 +01:00
Roeland Jago Douma
e9a003fe21 Slight better formatting 2015-03-11 15:11:50 +01:00
Roeland Jago Douma
09ee297356 New array syntax 2015-03-11 15:02:55 +01:00
Roeland Jago Douma
c985186246 Added new header 2015-03-11 15:02:55 +01:00
Roeland Jago Douma
af76716775 Now added enabled element 
This change allows for more generic parsing for the capabilities.
 2015-03-11 15:02:55 +01:00
Roeland Jago Douma
0bf1152a51 Added route again 2015-03-11 15:02:55 +01:00
Roeland Jago Douma
39b0f0725e Add file_sharing info to capabilities 
Display the capabilities regarding file sharing in the capabilities API.
This will allow the clients to provide users a better experince.
 2015-03-11 15:02:55 +01:00
Thomas Müller
0f3e36fdfd Adding a more meaningful message for sabre dav exception - fixes #14516 2015-03-11 11:53:31 +01:00
Joas Schilling
6a677ce8fe Do not make setupMounts() public just because of testing 2015-03-11 11:10:43 +01:00
Robin Appelman
dcd2d7aff5 Add unit tests for external share mananger 2015-03-10 10:17:53 +01:00
Lukas Reschke
48243a2949 Allow iframes from same domain in share view 
This is required because the PDF Viewer itself is embedded using an iframe from the same domain. The default policy is blocking this.

Going on further, we have to come up with a solution in the future how to handle previews by applications, one example might be that they call their own endpoint and not the generic share page to allow applications to have full control over how to display previews.

Anyways, to test this behaviour use a decent newer browser (such as Chrome 41) and share a PDF file, obviously the PDF viewer needs to be enabled as well. Without this patch publicly shared PDF files should not get previewed and an error is thrown. (if it isn't then your browser is probably not obeying our Content-Security-Policy and you might consider switching to another one ;))
 2015-03-10 10:06:15 +01:00
Morris Jobke
94b7fa17c5 Merge pull request #14720 from owncloud/fix-shareetagpropagation 
Fix size propagation over shared storage boundary
 2015-03-09 16:24:06 +01:00
Vincent Petry
ec19d9c267 Add unit test for size propagation across share boundaries 2015-03-09 12:56:22 +01:00
Jenkins for ownCloud
73c2157171 [tx-robot] updated from transifex 2015-03-07 01:54:37 -05:00
Vincent Petry
4322287fc3 Fix size propagation over shared storage boundary 2015-03-05 22:23:47 +01:00
Roeland Jago Douma
4436a9ce35 Shares should have a least read permission 
* Throw 400 when a share is created or updated without read permissions
* Added unit tests
 2015-03-01 17:13:17 +01:00
Jenkins for ownCloud
ff85d38c2a [tx-robot] updated from transifex 2015-03-01 01:54:38 -05:00
Jenkins for ownCloud
42f6448da2 [tx-robot] updated from transifex 2015-02-28 01:55:32 -05:00
Robin Appelman
c65c717379 Fix external shares without password on oracle 2015-02-27 13:22:57 +01:00
Thomas Müller
f72f9e0159 Merge pull request #14530 from owncloud/revert-14403 
Revert "Updating license headers"
 2015-02-27 00:39:29 -08:00
Jenkins for ownCloud
d20061e5b1 [tx-robot] updated from transifex 2015-02-27 01:55:28 -05:00
Vincent Petry
1777609d47 Merge pull request #14532 from owncloud/defaultvalueforremoteid 
Add default value for remote_id
 2015-02-26 16:46:12 +01:00
Vincent Petry
80e5ad3131 Bump up files_sharing version for schema update 2015-02-26 15:04:15 +01:00
Morris Jobke
7b2b74d731 Merge pull request #14473 from owncloud/remove-uneeded-assignment 
Remove uneeded assignment
 2015-02-26 14:01:21 +01:00
Vincent Petry
ba71ee6059 Add default value for remote_id 
Fixes SQLite migration with non-null column.
 2015-02-26 12:09:21 +01:00
Morris Jobke
06aef4e8b1 Revert "Updating license headers" 
This reverts commit 6a1a4880f0.
 2015-02-26 11:37:37 +01:00
Thomas Müller
adc986f3e4 Merge pull request #14502 from owncloud/failing-mysql-master-tests 
Failing mysql master tests
 2015-02-26 01:48:37 -08:00
Jenkins for ownCloud
8a4fddeb4a [tx-robot] updated from transifex 2015-02-26 01:55:50 -05:00
Lukas Reschke
fca4628a5c Show 404 page when accessing empty share URL 
Testplan:
- [ ] Without: Accessing `public.php?service=files&t=` throws an exception
- [ ] With: No exception thrown and 404 page displayed.

Fixes https://github.com/owncloud/core/issues/14231
 2015-02-25 17:29:12 +01:00
Joas Schilling
ac5bb97d04 Reset the group backend aswell 2015-02-25 16:03:12 +01:00
Joas Schilling
993d89b3cc Extend the class so the Filesystem is cleaned up 2015-02-25 16:03:10 +01:00
Robin McCorkell
695f43a1ed Merge pull request #10735 from owncloud/use_remote_addr 
Use getRemoteAddress which supports reverse proxies
 2015-02-25 13:24:39 +00:00
Thomas Müller
799e144b04 Merge pull request #14151 from owncloud/update-sabre2.1 
Sabre Update to 2.1
 2015-02-25 02:21:55 -08:00
Thomas Müller
b3de86d851 Remove locks plugin. 
Reasoning:
- a WebDAV server is not required to implement locking support
- WebDAV Locking is know to break the sync algorithm
- the current lock implementation is known to be broken (locks are not moved if a file is moved, locks on shared files don't work)
 2015-02-25 10:30:47 +01:00
Jenkins for ownCloud
31f881415b [tx-robot] updated from transifex 2015-02-25 01:55:51 -05:00
Lukas Reschke
5bb0889b30 Remove uneeded assignment 
'files' is neither used in the controller or the template
 2015-02-24 19:50:23 +01:00
Lukas Reschke
165afb004b Use getRemoteAddress which supports reverse proxies 
Breaking change for 8.1 wiki (Security > Administrators):

The log format for failed logins has changed and uses now the remote address and is considering reverse proxies for such scenarios when configured correctly.
 2015-02-24 11:49:40 +01:00
Vincent Petry
9f6dcb9d3e Sabre Update to 2.1 
- VObject fixes for Sabre\VObject 3.3
- Remove VObject property workarounds
- Added prefetching for tags in sabre tags plugin
- Moved oc_properties logic to separate PropertyStorage backend (WIP)
- Fixed Sabre connector namespaces
- Improved files plugin to handle props on-demand
- Moved allowed props from server class to files plugin
- Fixed tags caching for files that are known to have no tags
  (less queries)
- Added/fixed unit tests for Sabre FilesPlugin, TagsPlugin
- Replace OC\Connector\Sabre\Request with direct call to
  httpRequest->setUrl()
- Fix exception detection in DAV client when using Sabre\DAV\Client
- Added setETag() on Node instead of using the static FileSystem
- Also preload tags/props when depth is infinity
 2015-02-23 22:27:23 +01:00
Vincent Petry
4290e1990e Merge pull request #13829 from owncloud/appmanager-list 
Better caching for enabled apps
 2015-02-23 16:03:32 +01:00
Thomas Müller
df3c73de72 Merge pull request #14403 from owncloud/update-license-headers 
Update license headers
 2015-02-23 13:53:16 +01:00
Jenkins for ownCloud
6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Jenkins for ownCloud
f63b09faca [tx-robot] updated from transifex 2015-02-23 01:55:10 -05:00
Jenkins for ownCloud
ef09e5d395 [tx-robot] updated from transifex 2015-02-22 01:54:42 -05:00
Jenkins for ownCloud
906c0e7798 [tx-robot] updated from transifex 2015-02-21 01:54:38 -05:00
Jenkins for ownCloud
79ef5eda96 [tx-robot] updated from transifex 2015-02-20 01:55:01 -05:00
Vincent Petry
837365fff2 Merge pull request #14210 from owncloud/activity/225-sharing-extension-jenkins 
Activity/225 sharing extension
 2015-02-18 14:46:58 +01:00
Joas Schilling
0833a6e332 Correctly create activities for public downloads 2015-02-17 17:26:03 +01:00
Robin Appelman
5394a81c05 Dont fatal error test when encryption is enabled 2015-02-17 15:05:29 +01:00
Jenkins for ownCloud
31c0cce092 [tx-robot] updated from transifex 2015-02-15 01:54:31 -05:00
Jenkins for ownCloud
2f851ff8bb [tx-robot] updated from transifex 2015-02-14 01:54:42 -05:00
Joas Schilling
b768a70616 Use filterNotificationTypes to filter the types and group the methods 2015-02-13 11:30:36 +01:00
Joas Schilling
9ccfbc14f6 Copy sharing related activity code to Files_Sharing activity extension 2015-02-13 11:16:43 +01:00
Jenkins for ownCloud
e929d43bb6 [tx-robot] updated from transifex 2015-02-12 01:54:41 -05:00
Jenkins for ownCloud
124e48aec0 [tx-robot] updated from transifex 2015-02-10 01:55:06 -05:00
Morris Jobke
1bb6de7c1b Merge pull request #13425 from owncloud/phpdoc_cleanup 
Cleanup of PHPDoc return types
 2015-02-10 01:14:00 +01:00
Jenkins for ownCloud
e2d4b3c123 [tx-robot] updated from transifex 2015-02-09 01:54:53 -05:00
Jenkins for ownCloud
60e771685e [tx-robot] updated from transifex 2015-02-08 01:54:53 -05:00
Jenkins for ownCloud
4bf7b2c130 [tx-robot] updated from transifex 2015-02-07 01:54:35 -05:00
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
Bjoern Schiessle
8c48be453e only send activity if we have a valid path and the file is readable 2014-12-23 13:32:54 +01: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
Robin Appelman
3afcc71764 Make sure the path passed to the activity manager is normalized 2014-12-22 18:50:00 +01:00
Bjoern Schiessle
393deb5961 add activity if public shared file/folder was downloaded 2014-12-22 18:50:00 +01:00
Jenkins for ownCloud
92c8cd3933 [tx-robot] updated from transifex 2014-12-22 01:54:49 -05:00
Morris Jobke
510488ad3e Merge pull request #12942 from owncloud/favs-missingsharedsubdirs 
Fix issues with searchByTag in shared storage
 2014-12-21 10:38:34 +01: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
Bjoern Schiessle
24993280ed Next step in server-to-server sharing next generation, see #12285 
Beside some small improvements and bug fixes this will probably the final state for OC8.

To test this you need to set up two ownCloud instances. Let's say:

URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".

The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.

If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
 2014-12-19 15:20:24 +01: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
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
Vincent Petry
11b3aa2dbe Fix issues with searchByTag in shared storage 2014-12-18 17:27:56 +01:00
Robin Appelman
1ef01de402 Merge pull request #12907 from owncloud/delete-invalid-external-share 
Fix deleting invalid s2s shares
 2014-12-18 16:38:13 +01:00
Jan-Christoph Borchardt
9009f5f727 add empty alt text to decorative preview of public share image 2014-12-18 16:00:55 +01:00
Jan-Christoph Borchardt
ea548cdaaa fix accessibility of logos 2014-12-18 10:51:41 +01:00
Jenkins for ownCloud
5c6e08213e [tx-robot] updated from transifex 2014-12-18 01:56:40 -05:00
Jan-Christoph Borchardt
16c62a346c improve empty states for sharing and shared links as well 2014-12-17 21:22:28 +01:00
Jan-Christoph Borchardt
e3192bfa26 use empty state for 'Shared with you' as well 2014-12-17 21:13:53 +01:00
Robin Appelman
e656af4c83 Root always exists 2014-12-17 16:09:41 +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
Jenkins for ownCloud
5b9c453071 [tx-robot] updated from transifex 2014-12-16 01:55:32 -05:00
Jenkins for ownCloud
036456fe16 [tx-robot] updated from transifex 2014-12-15 01:54:30 -05:00
Jenkins for ownCloud
6ae0217326 [tx-robot] updated from transifex 2014-12-14 01:54:56 -05:00
Morris Jobke
29e1c3a898 Merge pull request #12795 from owncloud/files-layoutchanges 
Move file thumbnail element into the label tag
 2014-12-13 09:00:43 +01:00
Jenkins for ownCloud
416e21d902 [tx-robot] updated from transifex 2014-12-13 01:55:24 -05:00
Vincent Petry
4b57892c4e Merge pull request #12778 from owncloud/searchbytags2 
Added searchByTags to view, storage and cache
 2014-12-12 14:27:19 +01:00
Joas Schilling
4f92e4a233 Merge pull request #12808 from owncloud/add-special-parameterlist-to-manager 
Add special parameterlist to manager
 2014-12-12 13:03:26 +01: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
Joas Schilling
46def69574 Specify list of activity parameters for sharing extension 2014-12-12 11:41:01 +01:00
Vincent Petry
15ecb28d50 Make $userId mandatory for searchByTags 
$userId is now a mandatory parameter for searchByTags.

Also fixed some places in the code where the argument was missing (Node
API and View)
 2014-12-12 11:18:35 +01:00
Gadzy
ba3957fb8a Check for share by link enabled 
Display "Shared by link" section only if sharing by link is enabled.
 2014-12-12 10:23:51 +01:00
Jenkins for ownCloud
68932b30fd [tx-robot] updated from transifex 2014-12-12 01:55:24 -05:00
Vincent Petry
81e9d43e23 Move file thumbnail into the label element 2014-12-11 18:21:25 +01:00
Vincent Petry
25dde7e93b Added searchByTags to view, storage and cache 2014-12-11 17:38:50 +01:00
Jenkins for ownCloud
dc506dcfbf [tx-robot] updated from transifex 2014-12-11 01:55:27 -05:00
Morris Jobke
3026cdbc80 Merge pull request #12549 from owncloud/shared-cache-non-existing 
Dont return cached date in shared cache when the file doesn't exist
 2014-12-10 08:49:40 +01:00
Jenkins for ownCloud
ea95bb0189 [tx-robot] updated from transifex 2014-12-10 01:55:34 -05:00
Lukas Reschke
25a87d4058 Merge pull request #12577 from owncloud/public-mount-api 
Add a public api for apps to add mounts
 2014-12-08 22:57:33 +01:00
Morris Jobke
1362c0b67a Merge pull request #12452 from owncloud/server2server-ng-ocs 
OCS API for server-to-server sharing
 2014-12-08 14:12:03 +01:00
Jenkins for ownCloud
8ee9ee29ea [tx-robot] updated from transifex 2014-12-07 01:54:32 -05:00
Vincent Petry
bf887eca8b Remove obsoleted filelist prototype backup in tests 2014-12-04 18:39:20 +01:00
Robin Appelman
f4701d7721 Add public api for mount configurations 2014-12-04 16:47:27 +01:00
Bjoern Schiessle
698ecbf308 OCS API for server-to-server sharing 2014-12-04 13:18:13 +01:00
Jenkins for ownCloud
5aad902507 [tx-robot] updated from transifex 2014-12-04 01:54:42 -05:00
Robin Appelman
ce10b93519 Dont return cached date in shared cache when the file doesn't exist 2014-12-02 15:28:11 +01:00
Vincent Petry
c02ef69521 Simple Plugin system for Javascript 2014-12-01 16:20:44 +01:00
Jenkins for ownCloud
83d097c524 [tx-robot] updated from transifex 2014-11-29 01:54:28 -05:00
Morris Jobke
c5fa8f1bdc Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants 
Issue/6101 remove namespace permission constants
 2014-11-26 08:31:23 +01:00
Thomas Müller
e6a7022037 Merge pull request #12410 from owncloud/no_session_for_public_share_key 
don't store private public-share-key in session
 2014-11-25 22:26:40 +01:00
Joas Schilling
2c39aec8cb Replace deprecated constant with new class constant 2014-11-25 16:30:21 +01:00
Bjoern Schiessle
1d33503487 we no longer need to keep the session open for encryption 2014-11-25 13:37:11 +01:00
Morris Jobke
6fb2477fb7 Merge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplate 
Don't disclose relative directory path for single shared files of user
 2014-11-25 10:09:16 +01:00
Lukas Reschke
8589079590 Close session only if encryption app is not enabled 
Fixes https://github.com/owncloud/core/issues/12389
 2014-11-24 15:02:49 +01:00
Morris Jobke
8782b2237c Merge pull request #12084 from owncloud/sharing_fix_shared_with_info 
sharing: make sure that we only find the shares from a given owner
 2014-11-24 11:44:43 +01:00
Jenkins for ownCloud
0edcfc1dc1 [tx-robot] updated from transifex 2014-11-24 01:54:35 -05:00
Bjoern Schiessle
a7ebfe87c9 also check for the correct owner if it was submitted 2014-11-21 16:17:37 +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
Thomas Müller
cbb9caf030 Merge pull request #12226 from owncloud/remove-phpass 
Remove phpass and migrate to new Hasher interface
 2014-11-20 14:59:59 +01:00
Morris Jobke
46e6104795 Merge pull request #12297 from owncloud/issue/10991-all-testcase 
Issue/10991 all testcase
 2014-11-20 14:53:18 +01:00
Volkan Gezer
995fe4a176 cleanup languages. closes #11274 2014-11-20 14:46:17 +01:00
Vincent Petry
63fa8ec69a JSHint fixes in sharedfilelistSpec unit test file 2014-11-19 17:44:05 +01:00
Vincent Petry
98ec0451be Remove delete button in shared with others list 
Whenever a file is shared with others or with link, a delete button used
to be visible that triggered a direct deletion.

This button has been removed to avoid accidental deletion from people
who might believe it was an unshare button. Unsharing is still possible
inside the share dropdown.
 2014-11-19 17:42:57 +01:00
Joas Schilling
76ebd3a050 Make apps/ extend the \Test\TestCase and fix overwritten methods 2014-11-19 14:52:09 +01:00
Jenkins for ownCloud
705976ba0a [tx-robot] updated from transifex 2014-11-19 01:54:59 -05:00
Lukas Reschke
a6ebb17610 Remove unused variable and make Scrutinizer happy. 2014-11-18 18:52:00 +01:00
Lukas Reschke
f3ab4f3faf Don't disclose relative directory path for single shared files of user 
The "dir" key is used within the public sharing template to indicate in which directory the user currently is when sharing a directory with subdirectories. This is needed by the JS scripts.

However, when not accessing a directory then "dir" was set to the relative path of the file (from the user's home directory), meaning that for every public shared file the sharee can see the path.
(For example if you share the file "foo.txt" from "finances/topsecret/" the sharee would still see the path "finances/topsecret/" from the shared HTML template)

This is not the excpected behaviour and can be considered a privacy problem, this patch addresses this by setting "dir" to an empty key.
 2014-11-18 18:51:57 +01:00
Lukas Reschke
5f07fb15dc Fix case-sensitivity 2014-11-18 18:50:47 +01:00
Lukas Reschke
1b85f40cbe $file only contains the filename and not the absolute path, that means that files in a subdirectory will not get properly resolved and an empty filesize is returned. 
This feature only exists on master.
 2014-11-18 17:14:26 +01:00
Morris Jobke
230e517f35 Merge pull request #12220 from owncloud/remove-unused-code 
Remove unused code
 2014-11-18 10:36:32 +01:00
Morris Jobke
146cb920c9 Merge pull request #12218 from owncloud/issue/10991-fixes 
Issue/10991 Make unit tests pass on windows
 2014-11-17 16:44:45 +01:00
Lukas Reschke
8dbedbb849 Remove unused code 
We don't support direct updates from older ownCloud versions except the previous one therefore this code is unused and can be removed.
 2014-11-17 14:01:39 +01:00
Lukas Reschke
8595b76df2 Remove phpass and migrate to new Hasher interface 
This PR removes phpass and migrates to the new Hasher interface.

Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt.
Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
 2014-11-17 13:39:13 +01:00
Joas Schilling
a3a064fe96 Skip some more tests on Windows which just can not work at all 2014-11-17 10:48:06 +01:00
Vincent Cloutier
fad621140b Added download size on public sharing 2014-11-14 16:26:59 +01:00
Lukas Reschke
988c85d292 Refactor file sharing public link handling 
fixes download issue introduced by #10755

Conflicts:
	apps/files_sharing/public.php
 2014-11-14 16:26:59 +01:00