aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix .hidden class specificity, should not be overridable, ref #12138Jan-Christoph Borchardt2018-10-311-3/+3
| | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* Merge pull request #12146 from nextcloud/fix/noid/verifyuserdata-on-nullRoeland Jago Douma2018-10-311-0/+4
|\ | | | | fixes an Exception on the background job because the config was not set
| * fixes an Exception on the background job because the config was not setArthur Schiwon2018-10-301-0/+4
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #12009 from ↵blizzz2018-10-311-41/+99
|\ \ | | | | | | | | | | | | nextcloud/feature/noid/populate-notification-message-with-the-comment Populate the mention-notification with the actual message
| * | Populate the mention-notification with the actual messageJoas Schilling2018-10-301-41/+99
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #12095 from ↵Roeland Jago Douma2018-10-311-0/+51
|\ \ \ | | | | | | | | | | | | | | | | MasterOfDeath/OCA-ShareByMail-Capabilities-test-unit OCA\ShareByMail\Capabilities add unit test
| * | | OCA\ShareByMail\Capabilities unit testMasterOfDeath2018-10-311-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | OCA\ShareByMail\Capabilities unit test Signed-off-by: Rinat Gumirov <rinat.gumirov@mail.ru>
* | | | Merge pull request #12147 from ↵Roeland Jago Douma2018-10-311-0/+72
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | MasterOfDeath/OCA-SystemTags-Activity-Setting-add-unit-test OCA\SystemTags\Activity\Setting unit test
| * | | | OCA\SystemTags\Activity\Setting unit testRinat Gumirov2018-10-311-0/+72
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rinat Gumirov <rinat.gumirov@mail.ru>
* | | | | Merge pull request #12153 from nextcloud/appnamesJohn Molakvoæ2018-10-314-20/+87
|\ \ \ \ \ | | | | | | | | | | | | Show all app titles on hovering app menu area, fix #10952, fix #4619
| * | | | | Show all app titles on hovering app menu area, fix #10952, fix #4619Jan-Christoph Borchardt2018-10-304-20/+87
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #12089 from Rayn0r/masterDennis19932018-10-314-8/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | added possibility to disable autocomplete in login form
| * | | | | | added sample config for turning off form autocompletion on login pageRayn0r2018-10-301-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rayn0r <Andre.Weidemann@web.de>
| * | | | | | adapted automated test for autocomplete changesRayn0r2018-10-301-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rayn0r <Andre.Weidemann@web.de>
| * | | | | | added possibility to disable autocomplete in login formRayn0r2018-10-302-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rayn0r <Andre.Weidemann@web.de>
* | | | | | | Merge pull request #12154 from nextcloud/files-detailsJohn Molakvoæ2018-10-312-4/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Design details in file picker
| * | | | | | | Added round border for thumbnailJohn Molakvoæ (skjnldsv)2018-10-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | Filepicker: center text in grid view, improve spacingJan-Christoph Borchardt2018-10-311-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | | | slightly round off thumbnails in list view tooJan-Christoph Borchardt2018-10-311-0/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | Merge pull request #12125 from MasterOfDeath/expire-share-days-validateJohn Molakvoæ2018-10-311-5/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Validate expire share days in settings (issue: #11930)
| * | | | | | | expire share days in settings validateRinat Gumirov2018-10-311-5/+2
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Rinat Gumirov <rinat.gumirov@mail.ru>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2018-10-31122-404/+404
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #12020 from ↵blizzz2018-10-301-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/11795/calendar_invitation_fallback_lang Calendar invitation: use system default instead of sender's language as fallback
| * | | | | | Calendar invitation: use system default instead of sender's language as fallbackGeorg Ehrke2018-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | | Merge pull request #12047 from nextcloud/interfaces-files-fulltextsearchRoeland Jago Douma2018-10-303-0/+114
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Public interfaces Files_FullTextSearch
| * | | | | | | +files_fulltextsearch in autoloaderMaxence Lange2018-10-302-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | | | | | | Merge remote-tracking branch 'origin/interfaces-files-fulltextsearch' into ↵Maxence Lange2018-10-301-0/+112
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interfaces-files-fulltextsearch Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| | * | | | | | | implementing files_fulltextsearch within coreMaxence Lange2018-10-251-0/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | | | | | | | Merge pull request #12140 from nextcloud/fix/expired_token_throttlerRoeland Jago Douma2018-10-3012-14/+23
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Expired tokens should not trigger bruteforce protection
| * | | | | | | | Error out early on an expired tokenRoeland Jago Douma2018-10-301-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | | | Move ExpiredTokenException to the correct namespaceRoeland Jago Douma2018-10-3011-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | | 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>