41ff001b77
Merge pull request #11899 from nextcloud/enhancement/noid/sharing-consolidation
...
Sharing user consolidation
2018-10-30 19:27:05 +01:00
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
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
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
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
c237a3f003
Expose hide download to public page
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-30 15:18:55 +01:00
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
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
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
3eb5ac9cff
Merge pull request #12138 from nextcloud/fix/3752/inline-block-button
...
make .button inline-block
2018-10-30 15:07:44 +01:00
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
ffc32222f1
Styling papercuts
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 14:43:34 +01:00
b9c5e569d3
Update AddressBookImpl documentation
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 14:43:08 +01:00
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
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
87c3f79399
make .button inline-block
...
fix #3752
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
2018-10-30 13:03:20 +01:00
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
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
e6952edaf4
Don't enforce merged property
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 11:37:11 +01:00
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
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
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
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
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
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
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
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
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
3313c0142d
Simplify share list text
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:35 +01:00
fd08dd613a
Add talk icon
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:34 +01:00
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
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
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
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
06d8438fda
Group share suggestions by userid
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:34 +01:00
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
e5cae301eb
Highlight search term in sharing results
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:33 +01:00
d7caf841df
Filter out generic remote result for local users
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:33 +01:00
ce79e587e4
Filter out local users from address book remote searches
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:33 +01:00
45d8aeb9f2
Remove federated sharing address books which are the same as local ones
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:33 +01:00
6dde7e1183
Improve share select list
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:32 +01:00
c9e6a99637
Merge pull request #12085 from nextcloud/add-gss-to-excluded-backends
...
add global site selector as user back-end which doesn't support password confirmation
2018-10-30 10:16:07 +01:00
31ccf8580a
Merge pull request #12070 from nextcloud/fix/noid/announce-chosen-uid
...
announce the chosen uid (fixes wrong variable usage)
2018-10-30 10:12:04 +01:00
9645e545b3
Fix JS namespace of files_external app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-10-30 09:43:26 +01:00
401ca28f07
Adding handling of CIDR notation to trusted_proxies for IPv4
...
Signed-off-by: Oliver Wegner <void1976@gmail.com>
2018-10-30 09:15:42 +01:00
aa77b4490c
Merge pull request #12000 from nextcloud/dependabot/npm_and_yarn/build/karma-3.1.1
...
Bump karma from 2.0.4 to 3.1.1 in /build
2018-10-30 08:52:40 +01:00
9f99232865
[tx-robot] updated from transifex
2018-10-30 01:12:54 +00:00
13fe7b6fc1
Merge pull request #11627 from nextcloud/feature/noid/cli-remove-app
...
Add occ app:remove CLI command
2018-10-30 00:35:45 +01:00
0999f07964
Merge pull request #12052 from nextcloud/bugfix/11594/fix-setup-check-trusted-proxies
...
Fix setup check trusted proxies
2018-10-29 23:38:37 +01:00
2d50478492
Merge pull request #12127 from nextcloud/fix/proper_folder_mimetype
...
A folder should get a folder mimetype
2018-10-29 23:28:39 +01:00
Roeland Jago Douma
Daniel Calviño Sánchez
Roeland Jago Douma
John Molakvoæ
Morris Jobke
Julius Härtl
Jonas Sulzer
Arthur Schiwon
Joas Schilling
Oliver Wegner
Nextcloud bot