aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | | Merge pull request #11964 from nextcloud/bug/11919/do_not_always_fallbackRoeland Jago Douma2018-10-231-1/+7
|\ \ \ | | | | | | | | Forwarded ExpiredTokenException
| * | | Catch more occurences where ExpiredTokenException can be thrownRoeland Jago Douma2018-10-211-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Expired PK tokens should not fall back to legacy tokensRoeland Jago Douma2018-10-211-0/+2
| |/ / | | | | | | | | | | | | | | | Fixes #11919 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / / Load apps/APP/l10n/*.js and themes/THEME/apps/APP/l10n/*.jsMorris Jobke2018-10-221-0/+1
|/ / | | | | | | | | | | Before it quit right after finding the theme version of the l10n file which results in a not translated part of the UI. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #11882 from nextcloud/feature/noid/consider-net-connectionblizzz2018-10-181-1/+6
|\ \ | | | | | | Do not try to contact lookup server without internet connection or URL
| * | Do not try to contact lookup server without internet connection or URLArthur Schiwon2018-10-181-1/+6
| |/ | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* / Remove unreliable 2FA state message on personal 2FA settings pageChristoph Wurst2018-10-181-1/+0
|/ | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Properly escape column name in "createFunction" callMorris Jobke2018-10-163-5/+5
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #11830 from ↵Morris Jobke2018-10-161-1/+5
|\ | | | | | | | | nextcloud/bugfix/9326/make_sure_usermanager_getByEmail_only_returns_IUser filter null values for UserManager::getByEmail
| * filter null values for UserManager::getByEmailGeorg Ehrke2018-10-151-1/+5
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | Merge pull request #11740 from nextcloud/feature/noid/account-apiRoeland Jago Douma2018-10-153-20/+236
|\ \ | | | | | | Public API to get user acocunt data
| * | Add \OCP\Account public APIJulius Härtl2018-10-153-20/+236
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | include dashboard into coreMaxence Lange2018-10-152-0/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com> Merge remote-tracking branch 'origin/interface-dashboard' into interface-dashboard Signed-off-by: Maxence Lange <maxence@artificial-owl.com> moving data object to OCP Signed-off-by: Maxence Lange <maxence@artificial-owl.com> update autoload files Signed-off-by: Maxence Lange <maxence@artificial-owl.com> +@since Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | Merge pull request #11838 from ↵Roeland Jago Douma2018-10-151-6/+6
|\ \ \ | |/ / |/| | | | | | | | nextcloud/bugfix/noid/fix-default-types-of-members Fix default types of activity event member variables
| * | Fix default types of activity event member variablesJoas Schilling2018-10-151-6/+6
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #11714 from nextcloud/lookupserver-and-global-scaleBjörn Schießle2018-10-151-3/+35
|\ \ \ | |/ / |/| | always query the lookup server in a global scale setup
| * | some small fixes and improvementsBjoern Schiessle2018-10-101-5/+18
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>