summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12145 from olivermg/masterRoeland Jago Douma2018-10-301-3/+18
|\
| * Extending documentation in config.sample.php for `trusted_proxies`Oliver Wegner2018-10-301-3/+18
* | Merge pull request #11899 from nextcloud/enhancement/noid/sharing-consolidationRoeland Jago Douma2018-10-3010-61/+395
|\ \
| * | Styling papercutsJulius Härtl2018-10-302-1/+6
| * | Update AddressBookImpl documentationJulius Härtl2018-10-301-1/+9
| * | Fix injection to get the user idJulius Härtl2018-10-302-5/+18
| * | Don't enforce merged propertyJulius Härtl2018-10-301-5/+1
| * | Add uuid/name entry to Remote/MailPlugin testsJulius Härtl2018-10-303-22/+107
| * | Add name field to mail and remote resultsJulius Härtl2018-10-302-0/+6
| * | Show one share method per contact for inaccurate resultsJulius Härtl2018-10-301-8/+30
| * | Use tab to complete selected entry to the share entryJulius Härtl2018-10-301-0/+10
| * | Add local share if remote cloud id matches a local user onesJulius Härtl2018-10-301-2/+12
| * | Make enhancing entries with type property optionalJulius Härtl2018-10-305-24/+69
| * | Make dropdown height 6 1/2 entriesJulius Härtl2018-10-301-2/+2
| * | Simplify share list textJulius Härtl2018-10-301-5/+0
| * | Add talk iconJulius Härtl2018-10-301-0/+4
| * | Increase max-width of the share autocompletion suggestionsJulius Härtl2018-10-301-2/+2
| * | Merge contacts and add type of result to the UIJulius Härtl2018-10-302-8/+71
| * | Add type to Remote and Mail pluginsJulius Härtl2018-10-302-2/+6
| * | Add type of properties to address book resultsJulius Härtl2018-10-301-1/+7
| * | Group share suggestions by useridJulius Härtl2018-10-301-1/+7
| * | Add collaborators uuid to properly render the avatar and for later groupingJulius Härtl2018-10-303-1/+11
| * | Highlight search term in sharing resultsJulius Härtl2018-10-302-1/+6
| * | Filter out generic remote result for local usersJulius Härtl2018-10-301-7/+17
| * | Filter out local users from address book remote searchesJulius Härtl2018-10-302-3/+18
| * | Remove federated sharing address books which are the same as local onesJulius Härtl2018-10-301-2/+6
| * | Improve share select listJulius Härtl2018-10-303-1/+13
* | | Merge pull request #11898 from nextcloud/feature/read_only_public_shareRoeland Jago Douma2018-10-3021-38/+556
|\ \ \ | |_|/ |/| |
| * | Add acceptance tests for hiding download in link sharesDaniel Calviño Sánchez2018-10-303-0/+127
| * | Add "Hide download" to the menu of link sharesDaniel Calviño Sánchez2018-10-306-23/+174
| * | Honour "hide download" in the public share pageDaniel Calviño Sánchez2018-10-303-8/+126
| * | Expose hide download to public pageRoeland Jago Douma2018-10-303-2/+5
| * | Propegate hide download state in share providerRoeland Jago Douma2018-10-303-4/+33
| * | Extend IShare to show hide download stateRoeland Jago Douma2018-10-302-0/+34
| * | Add db column to store hide download stateRoeland Jago Douma2018-10-304-1/+57
|/ /
* | Merge pull request #12138 from nextcloud/fix/3752/inline-block-buttonJohn Molakvoæ2018-10-301-0/+1
|\ \
| * | make .button inline-blockJonas Sulzer2018-10-301-0/+1
* | | Merge pull request #11946 from nextcloud/bugfix/11945/fix-js-namespace-of-fil...Morris Jobke2018-10-3013-95/+95
|\ \ \
| * | | Fix JS namespace of files_external appJoas Schilling2018-10-3013-95/+95
* | | | Merge pull request #12130 from nextcloud/fix/reset_bruteforce_oauthRoeland Jago Douma2018-10-303-3/+50
|\ \ \ \
| * | | | Reset bruteforce on token refresh OAuthRoeland Jago Douma2018-10-303-3/+50
* | | | | Merge pull request #12054 from nextcloud/fix/5212/interact-with-userobjectRoeland Jago Douma2018-10-302-6/+50
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | do not run into UniqueConstraintViolationExceptionArthur Schiwon2018-10-302-11/+23
| * | | | only write when the displayname differs, but then announce itArthur Schiwon2018-10-252-2/+34
* | | | | Merge pull request #12036 from olivermg/masterMorris Jobke2018-10-302-1/+154
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Adding handling of CIDR notation to trusted_proxies for IPv4Oliver Wegner2018-10-302-1/+154
* | | | | 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 conf...Bjoern Schiessle2018-10-272-2/+7
* | | | | | Merge pull request #12070 from nextcloud/fix/noid/announce-chosen-uidMorris Jobke2018-10-301-3/+3
|\ \ \ \ \ \
| * | | | | | fixes wrong variable usageArthur Schiwon2018-10-261-3/+3