Commit Graph

3665 Commits

Author SHA1 Message Date
Joas Schilling ae693129db
Allow to find local users by their email address
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 18:07:47 +02:00
Bjoern Schiessle 2b3549610b
fix 'add to your nextcloud' input field, this is not an email address
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-13 17:46:46 +02:00
Joas Schilling b5beaf7ef4
Use the share_folder config for remote shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 14:30:25 +02:00
Nextcloud bot a74901fce1
[tx-robot] updated from transifex 2017-06-08 00:08:26 +00:00
Nextcloud bot a3c5d43cd5
[tx-robot] updated from transifex 2017-06-07 00:09:00 +00:00
Nextcloud bot bb884c341f
[tx-robot] updated from transifex 2017-06-06 00:08:45 +00:00
Nextcloud bot f03d6f225e
[tx-robot] updated from transifex 2017-06-04 00:08:29 +00:00
Nextcloud bot 5d39f700e4
[tx-robot] updated from transifex 2017-06-03 00:09:00 +00:00
Nextcloud bot c70de161cf
[tx-robot] updated from transifex 2017-06-02 00:08:30 +00:00
Nextcloud bot 8801b68d45
[tx-robot] updated from transifex 2017-06-01 00:08:38 +00:00
Nextcloud bot b9b7f8bede
[tx-robot] updated from transifex 2017-05-30 00:08:44 +00:00
Nextcloud bot 4be17dff0f
[tx-robot] updated from transifex 2017-05-29 00:08:33 +00:00
Nextcloud bot e3e3e8edf2
[tx-robot] updated from transifex 2017-05-27 00:08:32 +00:00
Nextcloud bot a46d2f1d39
[tx-robot] updated from transifex 2017-05-25 00:08:04 +00:00
Robin Appelman ed89034047
dont die if we try to access the shared cache while setting up the shared storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-24 13:56:09 +02:00
Nextcloud bot 9c8a838624
[tx-robot] updated from transifex 2017-05-23 00:08:29 +00:00
Joas Schilling 3ec9d91bd0
Split multi-author entries
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:39:49 +02:00
Joas Schilling bc8fbc1a67
Bump app versions as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:35:25 +02:00
Joas Schilling fdfe8f7f15
Adjust version requirement
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:32:05 +02:00
Nextcloud bot 462f12611c
[tx-robot] updated from transifex 2017-05-22 00:08:23 +00:00
Daniel Hansson 119e8474b6 fix for sharing
Signed-off-by: Daniel Hansson <daniel@techandme.se>
2017-05-20 16:23:04 +02:00
Björn Schießle 879e11e7d1 Merge pull request #4812 from nextcloud/move-sharing-to-migration
Move the file sharing app to migration
2017-05-18 18:24:43 +02:00
Nextcloud bot d41fd7471c
[tx-robot] updated from transifex 2017-05-18 00:07:48 +00:00
Nextcloud bot 11e04e394d
[tx-robot] updated from transifex 2017-05-17 15:56:32 +00:00
Nextcloud bot 443cbdc739
[tx-robot] updated from transifex 2017-05-17 00:08:09 +00:00
Jan-Christoph Borchardt c180ad1caa Remove primary class from public link download button 2017-05-16 20:47:52 +02:00
Morris Jobke 91dfff5db4 Revert "fix permissions of mountpoints - take 2" 2017-05-15 12:43:25 -05:00
Morris Jobke ad0d0b0916 Merge pull request #4685 from nextcloud/fix_4683
fix permissions of mountpoints - take 2
2017-05-15 11:53:59 -05:00
Robin Appelman 9b750c08ac
update comment to code
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-15 15:54:37 +02:00
Nextcloud bot 6e3a914f4a
[tx-robot] updated from transifex 2017-05-13 00:08:00 +00:00
Joas Schilling 51757716ec
Fix the share type of guest shares when migrating from ownCloud
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:38:48 +02:00
Joas Schilling 643b4a4ec4
Move the file sharing app to migration
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:38:48 +02:00
Nextcloud bot 645f0aa96f
[tx-robot] updated from transifex 2017-05-12 00:07:46 +00:00
Nextcloud bot 241226c23c
[tx-robot] updated from transifex 2017-05-11 00:08:08 +00:00
Nextcloud bot fb78774eb8
[tx-robot] updated from transifex 2017-05-10 00:08:31 +00:00
Nextcloud bot 37b847ec48
[tx-robot] updated from transifex 2017-05-09 05:08:07 +00:00
Nextcloud bot 6109afc14d
[tx-robot] updated from transifex 2017-05-08 00:07:37 +00:00
Roeland Jago Douma 412d3e2e80
Fix SharedStorage Test
A moveable mount point (What a SharedStorage is) always has DELETE +
UPDATE permissions. Since you can either delete (unshare) or update
(rename) it.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-04 08:43:05 +02:00
blizzz 4e4bc17ff5 Merge pull request #4545 from individual-it/access-control-3726
show error message when "files-drop" upload fails
2017-05-03 00:21:40 +02:00
Roeland Jago Douma 24ff230f93 Merge pull request #4620 from nextcloud/preview-error-handling
better handling of preview generation errors
2017-05-02 21:49:14 +02:00
Morris Jobke 23cc309606
Handle more error cases
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-02 13:43:48 +02:00
Nextcloud bot f27d382c47
[tx-robot] updated from transifex 2017-05-02 00:07:20 +00:00
Bjoern Schiessle 9a366dbe2e
add missing translation and other small fixes
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle 866e5d6d05
use configured lookup server
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Robin Appelman ab9a36e872
allow apps to set custom mount types
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-28 09:38:21 +02:00
Artur Neumann f2f2e7b6fb some small refactoring and reformating
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-27 14:16:55 +05:45
Artur Neumann 79c760a10c use jqXHR.fail() to check for failures
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-27 14:16:36 +05:45
Vincent Petry 17a31a51c6
Fix share indicator handling
Properly update the fileInfoModel with the updated share types, which
also updates the file list row indicator properly
2017-04-26 13:38:12 +02:00
Nextcloud bot 133f3fdc9a
[tx-robot] updated from transifex 2017-04-25 00:07:30 +00:00
Roeland Jago Douma c5617f4e8a Merge pull request #4463 from danxuliu/fix-working-icon-placement-on-password-save
Fix working icon placement on password save
2017-04-24 14:34:56 +02:00
Daniel Calviño Sánchez 36f55b5867 Fix working icon placement on password save
Before, the icon appeared below the text input for the password. Now, it
appears inside the text input, to the right end.

The CSS was adjusted based on other icons shown in that position for
other text inputs in the Share tab view, like the information icon or
the clipboard icon.

Fixes #4135

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 11:50:06 +02:00
Joas Schilling 3d671cc536 Merge pull request #4443 from nextcloud/cleanup-unused-imports
Remove unused use statements
2017-04-24 11:47:37 +02:00
Morris Jobke c54a59d51e
Remove unused use statements
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 19:23:31 -05:00
Nextcloud bot 11c7953888
[tx-robot] updated from transifex 2017-04-23 00:07:31 +00:00
Roeland Jago Douma e9b00f84b8 Merge pull request #4406 from nextcloud/fix-unit-test-problems
Fix unit test problems
2017-04-21 09:35:01 +02:00
Morris Jobke f5b900b654 Merge pull request #4412 from individual-it/master
deleted forgotten code in test
2017-04-20 18:04:32 -05:00
Artur Neumann faf55adb90 deleted forgotten code in test
how embarrassing, left code from before I've done the loop around the test
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-20 22:27:51 +05:45
Björn Schießle 810fb7ff2c Merge pull request #4402 from nextcloud/fix-clickable-area
Fix clickable area in share permissions menu
2017-04-20 16:49:00 +02:00
Joas Schilling a0ada9aab4
Don't use deprecated getMock() anymore
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:30:21 +02:00
Joas Schilling b469882595 Merge pull request #4212 from individual-it/master
validate file name before uploading in upload only folder
2017-04-20 10:50:56 +02:00
Morris Jobke 16b8397765
Fix clickable area in share permissions menu
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 17:41:26 -05:00
Morris Jobke 4be923e459
Improve menu CSS
* fix mess with menus and actions in the files app
* reduces amount of !important usages
* keeps the behaviour on mobile as well as on desktop

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 12:42:23 -05:00
Roeland Jago Douma ad24b86013 Merge pull request #4350 from nextcloud/adjust-old-bruteforce-protection-annotations
Adjust existing bruteforce protection code
2017-04-19 09:27:23 +02:00
Artur Neumann bf58d24b5c remove accidently left over *f*it
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-18 20:53:49 +05:45
Artur Neumann 88f02f27a3 JS tests for upload only function
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-18 20:43:25 +05:45
Artur Neumann cdb65eff34 refactor to make it easier to test
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-18 20:42:36 +05:45
Nextcloud bot b072d2c49d
[tx-robot] updated from transifex 2017-04-18 00:07:25 +00:00
Nextcloud bot dafa9c740a
[tx-robot] updated from transifex 2017-04-15 00:07:36 +00:00
Lukas Reschke 727688ebd9
Adjust existing bruteforce protection code
- Moves code to annotation
- Adds the `throttle()` call on the responses on existing annotations

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-14 13:42:40 +02:00
Nextcloud bot 0f96d5a641
[tx-robot] updated from transifex 2017-04-14 00:07:36 +00:00
Morris Jobke ec034757fa Merge pull request #4337 from nextcloud/fix-adblock-share-icon
Fix AdBlock blocking share icon, ref #866
2017-04-13 12:10:37 -05:00
Lukas Reschke 66835476b5
Add support for ratelimiting via annotations
This allows adding rate limiting via annotations to controllers, as one example:

```
@UserRateThrottle(limit=5, period=100)
@AnonRateThrottle(limit=1, period=100)
```

Would mean that logged-in users can access the page 5 times within 100 seconds, and anonymous users 1 time within 100 seconds. If only an AnonRateThrottle is specified that one will also be applied to logged-in users.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:16 +02:00
Lukas Reschke 06f8ea247b
Remove invalid route
Said file doesn't exist anymore and accessing it would just return a 500

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 11:05:44 +02:00
Nextcloud bot 396618fd19
[tx-robot] updated from transifex 2017-04-13 00:08:02 +00:00
Morris Jobke 31024b7700 Merge pull request #4329 from nextcloud/move-out-shared-folder
Fix moving files out of a shared folder
2017-04-12 11:44:26 -05:00
Björn Schießle b90e91144b Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints
Discover federatedsharing endpoints
2017-04-12 16:01:07 +02:00
Jan-Christoph Borchardt 37145a275f Fix AdBlock blocking share icon, ref #866
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-12 15:04:12 +02:00
Robin Appelman 2f949f4515
rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::getSourcePath
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 14:55:47 +02:00
Björn Schießle 35188899e9 Merge pull request #4316 from nextcloud/cleanup-files_sharing-update
[files_sharing] Remove unneeded update steps
2017-04-12 10:56:25 +02:00
Morris Jobke 4d7c7b1816
[files_sharing] Remove unneeded update steps
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 00:49:50 -05:00
Morris Jobke 1729e4471f
Update comments to Nextcloud
* based on PR by @Ardinis
* see #4311

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 23:16:27 -05:00
Michael Jobst 81b1dc4930
share api expanded by tags (#26583)
* share api expanded by tags

* Modified files_sharing JS Unit tests

* modified tests. renamed request parameter. refactoring

* Update Share20OCS.php

Added missing function description

* Update Helper.php

Added missing function description

* Update Helper.php

implicit boolean conversion to !empty()

* Update Share20OCSTest.php

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 11:54:13 -05:00
Morris Jobke 45a6e37699 Merge pull request #4293 from nextcloud/fix_4248
Do reload shared views
2017-04-11 11:53:01 -05:00
Roeland Jago Douma 53bca14a27
Do proper DI
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle 449011dae7
remove discovery manager in favour of the OCSDiscoveryService
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Lukas Reschke afb5d45705 Merge pull request #4256 from nextcloud/theming
Move OC_Defaults to OCP\Defaults
2017-04-11 14:39:46 +02:00
Roeland Jago Douma 8c01e45d6b
Do reload shared views
Fixes #4248

The magic introduced in #3686 caused the shared views not to be updated
properly. Thus we just overwrite the _onUrlChange method in the
sharedfilelist.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 09:33:27 +02:00
Nextcloud bot 4d90b0520e
[tx-robot] updated from transifex 2017-04-11 00:07:29 +00:00
Bjoern Schiessle cbacca4202
move capabilities to share by mail app
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-10 17:18:13 +02:00
Morris Jobke 5b4adf66e5
Move OC_Defaults to OCP\Defaults
* currently there are two ways to access default values:
  OCP\Defaults or OC_Defaults (which is extended by
  OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
  it hard to work on theme values
* this extended the public interface with the missing
  methods and uses them everywhere to only rely on the
  public interface

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-09 21:43:01 -05:00
Nextcloud bot 4b0f50c456
[tx-robot] updated from transifex 2017-04-08 00:07:45 +00:00
Morris Jobke ca9d25169d Merge pull request #4136 from nextcloud/expire-date-for-all-shares
Unified sharing options
2017-04-07 17:14:05 -05:00
Bjoern Schiessle 3323d01db1
update unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +02:00
Bjoern Schiessle 676a4c781a
update capabilities
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +02:00
Nextcloud bot 536650c02f
[tx-robot] updated from transifex 2017-04-07 00:09:11 +00:00
Nextcloud bot 7d9688c89e
[tx-robot] updated from transifex 2017-04-06 00:07:50 +00:00
Artur Neumann 3795636b90 validate file name before uploading in upload only folder
fixes #4211

Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-05 13:26:40 +05:45
Nextcloud bot 84035862f7
[tx-robot] updated from transifex 2017-04-05 00:08:20 +00:00
Nextcloud bot ec5377306d
[tx-robot] updated from transifex 2017-04-04 00:07:46 +00:00
Bjoern Schiessle b84fd7c361
set expire date for all share types
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle c191173d59
allow password protected mail shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle 0d5147bd49
add new password column to the share table in order to set passwords for share by mails
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:20:49 +02:00
Nextcloud bot 9098042c95
[tx-robot] updated from transifex 2017-04-01 00:08:09 +00:00
Nextcloud bot 6a6300b1f2
[tx-robot] updated from transifex 2017-03-31 00:08:35 +00:00
Roeland Jago Douma 4821c00ea8 Merge pull request #4004 from nextcloud/backport-27172
Remove SharedCache::getNumericStorageId to let CacheWrapper do it
2017-03-28 21:56:44 +02:00
Robin Appelman ae3016959e
fix shared storage numeric id
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-27 14:05:18 +02:00
Nextcloud bot d9ebc2626f
[tx-robot] updated from transifex 2017-03-27 00:07:55 +00:00
Nextcloud bot 0981f9a18a
[tx-robot] updated from transifex 2017-03-26 01:07:03 +00:00
Nextcloud bot 4ea79a5bbe
[tx-robot] updated from transifex 2017-03-25 01:07:45 +00:00
Roeland Jago Douma 48158c8bec
Combine additional files_sharing scripts
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
Morris Jobke a5a29ee27a Merge pull request #3953 from nextcloud/downstream-27027
Ignore NoUserException for shares from ghosts
2017-03-23 15:26:43 -06:00
Morris Jobke 869ba16273
do not remove the method and only keep the tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 13:10:43 -06:00
Robin Appelman a12ec5ec77
set cache to failedcache when shared storage init fails
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-23 15:01:23 +01:00
Vincent Petry 89c42a76c3
Remove SharedCache::getNumericStorageId to let CacheWrapper do it
The CacheWrapper will properly forward the call to the wrapped cache.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 00:02:48 -06:00
Nextcloud bot 39ac804899
[tx-robot] updated from transifex 2017-03-23 01:07:52 +00:00
Nextcloud bot d551b8e6fd
[tx-robot] updated from transifex 2017-03-22 21:14:04 +00:00
Roeland Jago Douma 16a0bccefa Merge pull request #3972 from nextcloud/merge-some-more-css
Merge some CSS files using our SCSS compiler
2017-03-22 08:46:10 +01:00
Nextcloud bot cae8702ab2
[tx-robot] updated from transifex 2017-03-22 01:07:53 +00:00
Joas Schilling 20a0a18fbd
Fix reshare with user activity message
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-21 16:54:28 -06:00
Morris Jobke 1084cdb613
fix path
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 15:33:28 -06:00
Lukas Reschke 5c7ad6d3ec
Merge some CSS files using our SCSS compiler
This saves around 4 requests on the average page load.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-21 16:35:31 +01:00
Roeland Jago Douma 7e95837097 Merge pull request #3955 from nextcloud/downstream-27113
Can we get some faster phpunit execution?
2017-03-21 11:27:00 +01:00
Nextcloud bot fd0e42e093
[tx-robot] updated from transifex 2017-03-21 01:08:16 +00:00
Thomas Müller 5bfce597a9
[CI] Can we get some faster phpunit execution? (#27113)
* Don't backup globals and static attributes

* Unset global variable to remove impact on followup tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 12:34:05 -06:00
Robin Appelman 0c1b7fdcb5
return failed cache if the shared storage failed to setup
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-20 18:31:34 +01:00
Robin Appelman f2e981e269
also set nonmaskedstorage in error cases
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-20 18:17:53 +01:00
Joas Schilling 35f6b8716e Merge pull request #3884 from nextcloud/downstream-26956
Skip null groups in group manager
2017-03-20 12:27:38 +01:00
Joas Schilling 25f772d592 Merge pull request #3868 from nextcloud/issue-3834-escape-theming-footer
Correctly escape the footer description from theming
2017-03-20 11:56:29 +01:00
Vincent Petry 78ee125c34
Fix public link download button
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 02:39:46 -06:00
Vincent Petry a4ce440392
Ignore NoUserException for shares from ghosts
Add unit tests for FailedStorage init from SharedStorage

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 01:43:24 -06:00
Nextcloud bot 528a903a7b
[tx-robot] updated from transifex 2017-03-20 01:07:43 +00:00
Roeland Jago Douma ef789f8480 Merge pull request #3906 from nextcloud/shares-circles-2
Support Circles
2017-03-19 20:45:55 +01:00
Nextcloud bot 1983606f80
[tx-robot] updated from transifex 2017-03-19 01:08:20 +00:00
Maxence Lange 69694012ab shares-circles
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-03-17 18:48:33 -01:00
Joas Schilling bd97b7d130
Use DI
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 10:23:04 +01:00
Joas Schilling 199405ddc0
Safer queries
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 09:59:56 +01:00
Joas Schilling 0a1135a7cc
Better output
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 09:59:25 +01:00
Joas Schilling e8750f618b
Correctly escape the footer description from theming
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 09:11:41 +01:00
Jörn Friedrich Dreyer 5155a5288c
Add CleanupRemoteStorages command
cleanup files, address review

Fix CleanupRemoteStoragesTest tests

Fix test expectation.
Added files count to check filecache deletion.

Sort by numeric id for deterministic test results

Removed precise order test and added storage check

Remove inaccurate removal message check which has a different order on
Oracle.

Added more checks to confirm that existing storages still exist.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:09:52 -06:00
Vincent Petry 377fdf3860
Skip null groups in group manager (#26871) (#26956)
* Skip null groups in group manager (#26871)

* Skip null groups in group manager

* Also skip null groups in group manager's search function

* Add more group null checks in sharing code

* Add unit tests for null group safety in group manager

* Add unit tests for sharing code null group checks

* Added tests for null groups handling in sharing code

* Ignore moveShare optional repair in mount provider

In some cases, data is inconsistent in the oc_share table due to legacy
data. The mount provider might attempt to make it consistent but if the
target group does not exist any more it cannot work. In such case we
simply ignore the exception as it is not critical. Keeping the
exception would break user accounts as they would be unable to use
their filesystem.

* Adjust null group handing + tests

* Fix new group manager tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:07:03 -06:00
Nextcloud bot 5683365a2c
[tx-robot] updated from transifex 2017-03-17 01:07:41 +00:00
Lukas Reschke 39afcbd49f Merge pull request #3679 from nextcloud/socialsharing
Add social sharing
2017-03-16 23:08:47 +01:00
Morris Jobke 13aae43d89
Fix layout of sharing buttons
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-14 22:52:28 -06:00
Jörn Friedrich Dreyer fbd2dd49b6
use closure to properly defer l10n initialization (#27328) 2017-03-13 08:52:54 +01:00
Nextcloud bot 0dd0242d2f
[tx-robot] updated from transifex 2017-03-13 01:08:19 +00:00
Nextcloud bot 37fcc41004
[tx-robot] updated from transifex 2017-03-12 01:08:05 +00:00
Morris Jobke a5ba1f7803
Remove legacy class OC_Group and OC_User
* basically a straight replacement of the wrapped code at the calling code parts

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-09 17:35:09 -06:00
Roeland Jago Douma fd71b8bde8
Move social buttons to menu
* If there are social sharing buttons move them and the copy action to a
menu
* If there are no social sharing buttons just leave the copy action
where it is directly

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-03 13:27:06 +01:00
Nextcloud bot b55ce43ba5
[tx-robot] updated from transifex 2017-03-03 01:07:45 +00:00
Nextcloud bot 53195b156c
[tx-robot] updated from transifex 2017-03-02 16:48:52 +00:00
Nextcloud bot 556b958af2
[tx-robot] updated from transifex 2017-02-25 01:25:07 +00:00
Lukas Reschke dd6d2893a6 Merge pull request #3588 from GreenArchon/issue_#3461
Typecast shared mount's storage_id to int as documented + some refactor to avoid similar bugs
2017-02-24 17:25:21 +01:00
Björn Schießle 621f920d68 Merge pull request #3567 from nextcloud/autocomplete-settings
some sharing settings
2017-02-22 16:30:21 +01:00
Bjoern Schiessle fe46c6f743
use (int) instead of intval for performance reasons
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-02-22 15:14:36 +01:00
John Molakvoæ 182bfd9f23 Merge pull request #3570 from nextcloud/fix-share-loading
Fix position of share autocomplete loading icon
2017-02-22 10:20:56 +01:00
Nextcloud bot a08dfd9951
[tx-robot] updated from transifex 2017-02-22 01:12:24 +00:00
Morris Jobke f0b588621c
Fix position of share autocomplete loading icon
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-21 17:39:32 -06:00
Morris Jobke 02ea84f50f
properly include class
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-21 17:24:40 -06:00
Morris Jobke 8e3d0fecd2
Use intval() for validation of config options
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-21 17:22:06 -06:00
Bjoern Schiessle 869ea38ffe
allow to configure a min-length of search strings for auto-compeltion and a max number for of results returned
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-02-21 18:31:20 +01:00
Frédéric Fortier cc511ac7b8 Typecast filecache 'storage' as int to return it as documented, fixes #3461
Signed-off-by: Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
2017-02-20 22:23:27 -05:00
Nextcloud bot 51f06bb1f8
[tx-robot] updated from transifex 2017-02-19 01:07:37 +00:00
Morris Jobke c5dffc465c Merge pull request #3472 from nextcloud/enable-avatars-always
Always enable avatars
2017-02-14 09:22:02 -06:00
Nextcloud bot 7113af3f91
[tx-robot] updated from transifex 2017-02-14 01:07:20 +00:00
Morris Jobke 200a28255e
Always enable avatars
* we introduced this setting in the begining because our
  avatar support caused some performance issues, but we
  fixed them and should only provide one way how Nextcloud
  looks

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-13 17:53:33 -06:00
Nextcloud bot 01b3da612b
[tx-robot] updated from transifex 2017-02-11 01:07:23 +00:00
Nextcloud bot c2e61362cc
[tx-robot] updated from transifex 2017-02-10 01:07:02 +00:00
Robin Appelman bf88060a98 Merge pull request #3297 from nextcloud/cloud-id-resolve
Add a single public api for resolving a cloud id to a user and remote and back
2017-02-09 14:54:32 +01:00
Nextcloud bot 3c4b539fdf
[tx-robot] updated from transifex 2017-02-09 01:07:10 +00:00
Robin Appelman 976cff780b
register cloudidmanager for files_sharing
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:03 +01:00
Robin Appelman fa49c4a13b
Add a single public api for resolving a cloud id to a user and remote and back
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:02 +01:00
Joas Schilling 54e39d4b93
Fix files sharing legacy as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-08 11:55:50 +01:00
Joas Schilling d318e2b005
Fix Sharing app description
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-02 16:22:21 +01:00
Nextcloud bot 1952560ac7
[tx-robot] updated from transifex 2017-02-01 01:06:57 +00:00
Nextcloud bot bbcb1dd2e0
[tx-robot] updated from transifex 2017-01-30 01:07:14 +00:00
Nextcloud bot b614547ff8
[tx-robot] updated from transifex 2017-01-28 01:06:59 +00:00
Bjoern Schiessle ed55b87b65
add brute force protection for public link authentication
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-25 18:17:08 +01:00
Björn Schießle 5873a0a7d4 Merge pull request #3231 from nextcloud/allow-editing-public-links
allow editing single files shared as public link
2017-01-25 15:35:57 +01:00
Nextcloud bot c3e57d228f
[tx-robot] updated from transifex 2017-01-25 01:10:00 +00:00
Bjoern Schiessle 92d7dd4781
allow editing single files shared as public link
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-24 13:41:27 +01:00
Christoph Wurst 47c63e6a3e
fix public sharing buttons
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-23 09:08:10 +01:00
Christoph Wurst a1f9425e65
fix log and app name
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-23 09:06:45 +01:00
Christoph Wurst bfa50a4444
more cleanup
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-23 09:06:45 +01:00
John Molakvoæ 7eec5e0c27 Merge pull request #3190 from nextcloud/fix-sharing-popover
Fix #3174
2017-01-22 20:40:48 +01:00
Morris Jobke 0d6e3ca86b Merge pull request #3187 from nextcloud/inputs-scss-optimisation
Inputs.scss rewritting and optimisation
2017-01-22 11:41:49 -06:00
John Molakvoæ (skjnldsv) 4c47b8e3a3
Fixed public share download button
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 17:32:51 +01:00
John Molakvoæ (skjnldsv) 0a400c4259
Fixed sharing js
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 17:26:59 +01:00
John Molakvoæ (skjnldsv) 6a617fa721
Fixed public share header buttons
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 17:25:02 +01:00
John Molakvoæ (skjnldsv) ba8a9a9cd2
Login and authenticate inputs fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 16:38:07 +01:00
Nextcloud bot 012e521239
[tx-robot] updated from transifex 2017-01-22 01:07:52 +00:00
John Molakvoæ (skjnldsv) f40e5b73f7
Fix #3174
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-21 19:06:57 +01:00
Nextcloud bot 4bbd52b3f9
[tx-robot] updated from transifex 2017-01-18 01:07:38 +00:00
Nextcloud bot b1a82969e6
[tx-robot] updated from transifex 2017-01-17 01:07:54 +00:00
Nextcloud bot c35ea15916
[tx-robot] updated from transifex 2017-01-11 15:20:22 +00:00
Roeland Jago Douma a5bf14ada3 Merge pull request #2955 from nextcloud/make-share-by-mail-work-without-linkshares
share by mail should continue to work, even if public links are disabled
2017-01-10 13:06:20 +01:00
Nextcloud bot 4f9ff96f79
[tx-robot] updated from transifex 2017-01-09 08:24:58 +00:00
Nextcloud bot d9035e2805
[tx-robot] updated from transifex 2017-01-05 13:09:52 +00:00
Bjoern Schiessle 0c11209d33
allow to access mail shares even if public links are disabled
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-04 21:23:26 +01:00
Roeland Jago Douma fdf10e242d Merge pull request #2850 from nextcloud/downstream-26603
Fixed size issues on main detail view and disappearing of share recipients (#26603)
2017-01-02 21:19:43 +01:00
Nextcloud bot 0d24e5d5f9
[tx-robot] updated from transifex 2017-01-02 01:07:33 +00:00
Nextcloud bot 52b734b3e4
[tx-robot] updated from transifex 2016-12-29 01:07:59 +00:00
Nextcloud bot 3fc4e1b5b9
[tx-robot] updated from transifex 2016-12-26 01:09:23 +00:00
Michael Jobst 969c19b2e9
Fixed size issues on main detail view and disappearing of share recipients (#26603)
* fixed size issues on main detail view and disappearing of share recipients

* Changes due to code comments

* Moved reloadProperties() to FileInfoModel

* Solved Scrutinizer issues

* Bugfix: undefined value used on error

* check if options are set for FileInfoModel.initialize()

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-23 16:56:55 +01:00
Arthur Schiwon b4d779977a
fix tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-22 19:33:09 +01:00
Vincent Petry 14256d631c
Use group display name in sharing API + UI 2016-12-22 18:35:32 +01:00
Morris Jobke 6789685c4e Merge pull request #2759 from nextcloud/kill-appconfig-delete-share-link
Remove config change hook that deletes link shares (#26612)
2016-12-22 14:45:20 +01:00
Vincent Petry 000ba6484f
When grouping shares, sort by stime then id (#26777)
If share times are equal, the first share should still win instead of
having the shares swapped.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:38:33 +01:00
Vincent Petry 9473ab5c19
Remove config change hook that deletes link shares (#26612)
Seems broken. But also if link shares are not allowed, the link shares
will continue to exist but will be denied.

A future cleanup could be done through a background job.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 16:18:51 +01:00
Lukas Reschke 6fd421cc3c Merge pull request #2695 from nextcloud/remove-leading-slashes-on-share-activity
Remove leading slash from sharing activity
2016-12-16 13:20:27 +01:00
Lukas Reschke 5b474e72d5 Merge pull request #2673 from nextcloud/shared-scanner-unmasked
use unmasked permissions in shared scanner
2016-12-15 15:54:32 +01:00
Joas Schilling 6de0eb0b74
Remove leading slash from sharing activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-15 15:53:48 +01:00
Robin Appelman 5d0897b8d7
use unmasked permissions in shared scanner
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-14 14:37:51 +01:00
Roeland Jago Douma cd1929382f Merge pull request #2654 from nextcloud/increase-master-version
Update app versions and requirements
2016-12-14 11:20:58 +01:00
Roeland Jago Douma 9e353f6289
Fix overwriting parameter
Fixes #2641

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-13 22:28:09 +01:00
Joas Schilling edec1fafe7
Update app versions and requirements
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-13 20:41:55 +01:00
Lukas Reschke edd01e3ce4 Merge pull request #2637 from nextcloud/mount-cache-storageid
also compare storage ids when checking for changed mounts
2016-12-13 14:02:49 +01:00
Robin Appelman bbe24d29ca
reuse cacheentry
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-13 12:30:29 +01:00
Maxence Lange 43374292b1 update phpdoc
Signed-off-by: Maxence Lange <maxence@pontapreta.net>
2016-12-12 16:15:13 -01:00
Maxence Lange 9ef8d25e46 Download a file in a subfolder in a sharedlink is not working
the $node created using the path (GET) parameter is not used when executing fileListDownloaded()
2016-12-11 18:32:28 -01:00
Nextcloud bot 74d1b0bada
[tx-robot] updated from transifex 2016-12-08 01:07:26 +00:00
Nextcloud bot ea801d7d7c
[tx-robot] updated from transifex 2016-12-07 01:07:46 +00:00
Nextcloud bot 3bea7ac6ac
[tx-robot] updated from transifex 2016-12-04 01:07:30 +00:00
Lukas Reschke 1131338562 Merge pull request #2486 from nextcloud/shared-storage-mask
apply permissions mask for shared storage
2016-12-02 23:39:48 +01:00
John Molakvoæ (skjnldsv) 14219c1082
Fix loader position and visibility
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 18:10:11 +01:00
John Molakvoæ (skjnldsv) ef04bea5fb
Fix popover arrow
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 18:10:08 +01:00
Robin Appelman 02ee4f958c
apply permissions mask for shared storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-02 17:59:02 +01:00
John Molakvoæ (skjnldsv) 8a12f0bc8f
Fix unshare delete icon
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 17:52:24 +01:00
Morris Jobke 0853f0e7a8
Remove white background from loading icon
* allows to use the loading icon on non-white background (disabled input fields for example)
* fixes #2466

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-02 12:39:12 +01:00
Morris Jobke ac1bf3c2b7 Merge pull request #2432 from nextcloud/activity-mail-language
Make sure the activity emails can be sent in the users language
2016-12-01 23:01:00 +01:00
Lukas Reschke a87638c6ab Merge pull request #2371 from nextcloud/issue-2369-add-share-indicator-for-mail-shares
Add share indicator for mail shares
2016-12-01 12:17:56 +01:00
Joas Schilling b2f46bfa04
Adjust all implementations in the server repo
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-01 11:35:23 +01:00
Nextcloud bot 4ca7f9c896
[tx-robot] updated from transifex 2016-12-01 01:07:17 +00:00
Roeland Jago Douma 05b86faccc
Display link share icon when toggling share
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-30 09:35:38 +01:00
Joas Schilling 09e5e38591
Add an icon when the file is shared by mail
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 09:21:58 +01:00
Morris Jobke db84c1c872
Fix missing text for downloads on mobile
* fixes #2362

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-29 17:06:09 +01:00
John Molakvoæ (skjnldsv) a984f4b430
Fix #2384
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-29 07:06:41 +01:00
Nextcloud bot e8ea9a5d27
[tx-robot] updated from transifex 2016-11-29 01:06:47 +00:00
Lukas Reschke 9def8225c0
Fix image_src link
The link in the image_src link (used for previews on Social Media such as Facebook) was still using the old route. This changes it to use the new route.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-28 16:20:57 +01:00
Nextcloud bot 4e682d4113
[tx-robot] updated from transifex 2016-11-28 01:06:56 +00:00
Nextcloud bot 9788cf04ee
[tx-robot] updated from transifex 2016-11-27 01:07:08 +00:00
Nextcloud bot 8f4ec8583d
[tx-robot] updated from transifex 2016-11-26 01:06:57 +00:00
Jan-Christoph Borchardt e75dede590 fix some outdated naming
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-24 16:05:05 +01:00
Joas Schilling 1c564fd554 Fix placeholder typo in public link activity
https://www.transifex.com/nextcloud/nextcloud/translate/#152/files_sharing/101548786/
2016-11-23 21:43:14 +01:00
Morris Jobke 59db9fada2 Merge pull request #2281 from nextcloud/fix-translation
Fix language typo
2016-11-23 17:53:21 +01:00
Joas Schilling 14f01dbe33
Fix language typo
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 16:55:49 +01:00
Lukas Reschke 2eca9cc384 Merge pull request #2262 from nextcloud/specify-parameters-on-public-download
Specify the parameters on public download
2016-11-23 14:02:38 +01:00
Joas Schilling a36d26950e
Only do stuff when its a remote-share activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 22:46:18 +01:00
Joas Schilling e9336dddd5
Specify the parameters on public download
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 20:14:42 +01:00
Roeland Jago Douma 08ef7356f6 Merge pull request #2165 from nextcloud/sharing-activities-update
Move file sharing activities to the new API
2016-11-22 10:19:15 +01:00
Nextcloud bot b0cf78aa1e
[tx-robot] updated from transifex 2016-11-22 01:06:54 +00:00
Lukas Reschke 7b3855a375
Add config switch
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
Roeland Jago Douma 15c075eba8
Fix lookup url
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:01 +01:00
Roeland Jago Douma f7f70028d1
Search on lookup server
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:00 +01:00
Nextcloud bot ba9b17c906
[tx-robot] updated from transifex 2016-11-21 01:06:58 +00:00
Lukas Reschke 6c11c54434 Merge pull request #2196 from nextcloud/cache-owner-displayname
cache the displayname of the share owner
2016-11-18 13:51:24 +01:00
Morris Jobke ccdf387041 Merge pull request #2184 from nextcloud/share-join-cache
Get the share root info directly when querying for shares
2016-11-18 11:33:33 +01:00
Robin Appelman dbd7f6dea6
cache the displayname of the share owner
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-18 11:26:00 +01:00
Nextcloud bot 00fffae47f
[tx-robot] updated from transifex 2016-11-18 01:07:04 +00:00
Jan-Christoph Borchardt 6fa5c18a79 Merge pull request #2136 from nextcloud/sharing-layout
Sharing layout fixes
2016-11-18 00:40:46 +01:00
Jan-Christoph Borchardt a32c781326 use copy icon for local link rather than link icon to prevent confusion with sharing
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 21:46:07 +01:00
Jan-Christoph Borchardt 88865e9728 properly align input box items in share tab view
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 19:11:49 +01:00
Jan-Christoph Borchardt 5eab1cdece fix layout of sharing list
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 19:02:33 +01:00
Robin Appelman b85459964c
fix getting root entry when not provided by the share provider
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-17 18:48:39 +01:00
Robin Appelman 2f03fcab4a
let the share backend get the node cacheentry to save queries
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-17 18:48:38 +01:00
Robin Appelman 065753f0ae
dont use the source cache/storage until needed
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-17 18:48:38 +01:00
Robin Appelman 30e7c27d86
reuse the known rootinfo in the shared cache when possible
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-17 14:59:31 +01:00
Nextcloud bot ab18d2f55e
[tx-robot] updated from transifex 2016-11-17 01:07:02 +00:00
Morris Jobke b373f52fa8
only use one kind of hack for the storage wrappers of the sharing code
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-16 19:04:47 +01:00
Joas Schilling bdaf334c53
Move file sharing activities to the new API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 16:45:08 +01:00
Lukas Reschke bc1008ac38
Use 11.0 instead 9.2
As discussed we're changing the version from 9.2 to 11.0 to make some more sense.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-15 14:45:58 +01:00
Nextcloud bot 571c5aac5e
[tx-robot] updated from transifex 2016-11-15 01:07:05 +00:00
Morris Jobke 42d754becd Merge pull request #2084 from nextcloud/files_drop_avatars_disabled
Fixes files_drop when avatars are disabled
2016-11-14 17:14:09 +01:00
Roeland Jago Douma ff96fffe39 Merge pull request #2100 from nextcloud/do_not_increse_link_share_perms
Fixes not allowed increasing of link share permissions
2016-11-14 15:21:08 +01:00
Morris Jobke 16a110e803 Merge pull request #2067 from nextcloud/fileinfo-lazy-substorages
only query substorages to calculate the final mtime/size/etag when we need it
2016-11-14 11:39:02 +01:00
Nextcloud bot 8c1cd07de3
[tx-robot] updated from transifex 2016-11-14 01:07:06 +00:00
Roeland Jago Douma 965981486f
Fixes not allowed increasing of link share permissions
Fixes the following:

1. user0 shares folder with user1 (RO but with sharing permissions)
2. user1 shares by link
3. user1 send 'publicUpload=true' OCS request to the link share

before this increased the permissions of the link share. Which should
not happen.

now: API reponds with an error that the permissions can't be increased.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-13 20:29:34 +01:00
Roeland Jago Douma 1056692fff
Fixes files_drop when avatars are disabled
Fixes: #2080

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-13 14:39:38 +01:00
Nextcloud bot 150b86a7db
[tx-robot] updated from transifex 2016-11-13 01:07:09 +00:00
Nextcloud bot d969fc4ac6
[tx-robot] updated from transifex 2016-11-11 01:07:18 +00:00
Joas Schilling cbc6118f51
Only check the sharing backends for file/folder items
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-10 16:46:01 +01:00
Robin Appelman cbcdf69dc2
only query substorages to calculate the final mtime/size/etag lazily
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-10 13:59:22 +01:00
Nextcloud bot cfda17d8f3
[tx-robot] updated from transifex 2016-11-10 01:07:14 +00:00
Björn Schießle 1ad3043e4f Merge pull request #1998 from nextcloud/share-by-mail-notification
add share by mail activity
2016-11-08 17:37:46 +01:00
Morris Jobke 5f15020b9b Merge pull request #1618 from nextcloud/show-folder-shared-status
make it possible to share the current folder
2016-11-08 16:23:47 +01:00
Bjoern Schiessle 25bcd71d02
add activity if a file was shared by mail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-08 15:58:52 +01:00
Bjoern Schiessle 087dab85b4
add activity for share by mail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-08 15:42:07 +01:00
Morris Jobke 742ece8b7a
Fix styling of the breadcrumbs icon
* properly center share icon
* also apply styles for public share icon

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-08 11:14:36 +01:00
Christoph Wurst 6c323496ab
fix share icon position and remove debug log 2016-11-08 10:36:39 +01:00
Nextcloud bot 8d7df51a0e
[tx-robot] updated from transifex 2016-11-08 01:06:57 +00:00
Roeland Jago Douma 0c1fd16d54
Add tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-07 21:02:23 +01:00
Roeland Jago Douma 07d027feeb
Show link icon when shared by link
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-07 15:38:56 +01:00
Roeland Jago Douma b39a17e499
Actually update the state
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-07 14:58:45 +01:00
Jan-Christoph Borchardt 8de4d4f76e
detail fixes for share current folder
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-07 14:58:45 +01:00
Roeland Jago Douma 1190ce1dd5
Listen to sharetab changes
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-07 14:58:45 +01:00
Christoph Wurst c55718ae5e
update breadcrumb view whenever the share information on the directory info model changes
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00
Christoph Wurst 36cf779140
the root folder must not be shared
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00
Christoph Wurst 5bf7e5533d
visually reflect sharing state of current folder
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00
Christoph Wurst 9e5e120ef9
refactor share permission logic into own method to reuse it for the share tab
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00
Christoph Wurst bc1cb8a6d0
let users share the curren folder
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00
Christoph Wurst c5597baf88
show whether the current folder was shared or not
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00