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

46445 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bjoern Schiessle
d0411b2369
allow to create multiple link shares via share api 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-31 06:55:52 +01:00
Nextcloud bot
bbdfead9fd
[tx-robot] updated from transifex 2018-10-31 01:12:52 +00:00
blizzz
1293affc84
Merge pull request #12020 from nextcloud/bugfix/11795/calendar_invitation_fallback_lang 
Calendar invitation: use system default instead of sender's language as fallback
 2018-10-30 22:05:20 +01:00
Roeland Jago Douma
a3e9e0f8c6
Merge pull request #12047 from nextcloud/interfaces-files-fulltextsearch 
Public interfaces Files_FullTextSearch
 2018-10-30 21:16:13 +01:00
Roeland Jago Douma
a51c8377d4
Merge pull request #12140 from nextcloud/fix/expired_token_throttler 
Expired tokens should not trigger bruteforce protection
 2018-10-30 20:17:03 +01:00
Maxence Lange
98c1d9e7ab +files_fulltextsearch in autoloader 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-10-30 20:07:29 +01:00
Maxence Lange
6265278728 Merge remote-tracking branch 'origin/interfaces-files-fulltextsearch' into interfaces-files-fulltextsearch 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-10-30 19:59:35 +01:00
Roeland Jago Douma
ddd39f9dc3
Merge pull request #12056 from nextcloud/interfaces-fulltextsearch-2 
Public interfaces FullTextSearch
 2018-10-30 19:53:01 +01:00
Roeland Jago Douma
64ec5e1233
Merge pull request #12145 from olivermg/master 
Extending documentation in config.sample.php for `trusted_proxies`
 2018-10-30 19:35:35 +01:00
Roeland Jago Douma
2223d19997
Error out early on an expired token 
Fixes #12131

If we hit an expired token there is no need to continue checking. Since
we know it is a token.

We also should not register this with the bruteforce throttler as it is
actually a valid token. Just expired. Instead the authentication should
fail. And buisness continues as usual.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 19:30:45 +01:00
Roeland Jago Douma
674930da7f
Move ExpiredTokenException to the correct namespace 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 19:30:45 +01:00
Roeland Jago Douma
41ff001b77
Merge pull request #11899 from nextcloud/enhancement/noid/sharing-consolidation 
Sharing user consolidation
 2018-10-30 19:27:05 +01:00
Roeland Jago Douma
514185820e
Merge pull request #11898 from nextcloud/feature/read_only_public_share 
Feature/read only public share
 2018-10-30 19:25:44 +01:00
Maxence Lange
750196aa7f public interfaces FullTextSearch 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
-@return mixed

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Merge remote-tracking branch 'origin/interfaces-fulltextsearch-2' into interfaces-fulltextsearch-2

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-10-30 18:24:15 +01:00
Oliver Wegner
fb5ac6b836 Extending documentation in config.sample.php for trusted_proxies 
Signed-off-by: Oliver Wegner <void1976@gmail.com>
 2018-10-30 17:36:41 +01:00
Daniel Calviño Sánchez
d4f39a9033 Add acceptance tests for hiding download in link shares 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-10-30 15:18:55 +01:00
Daniel Calviño Sánchez
a1e3098322 Add "Hide download" to the menu of link shares 
Hiding the download does not depend on other settings and it does not
affect other settings either (for example, it would be possible to hide
the downloads yet make the share editable), so a simple checkbox was
added to the menu. However, note that this option is only available for
files, but not for folders.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-10-30 15:18:55 +01:00
Daniel Calviño Sánchez
bfb2a914d2 Honour "hide download" in the public share page 
When the "hide download" property of a share is set the public share
page will not show the download button nor the menu with the download,
direct link and "Add to your Nextcloud" actions; the "downloadURL"
hidden field will not be included either in the generated HTML.

Despite that, note that the "downloadURL" parameter is still set and
passed to the template, as this could be needed anyway to generate
previews (for example, of audio files).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-10-30 15:18:55 +01:00
Roeland Jago Douma
c237a3f003 Expose hide download to public page 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 15:18:55 +01:00
Roeland Jago Douma
abbb946bbb Propegate hide download state in share provider 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 15:18:55 +01:00
Roeland Jago Douma
bc960bae02 Extend IShare to show hide download state 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 15:18:55 +01:00
Roeland Jago Douma
81f37401f9 Add db column to store hide download state 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 15:18:55 +01:00
John Molakvoæ
3eb5ac9cff
Merge pull request #12138 from nextcloud/fix/3752/inline-block-button 
make .button inline-block
 2018-10-30 15:07:44 +01:00
Morris Jobke
b28a0c10bf
Merge pull request #11946 from nextcloud/bugfix/11945/fix-js-namespace-of-files-external 
Fix JS namespace of files_external app
 2018-10-30 14:57:57 +01:00
Julius Härtl
ffc32222f1
Styling papercuts 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 14:43:34 +01:00
Julius Härtl
b9c5e569d3
Update AddressBookImpl documentation 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 14:43:08 +01:00
Roeland Jago Douma
c1698948b8
Merge pull request #12130 from nextcloud/fix/reset_bruteforce_oauth 
Reset bruteforce on token refresh OAuth
 2018-10-30 14:26:50 +01:00
Roeland Jago Douma
8b2b238d86
Merge pull request #12054 from nextcloud/fix/5212/interact-with-userobject 
LDAP: announce display name changes so that addressbook picks it up
 2018-10-30 13:38:16 +01:00
Jonas Sulzer
87c3f79399
make .button inline-block 
fix #3752

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2018-10-30 13:03:20 +01:00
Arthur Schiwon
49456e42f9
do not run into UniqueConstraintViolationException 
… when an unmapped user logs in for the first time when background job
mode is ajax and no memcache was configured.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-10-30 12:12:03 +01:00
Julius Härtl
5a73a9b9de
Fix injection to get the user id 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 11:41:56 +01:00
Julius Härtl
e6952edaf4
Don't enforce merged property 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 11:37:11 +01:00
Roeland Jago Douma
75456b057d
Reset bruteforce on token refresh OAuth 
When using atoken obtained via OAuth the token expires. Resulting in
brute force attempts hitting the requesting IP.

This resets the brute force attempts for that UID on a valid refresh of
the token.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 11:21:27 +01:00
Morris Jobke
dccfe4bf84
Merge pull request #12036 from olivermg/master 
Add capability of specifying "trusted_proxies" entries in CIDR notation (IPv4)
 2018-10-30 10:49:08 +01:00
Julius Härtl
a0d759b324
Add uuid/name entry to Remote/MailPlugin tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:36 +01:00
Julius Härtl
cb463d73d5
Add name field to mail and remote results 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:36 +01:00
Julius Härtl
f116461d4b
Show one share method per contact for inaccurate results 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:36 +01:00
Julius Härtl
e8e898ede8
Use tab to complete selected entry to the share entry 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:35 +01:00
Julius Härtl
7a65779316
Add local share if remote cloud id matches a local user ones 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:35 +01:00
Julius Härtl
61af607525
Make enhancing entries with type property optional 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:35 +01:00
Julius Härtl
192324e4de
Make dropdown height 6 1/2 entries 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:35 +01:00
Julius Härtl
3313c0142d
Simplify share list text 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:35 +01:00
Julius Härtl
fd08dd613a
Add talk icon 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:34 +01:00
Julius Härtl
5059605c99
Increase max-width of the share autocompletion suggestions 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:34 +01:00
Julius Härtl
3e11515b9c
Merge contacts and add type of result to the UI 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:34 +01:00
Julius Härtl
870e01518d
Add type to Remote and Mail plugins 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:34 +01:00
Julius Härtl
8b92a6c9cb
Add type of properties to address book results 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:34 +01:00
Julius Härtl
06d8438fda
Group share suggestions by userid 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:34 +01:00
Julius Härtl
a1c6e44700
Add collaborators uuid to properly render the avatar and for later grouping 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:33 +01:00
Julius Härtl
e5cae301eb
Highlight search term in sharing results 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:33 +01:00