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

15801 commits

Author SHA1 Message Date
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
ac9d0fd14c Merge pull request #4385 from nextcloud/remove-unused-css 
Remove unused CSS
 2017-04-19 19:27:05 +02:00
Lukas Reschke
a3569a1452 Merge pull request #4382 from nextcloud/use-proper-reply-to 
Add "Reply-To" on ShareByMailProvider mails
 2017-04-19 12:04:18 +02:00
Lukas Reschke
b7fe28bba1
Fix indentation 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-19 12:03:54 +02: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
Morris Jobke
74936e15d1
Remove unused CSS 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-18 20:36:54 -05:00
Nextcloud bot
febe01f571
[tx-robot] updated from transifex 2017-04-19 00:07:40 +00:00
Nextcloud bot
6b490f45fd
[tx-robot] updated from transifex 2017-04-18 23:08:43 +00:00
Morris Jobke
269600a04f Merge pull request #4369 from nextcloud/fix-translations 
Fix translations
 2017-04-18 18:01:50 -05:00
Joas Schilling
1c0bffe87f
Fix translations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-18 16:40:53 -05:00
Nextcloud bot
c40b7acb09
[tx-robot] updated from transifex 2017-04-18 20:47:45 +00:00
Lukas Reschke
203ef88509
Add "Reply-To" on ShareByMailProvider mails 
Fixes https://github.com/nextcloud/server/issues/4209

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-18 22:23:07 +02:00
Nextcloud bot
b072d2c49d
[tx-robot] updated from transifex 2017-04-18 00:07:25 +00:00
Nextcloud bot
df2235c71f
[tx-robot] updated from transifex 2017-04-17 00:07:33 +00:00
Nextcloud bot
69e0e2420c
[tx-robot] updated from transifex 2017-04-16 00:07:23 +00:00
Morris Jobke
10290eb006 Merge pull request #2834 from nextcloud/accesListToShareManager 
Access list to share manager
 2017-04-15 13:06:24 -05: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
Morris Jobke
13c71203bb Merge pull request #4341 from nextcloud/local-link-explanation 
Explain local link
 2017-04-13 12:01:57 -05:00
Jos Poortvliet
a8b09c860e
Explain local link 
The local link is a clever thing and the clients should support this imho but it might not be clear to all users. For one, the term 'local link' is a bit odd. Local with respect to what? It links directly to the file or folder, so direct link seems to make more sense to me. And we should explain the difference with a public link. So this PR:
* renames local link to direct link
* adds a short explanation, noting it only works for users who have access to this file/folder.

As other links are called public link you could also consider calling this 'private link', I suppose. But the links we sent by mail to ppl could also be called 'private link' (they are for one user, who git it by email) so I think it might be confusing. What do @nextcloud/designers think?

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-13 12:01:45 -05:00
Lukas Reschke
f3dbfd68a2 Merge pull request #4336 from nextcloud/add-ratelimiting 
Add support for ratelimiting via annotations
 2017-04-13 18:53:56 +02:00
Roeland Jago Douma
cab41118f6
Mail shares trigger the public key 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-13 15:19:23 +02:00
Joas Schilling
629b7c0fc3
Adjust docs and make !$currentAccess simpler 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:58:52 +02:00
Joas Schilling
6c23a5fa35
Add unit tests for sharebymail provider 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:58:52 +02:00
Joas Schilling
5df727d4ad
Fix federated file sharing 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:58:51 +02:00
Joas Schilling
3c1365c0d1
Fix returned paths for remote shares 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:58:51 +02:00
Joas Schilling
4bcb7d88b5
Return the token as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:58:51 +02:00
Joas Schilling
91e650791d
Return the paths for the users without setting them all up 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:58:50 +02:00
Roeland Jago Douma
12afd7d1d5
Add mail element to access list 
* Each provider just returns what they have so adding an element won't
require changing everything
* Added tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-13 12:58:50 +02:00
Roeland Jago Douma
2cbac3357b
Offload acceslist creation to providers 
* This allows for effective queries.
* Introduce currentAccess parameter to speciy if the users needs to have
currently acces (deleted incomming group share). (For notifications)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-13 12:58:50 +02:00
Lukas Reschke
51377f3d8c Merge pull request #4313 from nextcloud/ldap-name-change 
Change LDAP method names
 2017-04-13 12:28:24 +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
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
Roeland Jago Douma
b3b24172e4 Merge pull request #4307 from nextcloud/sharing-emails 
New emails for sharebymail
 2017-04-12 21:23:11 +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
Joas Schilling
983210de2e
Dont add click-button text for plaintext mails 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-12 17:16:27 +02:00
Joas Schilling
506c7731a6
Don't duplicate the sentence with the header 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-12 17:16:26 +02:00
Morris Jobke
d0bae447fb
Use new email design for sharebymail emails 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 17:16:26 +02:00
Morris Jobke
229d17e13b
Change LDAP method names 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 10:10:07 -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
Joas Schilling
a3c3124762
Allow file upload when storage is unlimited 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-12 12:27:47 +02:00
Björn Schießle
53787a29e1 Merge pull request #4317 from nextcloud/cleanup-files_trashbin-update 
[files_trashbin] Remove unneeded update steps
 2017-04-12 10:57:09 +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
Björn Schießle
49d8716eaa Merge pull request #4312 from nextcloud/cleanup-name 
Update comments to Nextcloud
 2017-04-12 10:54:20 +02:00
Lukas Reschke
39468f627f Merge pull request #4315 from nextcloud/cleanup-files_external-update 
[files_external] Remove unneeded update steps
 2017-04-12 10:16:42 +02:00