summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12167 from nextcloud/hidden-classRoeland Jago Douma2018-10-311-3/+3
|\ | | | | Fix .hidden class specificity, should not be overridable, ref #12138
| * 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 #12166 from nextcloud/feature/limit_preview_sizesRoeland Jago Douma2018-10-312-15/+25
|\ \ | | | | | | Only generate previews in powers of 4 and set min
| * | Only generate previews in powers of 4 and set minRoeland Jago Douma2018-10-312-15/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we'd round up all preview request to their nearest power of two. This resulted still in a lot of possible images. Generating a lot of server load and taking up a lot of space. This moves it to previews to be powers of 4: 64, 256, 1024 and 4096 Also the first two powers are always skipped (4, 16) as it doesn't make sense to generate previews for that. We cache preview pretty agressively and I feel this is a better tradeoff. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #12169 from nextcloud/interface-fulltextsearc-issue-00001Roeland Jago Douma2018-10-312-3/+3
|\ \ \ | |/ / |/| | wrong method called
| * | missing typeMaxence Lange2018-10-311-2/+2
| | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | wrong method calledMaxence Lange2018-10-311-1/+1
|/ / | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | Merge pull request #12170 from nextcloud/fix/noid/tests-from-12009blizzz2018-10-311-99/+41
|\ \ | | | | | | Revert "Populate the mention-notification with the actual message"
| * | Revert "Populate the mention-notification with the actual message"Arthur Schiwon2018-10-311-99/+41
|/ / | | | | | | This reverts commit d295ff53672d542f3b09ff0becd6a4a20ba1d494.
* | Merge pull request #11647 from ↵Julius Härtl2018-10-312-0/+18
|\ \ | |/ |/| | | | | nextcloud/make-possible-for-tab-views-to-add-css-classes-to-their-container Make possible for tab views to add CSS classes to their container
| * Make possible for tab views to add CSS classes to their containerDaniel Calviño Sánchez2018-10-042-0/+18
| | | | | | | | | | | | | | | | | | In general the style of the tabs container should not change depending on which tab is the currently selected one. However, this could be needed in some very specific cases, so now the tab views can specify the extra CSS classes to be used in their container when they are selected. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | 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>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-03 01:14:51 +0000