summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12056 from nextcloud/interfaces-fulltextsearch-2Roeland Jago Douma2018-10-3020-0/+4135
|\ | | | | Public interfaces FullTextSearch
| * public interfaces FullTextSearchMaxence Lange2018-10-3020-0/+4135
| | | | | | | | | | | | | | | | | | 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>
* | Merge pull request #12145 from olivermg/masterRoeland Jago Douma2018-10-301-3/+18
|\ \ | | | | | | Extending documentation in config.sample.php for `trusted_proxies`
| * | Extending documentation in config.sample.php for `trusted_proxies`Oliver Wegner2018-10-301-3/+18
| |/ | | | | | | Signed-off-by: Oliver Wegner <void1976@gmail.com>
* | Merge pull request #11899 from nextcloud/enhancement/noid/sharing-consolidationRoeland Jago Douma2018-10-3010-61/+395
|\ \ | | | | | | Sharing user consolidation
| * | Styling papercutsJulius Härtl2018-10-302-1/+6
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Update AddressBookImpl documentationJulius Härtl2018-10-301-1/+9
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Fix injection to get the user idJulius Härtl2018-10-302-5/+18
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Don't enforce merged propertyJulius Härtl2018-10-301-5/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Add uuid/name entry to Remote/MailPlugin testsJulius Härtl2018-10-303-22/+107
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Add name field to mail and remote resultsJulius Härtl2018-10-302-0/+6
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Show one share method per contact for inaccurate resultsJulius Härtl2018-10-301-8/+30
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Use tab to complete selected entry to the share entryJulius Härtl2018-10-301-0/+10
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Add local share if remote cloud id matches a local user onesJulius Härtl2018-10-301-2/+12
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Make enhancing entries with type property optionalJulius Härtl2018-10-305-24/+69
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Make dropdown height 6 1/2 entriesJulius Härtl2018-10-301-2/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Simplify share list textJulius Härtl2018-10-301-5/+0
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Add talk iconJulius Härtl2018-10-301-0/+4
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Increase max-width of the share autocompletion suggestionsJulius Härtl2018-10-301-2/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Merge contacts and add type of result to the UIJulius Härtl2018-10-302-8/+71
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Add type to Remote and Mail pluginsJulius Härtl2018-10-302-2/+6
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Add type of properties to address book resultsJulius Härtl2018-10-301-1/+7
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Group share suggestions by useridJulius Härtl2018-10-301-1/+7
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Add collaborators uuid to properly render the avatar and for later groupingJulius Härtl2018-10-303-1/+11
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Highlight search term in sharing resultsJulius Härtl2018-10-302-1/+6
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Filter out generic remote result for local usersJulius Härtl2018-10-301-7/+17
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Filter out local users from address book remote searchesJulius Härtl2018-10-302-3/+18
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Remove federated sharing address books which are the same as local onesJulius Härtl2018-10-301-2/+6
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Improve share select listJulius Härtl2018-10-303-1/+13
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #11898 from nextcloud/feature/read_only_public_shareRoeland Jago Douma2018-10-3021-38/+556
|\ \ \ | |_|/ |/| | Feature/read only public share
| * | Add acceptance tests for hiding download in link sharesDaniel Calviño Sánchez2018-10-303-0/+127
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add "Hide download" to the menu of link sharesDaniel Calviño Sánchez2018-10-306-23/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Honour "hide download" in the public share pageDaniel Calviño Sánchez2018-10-303-8/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Expose hide download to public pageRoeland Jago Douma2018-10-303-2/+5
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Propegate hide download state in share providerRoeland Jago Douma2018-10-303-4/+33
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Extend IShare to show hide download stateRoeland Jago Douma2018-10-302-0/+34
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add db column to store hide download stateRoeland Jago Douma2018-10-304-1/+57
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #12138 from nextcloud/fix/3752/inline-block-buttonJohn Molakvoæ2018-10-301-0/+1
|\ \ | | | | | | make .button inline-block
| * | make .button inline-blockJonas Sulzer2018-10-301-0/+1
| | | | | | | | | | | | | | | | | | fix #3752 Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
* | | Merge pull request #11946 from ↵Morris Jobke2018-10-3013-95/+95
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/11945/fix-js-namespace-of-files-external Fix JS namespace of files_external app
| * | | Fix JS namespace of files_external appJoas Schilling2018-10-3013-95/+95
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #12130 from nextcloud/fix/reset_bruteforce_oauthRoeland Jago Douma2018-10-303-3/+50
|\ \ \ \ | | | | | | | | | | Reset bruteforce on token refresh OAuth
| * | | | Reset bruteforce on token refresh OAuthRoeland Jago Douma2018-10-303-3/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge pull request #12054 from nextcloud/fix/5212/interact-with-userobjectRoeland Jago Douma2018-10-302-6/+50
|\ \ \ \ \ | |_|_|/ / |/| | | | LDAP: announce display name changes so that addressbook picks it up
| * | | | do not run into UniqueConstraintViolationExceptionArthur Schiwon2018-10-302-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | … 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>
| * | | | only write when the displayname differs, but then announce itArthur Schiwon2018-10-252-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refs #5212 and fixes #9112 Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #12036 from olivermg/masterMorris Jobke2018-10-302-1/+154
|\ \ \ \ \ | |_|_|_|/ |/| | | | Add capability of specifying "trusted_proxies" entries in CIDR notation (IPv4)
| * | | | Adding handling of CIDR notation to trusted_proxies for IPv4Oliver Wegner2018-10-302-1/+154
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Oliver Wegner <void1976@gmail.com>
* | | | | Merge pull request #12085 from nextcloud/add-gss-to-excluded-backendsMorris Jobke2018-10-302-2/+7
|\ \ \ \ \ | | | | | | | | | | | | add global site selector as user back-end which doesn't support password confirmation
| * | | | | add global site selector as user back-end which doesn't support password ↵Bjoern Schiessle2018-10-272-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | confirmation Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 15:48:25 +0000