averello/nextcloud-server-mirror
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-04 18:28:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
46,431 Commits 712 Branches 1,186 Tags
674930da7ff0a9bc82425caaf877efe6bae3bbde
Commit Graph

16135 Commits

Author SHA1 Message Date
Roeland Jago Douma
674930da7f Move ExpiredTokenException to the correct namespace 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 19:30:45 +01:00
Roeland Jago Douma
41ff001b77 Merge pull request #11899 from nextcloud/enhancement/noid/sharing-consolidation 
Sharing user consolidation
 2018-10-30 19:27:05 +01:00
Roeland Jago Douma
abbb946bbb Propegate hide download state in share provider 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 15:18:55 +01:00
Roeland Jago Douma
bc960bae02 Extend IShare to show hide download state 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 15:18:55 +01:00
Roeland Jago Douma
81f37401f9 Add db column to store hide download state 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 15:18:55 +01:00
Roeland Jago Douma
c1698948b8 Merge pull request #12130 from nextcloud/fix/reset_bruteforce_oauth 
Reset bruteforce on token refresh OAuth
 2018-10-30 14:26:50 +01:00
Julius Härtl
5a73a9b9de Fix injection to get the user id 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 11:41:56 +01:00
Roeland Jago Douma
75456b057d Reset bruteforce on token refresh OAuth 
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>
 2018-10-30 11:21:27 +01:00
Morris Jobke
dccfe4bf84 Merge pull request #12036 from olivermg/master 
Add capability of specifying "trusted_proxies" entries in CIDR notation (IPv4)
 2018-10-30 10:49:08 +01:00
Julius Härtl
a0d759b324 Add uuid/name entry to Remote/MailPlugin tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:36 +01:00
Julius Härtl
cb463d73d5 Add name field to mail and remote results 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:36 +01:00
Julius Härtl
7a65779316 Add local share if remote cloud id matches a local user ones 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:35 +01:00
Julius Härtl
61af607525 Make enhancing entries with type property optional 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:35 +01:00
Julius Härtl
870e01518d Add type to Remote and Mail plugins 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:34 +01:00
Julius Härtl
a1c6e44700 Add collaborators uuid to properly render the avatar and for later grouping 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:33 +01:00
Julius Härtl
d7caf841df Filter out generic remote result for local users 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:33 +01:00
Julius Härtl
ce79e587e4 Filter out local users from address book remote searches 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:33 +01:00
Morris Jobke
c9e6a99637 Merge pull request #12085 from nextcloud/add-gss-to-excluded-backends 
add global site selector as user back-end which doesn't support password confirmation
 2018-10-30 10:16:07 +01:00
Oliver Wegner
401ca28f07 Adding handling of CIDR notation to trusted_proxies for IPv4 
Signed-off-by: Oliver Wegner <void1976@gmail.com>
 2018-10-30 09:15:42 +01:00
Morris Jobke
13fe7b6fc1 Merge pull request #11627 from nextcloud/feature/noid/cli-remove-app 
Add occ app:remove CLI command
 2018-10-30 00:35:45 +01:00
Morris Jobke
0999f07964 Merge pull request #12052 from nextcloud/bugfix/11594/fix-setup-check-trusted-proxies 
Fix setup check trusted proxies
 2018-10-29 23:38:37 +01:00
Morris Jobke
963d968f06 Merge pull request #12113 from nextcloud/fileinfo-getextension 
Add getExtension() to FileInfo
 2018-10-29 17:23:27 +01:00
Robin Appelman
e5c3e4b76f Add getExtension() to FileInfo 
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>
 2018-10-29 15:24:02 +01:00
Julius Härtl
34a71f57fc Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-29 13:06:55 +01:00
Julius Härtl
aec0a6c096 Fix icon cacher url matching 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-29 12:09:30 +01:00
Nextcloud bot
18fef12721 [tx-robot] updated from transifex 2018-10-29 01:13:07 +00:00
Bjoern Schiessle
85d9f06cb8 add global site selector as user back-end which doesn't support password confirmation 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-27 15:43:51 +02:00
Nextcloud bot
0092e3adec [tx-robot] updated from transifex 2018-10-27 00:12:35 +00:00
Nextcloud bot
aff53d6e34 [tx-robot] updated from transifex 2018-10-26 00:12:48 +00:00
Daniel Kesselberg
986f4df2a5 Add REMOTE_ADDR to getHeader 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-10-25 22:26:49 +02:00
Julius Härtl
d21ded67a7 Keep list of icons in a separate file for use in the accessibility app 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-25 12:16:10 +02:00
Julius Härtl
0b2ef7e608 Remove default which didn't work 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-25 11:58:00 +02:00
Julius Härtl
152fb08288 Properly track data urls as well 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-25 11:58:00 +02:00
Julius Härtl
845f1b67d5 Directly embed icons into the icon-vars css file 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-25 11:58:00 +02:00
Roeland Jago Douma
0fb070b5b4 Allow chunked uploads even if your quota is not sufficient 
Fixes #11485

This allows uploads to shared folders.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-24 20:29:00 +02:00
Bjoern Schiessle
d76a87f3b0 skip already decrypted files on decrypt all command 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-24 16:53:39 +02:00
Julius Härtl
f47f5ad0ea Allow property filters to be null 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-24 12:54:01 +02:00
Julius Härtl
86f29ffdbc Register IAccountManager as a service 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-24 12:53:43 +02:00
Julius Härtl
3b3824c486 Use empty string instead of null 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-24 12:53:18 +02:00
Morris Jobke
4ad27260a9 Merge pull request #11439 from nextcloud/trash-modular-api 
Modular trashbin api
 2018-10-23 17:11:16 +02:00
Nextcloud bot
a9fb21f9fc [tx-robot] updated from transifex 2018-10-23 14:54:28 +00:00
Morris Jobke
39338aaa67 Merge pull request #11914 from nextcloud/csp/report-uri 
Add report-uri to CSP
 2018-10-23 16:42:24 +02:00
Morris Jobke
92b5b54fa6 Merge pull request #11966 from nextcloud/csp/safari12-support 
Add nonce for Safari 12+
 2018-10-23 16:22:58 +02:00
Morris Jobke
171fe69db7 Merge pull request #11932 from nextcloud/font-nunito 
Change typeface to Nunito
 2018-10-23 15:14:10 +02:00
Roeland Jago Douma
a11bef25a2 Merge pull request #11964 from nextcloud/bug/11919/do_not_always_fallback 
Forwarded ExpiredTokenException
 2018-10-23 15:07:19 +02:00
John Molakvoæ (skjnldsv)
782927a05f fixup! Fix comment and cap-height 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-23 14:30:23 +02:00
John Molakvoæ (skjnldsv)
1fb885638e Fix comment and cap-height 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-23 14:22:55 +02:00
Jan-Christoph Borchardt
354b72b9d3 Use correct typeface for avatar generator 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-10-23 13:13:35 +02:00
Jan-Christoph Borchardt
3259d427ee Use correct typeface for txt previews 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-10-23 13:13:21 +02:00
Morris Jobke
2a17281cb6 Load apps/APP/l10n/*.js and themes/THEME/apps/APP/l10n/*.js 
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>
 2018-10-22 11:02:25 +02:00