Commit graph

11392 commits

Author SHA1 Message Date
Andy Scherzinger
4a9d42b785
Merge pull request #2994 from nextcloud/dependabot/gradle/com.github.albfernandez-juniversalchardet-2.1.0
Bump juniversalchardet from v2.0.0 to 2.1.0
2018-09-07 16:53:51 +02:00
dependabot[bot]
dbe451e5dd
Bump juniversalchardet from v2.0.0 to 2.1.0
Bumps [juniversalchardet](https://github.com/albfernandez/juniversalchardet) from v2.0.0 to 2.1.0.
- [Release notes](https://github.com/albfernandez/juniversalchardet/releases)
- [Commits](https://github.com/albfernandez/juniversalchardet/compare/v2.0.0...v2.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-07 14:42:05 +00:00
Andy Scherzinger
26c56114ee
Merge pull request #2980 from nextcloud/preventNPEonMediaStream
Prevent NPE on media stream
2018-09-07 16:36:33 +02:00
Andy Scherzinger
b27beb7f8f
Merge pull request #2982 from nextcloud/addProviderException
Add provider Exception
2018-09-07 16:35:42 +02:00
Andy Scherzinger
0f5febd1ae
Merge pull request #2971 from nextcloud/bumpLibs
Library upgrades
2018-09-07 15:43:55 +02:00
tobiasKaminsky
2e5bdd5c4d
add provider Exception
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-07 12:10:51 +02:00
Tobias Kaminsky
659649791c
Merge pull request #2967 from nextcloud/removeGCM
Remove gcm as we use firebase messaging
2018-09-07 11:57:44 +02:00
tobiasKaminsky
ba26aa741a
prevent NPE on media stream
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-07 09:21:59 +02:00
AndyScherzinger
9a8b57c3a6
mockito-core 2.2.5->2.21.0 2018-09-07 09:12:06 +02:00
AndyScherzinger
f7202bb13a
fb-contrib 7.4.2->7.4.3 2018-09-07 09:12:05 +02:00
AndyScherzinger
a403109464
findsecbugs-plugin 1.4.4->1.8.0 2018-09-07 09:12:05 +02:00
AndyScherzinger
da4f2a2831
eventbus 3.0.0->3.1.1 2018-09-07 09:11:56 +02:00
Tobias Kaminsky
16afbeb3eb daily dev 20180907 2018-09-07 00:32:22 +02:00
Andy Scherzinger
8b0a4ca09c
Merge pull request #2974 from nextcloud/fixExitMode
Nullable check on exit mode
2018-09-06 18:10:16 +02:00
Andy Scherzinger
d8ba6f3c3a
Merge pull request #2916 from nextcloud/codacy
Further codacy fixes
2018-09-06 18:09:01 +02:00
AndyScherzinger
1ccccb1ffe
codacy: All methods are static. Consider using a utility class instead. 2018-09-06 17:58:47 +02:00
AndyScherzinger
a0698feb96
fix var-arg call with null value 2018-09-06 17:58:47 +02:00
AndyScherzinger
c1ee0fbbb0
use Exception like done on master before 2018-09-06 17:58:46 +02:00
AndyScherzinger
77af543b48
codacy: using varargs for methods or constructors which take an array the last parameter 2018-09-06 17:58:46 +02:00
AndyScherzinger
ec6b1aa37d
refactor delete method to reduce method complexity 2018-09-06 17:58:45 +02:00
AndyScherzinger
ae256ad13a
extract sync into separate method to reduce complexity 2018-09-06 17:58:45 +02:00
AndyScherzinger
67e1cf39e9
codacy: replace literals with constants 2018-09-06 17:58:44 +02:00
AndyScherzinger
98ebd9b8c8
codacy: using varargs for methods and constructors which take an array the last parameter 2018-09-06 17:58:44 +02:00
AndyScherzinger
dfca74b1e8
codacy_ replace literals with constants 2018-09-06 17:58:43 +02:00
AndyScherzinger
63f2d407a4
codacy: fix newly created issues 2018-09-06 17:58:43 +02:00
AndyScherzinger
df18d6eccc
codacy: avoid using redundant field initializer 2018-09-06 17:58:42 +02:00
AndyScherzinger
eafa49c822
codacy: avoid declaring a variable if it is unreferenced before a possible exit point. 2018-09-06 17:58:41 +02:00
AndyScherzinger
54c36092c2
codacy: don't create exact same object several times in loop 2018-09-06 17:58:41 +02:00
AndyScherzinger
10eb9d3920
codacy: remove useless parentheses 2018-09-06 17:58:40 +02:00
AndyScherzinger
0275b81c7b
codacy: don't assign null 2018-09-06 17:58:40 +02:00
AndyScherzinger
4170370f63
codacy: don't create same object in a loop 2018-09-06 17:58:31 +02:00
tobiasKaminsky
06039a9e01
nullable check
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-06 11:28:32 +02:00
Tobias Kaminsky
d5fba307d7
Merge pull request #2969 from nextcloud/doNotBlock
Do not block on check for dev version
2018-09-06 09:31:03 +02:00
tobiasKaminsky
caaf13d678
do not block on check for dev version
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-05 16:02:45 +02:00
tobiasKaminsky
7f7ee24e2b
remove gcm as we use firebase messaging
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-05 12:23:00 +02:00
Tobias Kaminsky
681be2bad5
Merge pull request #2965 from nextcloud/showWhatsNewOnlyOnUpgrade
Show whats new screen only on update
2018-09-05 09:25:01 +02:00
tobiasKaminsky
37c974f871
show whats new screen only on update
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-05 08:15:08 +02:00
Nextcloud bot
bbd942c122
[tx-robot] updated from transifex 2018-09-05 00:46:59 +00:00
Tobias Kaminsky
25704d19a6 daily dev 20180905 2018-09-05 00:32:12 +02:00
Andy Scherzinger
cc21e815d8
Merge pull request #2962 from nextcloud/340alpha1
3.4.0 alpha 1
2018-09-04 15:59:20 +02:00
Andy Scherzinger
ce4a4d3652
3.4.0 alpha 1 2018-09-04 15:57:36 +02:00
Andy Scherzinger
051345a647
Merge pull request #2960 from nextcloud/addLinksToSummary
Add links to summary
2018-09-04 15:40:58 +02:00
Andy Scherzinger
c83356cd40
Merge pull request #1116 from nextcloud/sso
Proof of concept for Single Sign On
2018-09-04 15:38:47 +02:00
nextcloud-android-bot
625810803f Drone: update Lint results to reflect reduced error/warning count [skip ci] 2018-09-04 13:12:38 +00:00
Tobias Kaminsky
e329809802
Update lint-results.txt
update lint for #1116
2018-09-04 15:09:33 +02:00
Tobias Kaminsky
2a64998555
Merge branch 'master' into sso 2018-09-04 15:01:32 +02:00
tobiasKaminsky
79fdf11512
manually increase lint
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-04 15:00:40 +02:00
tobiasKaminsky
b9998c74f0
add links to summary
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-04 14:19:18 +02:00
David Luhmer
b26f5dc5d2
Merge pull request #2954 from nextcloud/sso_hashedToken
Use hashed/salted token
2018-09-04 14:14:24 +02:00
Andy Scherzinger
5ed69587e2
Merge pull request #2935 from nextcloud/improve-share-link-handling
Improve share link handling
2018-09-04 11:53:34 +02:00