aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12140 from nextcloud/fix/expired_token_throttlerRoeland Jago Douma2018-10-306-3/+17
|\ | | | | 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-305-2/+6
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #12056 from nextcloud/interfaces-fulltextsearch-2Roeland Jago Douma2018-10-302-0/+230
|\ \ | |/ |/| Public interfaces FullTextSearch
| * public interfaces FullTextSearchMaxence Lange2018-10-302-0/+230
| | | | | | | | | | | | | | | | | | 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 #11899 from nextcloud/enhancement/noid/sharing-consolidationRoeland Jago Douma2018-10-302-13/+77
|\ \ | | | | | | Sharing user consolidation
| * | Fix injection to get the user idJulius Härtl2018-10-301-4/+7
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Add uuid/name entry to Remote/MailPlugin testsJulius Härtl2018-10-301-2/+3
| | | | | | | | | | | | 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>
| * | 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-302-8/+22
| | | | | | | | | | | | 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 collaborators uuid to properly render the avatar and for later groupingJulius Härtl2018-10-302-0/+7
| | | | | | | | | | | | 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-301-2/+11
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Propegate hide download state in share providerRoeland Jago Douma2018-10-301-0/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Extend IShare to show hide download stateRoeland Jago Douma2018-10-301-0/+13
| |/ |/| | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #12130 from nextcloud/fix/reset_bruteforce_oauthRoeland Jago Douma2018-10-301-1/+2
|\ \ | | | | | | Reset bruteforce on token refresh OAuth
| * | Reset bruteforce on token refresh OAuthRoeland Jago Douma2018-10-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #12036 from olivermg/masterMorris Jobke2018-10-301-1/+39
|\ \ \ | |_|/ |/| | Add capability of specifying "trusted_proxies" entries in CIDR notation (IPv4)
| * | Adding handling of CIDR notation to trusted_proxies for IPv4Oliver Wegner2018-10-301-1/+39
| | | | | | | | | | | | 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>
* | | | Merge pull request #12052 from ↵Morris Jobke2018-10-291-2/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | nextcloud/bugfix/11594/fix-setup-check-trusted-proxies Fix setup check trusted proxies
| * | | Add REMOTE_ADDR to getHeaderDaniel Kesselberg2018-10-251-2/+6
| |/ / | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #12113 from nextcloud/fileinfo-getextensionMorris Jobke2018-10-294-0/+16
|\ \ \ | | | | | | | | Add getExtension() to FileInfo
| * | | Add getExtension() to FileInfoRobin Appelman2018-10-294-0/+16
| |/ / | | | | | | | | | | | | | | | | | | this is a fairly common operation so it makes sense to prevent having to repeatedly implement it. Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Fix testsJulius Härtl2018-10-291-1/+4
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Fix icon cacher url matchingJulius Härtl2018-10-291-14/+13
|/ / | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Keep list of icons in a separate file for use in the accessibility appJulius Härtl2018-10-251-49/+85
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Remove default which didn't workJulius Härtl2018-10-251-1/+1
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Properly track data urls as wellJulius Härtl2018-10-251-1/+1
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Directly embed icons into the icon-vars css fileJulius Härtl2018-10-251-1/+48
|/ | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Allow chunked uploads even if your quota is not sufficientRoeland Jago Douma2018-10-241-1/+1
| | | | | | | | Fixes #11485 This allows uploads to shared folders. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* skip already decrypted files on decrypt all commandBjoern Schiessle2018-10-241-0/+6
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Register IAccountManager as a serviceJulius Härtl2018-10-241-0/+2
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Use empty string instead of nullJulius Härtl2018-10-241-1/+1
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Merge pull request #11439 from nextcloud/trash-modular-apiMorris Jobke2018-10-234-3/+23
|\ | | | | Modular trashbin api
| * pass `Cache::getMoveInfo` along cache wrappersRobin Appelman2018-10-171-0/+6
| | | | | | | | | | | | fixes cross storage move in some cases Signed-off-by: Robin Appelman <robin@icewind.nl>
| * expose storagefactory in server containerRobin Appelman2018-10-172-2/+16
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * use name in fileinfo if setRobin Appelman2018-10-171-1/+1
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #11914 from nextcloud/csp/report-uriMorris Jobke2018-10-231-0/+8
|\ \ | | | | | | Add report-uri to CSP
| * | Add report-uri to CSPRoeland Jago Douma2018-10-211-0/+8
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #11966 from nextcloud/csp/safari12-supportMorris Jobke2018-10-231-0/+2
|\ \ \ | | | | | | | | Add nonce for Safari 12+
| * | | Add nonce for Safari 12+Roeland Jago Douma2018-10-211-0/+2
| |/ / | | | | | | | | | | | | | | | As far as I can tell this should work now. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #11932 from nextcloud/font-nunitoMorris Jobke2018-10-232-16/+19
|\ \ \ | | | | | | | | Change typeface to Nunito
| * | | fixup! Fix comment and cap-heightJohn Molakvoæ (skjnldsv)2018-10-231-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Fix comment and cap-heightJohn Molakvoæ (skjnldsv)2018-10-231-3/+6
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Use correct typeface for avatar generatorJan-Christoph Borchardt2018-10-231-14/+14
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Use correct typeface for txt previewsJan-Christoph Borchardt2018-10-231-1/+1
| |/ / | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>