upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-15 09:59:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 52
39842 commits 960 branches 1208 tags 8.1 GiB
Commit graph

919 commits

Author SHA1 Message Date
Roeland Jago Douma
38548a7006
Correctly format OCS response with favorites 
The helper funtion did not handle the response correctly and basically
only returned the last share with tags.

This is a simple rewrite. That is still understandable. Loops maybe more
than strictly required. But preformance is not the issue here.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-04 11:49:19 +02:00
Joas Schilling
bd80121fc6
Catch exceptions on error of cloud id resolution 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-16 13:57:30 +02:00
Morris Jobke
cf16087585 Disable default activity email for incoming shares 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-02 20:57:12 +02:00
Robin Appelman
e49b8959c4
still remove the federated share even if we cant notify the remote 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-17 14:21:22 +02:00
Roeland Jago Douma
38ee24d56b Merge pull request #5687 from nextcloud/jail-propagator-12 
[12] Fix propagating changes within jail wrapper
 2017-07-12 11:50:10 +02:00
Roeland Jago Douma
405d3ccbd7 Merge pull request #5463 from nextcloud/shared-cache-during-init-12 
[12] dont die if we try to access the shared cache while setting up the shared storage
 2017-07-12 11:18:49 +02:00
Maxence Lange
02baa45898 wrong call 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-07-11 20:21:06 +02:00
Maxence Lange
7464996c56 verify that circles is installed 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-07-11 20:21:06 +02:00
Robin Appelman
2f7d0bbb18
Fix propagating changes within jail wrapper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-11 19:20:51 +02:00
Joas Schilling
509bc4f1eb
Fix activity emails for accept/decline of remote shares 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-10 12:28:32 +02:00
Morris Jobke
a5182ab7c1 Merge pull request #5648 from nextcloud/backport-5483-png-files-for-activity-emails 
[stable12] Use PNG icons for activity emails and ios client
 2017-07-07 14:04:01 +02:00
Joas Schilling
87e69b5510
Use PNG version of the icons for shipped activities 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-07 11:16:44 +02:00
Robin Appelman
cbabc568db
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-06-19 14:00:52 +02:00
Robin Appelman
e76081e858
Revert "dont die if we try to access the shared cache while setting up the shared storage" 
Revent accidental push

This reverts commit ed89034047.
 2017-06-19 14:00:27 +02:00
Robin Appelman
64864bf654
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-06-19 13:58:30 +02:00
Joas Schilling
b94a7a0ba3
Use the share_folder config for remote shares 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-19 10:21:56 +02:00
Joas Schilling
cdd4a75c17
Backport of #5384 to stable12 
Allow to find local users by their email address

Signed-off-by: Joas Schilling <coding@schilljs.com>

Make sure to only add system users once

Signed-off-by: Joas Schilling <coding@schilljs.com>

Add unit test

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-15 19:23:31 +02:00
Daniel Hansson
8817c65120 fix for sharing stable12 
Signed-off-by: Daniel Hansson <daniel@techandme.se>
 2017-05-20 17:15:14 +02: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
Morris Jobke
23cc309606
Handle more error cases 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-02 13:43:48 +02: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
Morris Jobke
c54a59d51e
Remove unused use statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-22 19:23:31 -05: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
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
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
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
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
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
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
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
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
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
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
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
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