Commit graph

11800 commits

Author SHA1 Message Date
AndyScherzinger
93ef48add6
codacy: field has the same name as a method 2018-09-19 14:12:31 +02:00
Andy Scherzinger
2c6bfc4c9e
Merge pull request #3057 from nextcloud/changelog330
Changelog 3.3.0
2018-09-19 11:15:03 +02:00
Andy Scherzinger
fd23d58cb9
release 3.3.0 2018-09-19 10:05:16 +02:00
Andy Scherzinger
d40a4a1731
Merge pull request #3055 from nextcloud/changeRCversion
change RC starting with 51
2018-09-19 09:16:02 +02:00
tobiasKaminsky
01edfe6491
change RC starting with 51
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-19 07:46:50 +02:00
Andy Scherzinger
ae94e219ba
Merge pull request #3054 from nextcloud/dependabot/gradle/org.jetbrains-annotations-16.0.3
Bump annotations from 16.0.2 to 16.0.3
2018-09-19 07:13:17 +02:00
dependabot[bot]
1958c06b87
Bump annotations from 16.0.2 to 16.0.3
Bumps [annotations](https://github.com/JetBrains/java-annotations) from 16.0.2 to 16.0.3.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Commits](https://github.com/JetBrains/java-annotations/commits/16.0.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-19 01:12:56 +00:00
Tobias Kaminsky
c543846918 daily dev 20180919 2018-09-19 00:32:05 +02:00
Andy Scherzinger
6b0023a28a
Merge pull request #3048 from nextcloud/bumpDroneVersion
Bump drone version
2018-09-18 18:30:34 +02:00
tobiasKaminsky
bdef26f774
Use docker 40
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-18 14:51:51 +02:00
tobiasKaminsky
0efdf2bbac
Add room share type
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-18 14:48:29 +02:00
Andy Scherzinger
a6910a3d13
Merge pull request #3050 from nextcloud/fixCanvasTooLarge
Fix CanvasTooLargeException
2018-09-18 13:14:18 +02:00
tobiasKaminsky
6909794879
fix CanvasTooLargeException
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-18 11:11:21 +02:00
Nextcloud bot
3f3cef84b1
[tx-robot] updated from transifex 2018-09-18 08:41:48 +00:00
Nextcloud bot
6caa0b927b
[tx-robot] updated from transifex 2018-09-18 00:47:16 +00:00
Tobias Kaminsky
a1253ce117 daily dev 20180918 2018-09-18 00:32:01 +02:00
Andy Scherzinger
d9ce5b0228
Merge pull request #3044 from nextcloud/handlePermissions
Correct handle write protected folders
2018-09-17 08:12:59 +02:00
Nextcloud bot
df742e0712
[tx-robot] updated from transifex 2018-09-17 00:50:37 +00:00
Nextcloud bot
3d3980a67b
[tx-robot] updated from transifex 2018-09-16 00:49:33 +00:00
Nextcloud bot
785433108e
[tx-robot] updated from transifex 2018-09-15 00:48:36 +00:00
Tobias Kaminsky
1f8854769b daily dev 20180915 2018-09-15 00:32:34 +02:00
tobiasKaminsky
4da88c2acb
correct handle write protected folders
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-14 13:59:54 +02:00
Tobias Kaminsky
c99cea497d
Merge pull request #3031 from NilsGriebner/upload_filepicker_footer
Fix upload filepicker footer view
2018-09-14 11:40:25 +02:00
Nextcloud bot
521b1cda01
[tx-robot] updated from transifex 2018-09-14 07:47:37 +00:00
Andy Scherzinger
aa09934df1
fix string 2018-09-14 09:41:09 +02:00
Tobias Kaminsky
82ea0bcd68
Merge pull request #3027 from nextcloud/sso
add own sso token manager with custom dialog
2018-09-14 08:34:56 +02:00
Nextcloud bot
903b0802a0
[tx-robot] updated from transifex 2018-09-14 06:28:43 +00:00
Nextcloud bot
0e7e85fabf
[tx-robot] updated from transifex 2018-09-14 00:50:08 +00:00
Tobias Kaminsky
23a1a1f3b6 daily dev 20180914 2018-09-14 00:32:13 +02:00
AndyScherzinger
e46aacc9c8
fix codacy 2018-09-13 19:06:31 +02:00
AndyScherzinger
7a7c1100c3
polish SSO dialog 2018-09-13 18:49:12 +02:00
AndyScherzinger
e164da3beb
add license header and line break to xml file 2018-09-13 18:18:02 +02:00
AndyScherzinger
e04b94b2f6
improve permission screen design 2018-09-13 18:18:01 +02:00
David Luhmer
fddcbbbecd
fix issues reported by codacy 2018-09-13 18:18:01 +02:00
David Luhmer
d0f474e611
fix issues reported by codacy 2018-09-13 18:18:00 +02:00
David Luhmer
086492b6d4
add own sso token manager with custom dialog 2018-09-13 18:17:59 +02:00
Andy Scherzinger
5ac1af47c1
Merge pull request #3037 from nextcloud/switchAccount
Fix account switching: After adding an account, the app restart and uses the new account
2018-09-13 12:51:36 +02:00
tobiasKaminsky
0c86ed9f77
fix account switching: now after adding an account, the app restart and uses the new account
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-13 11:28:05 +02:00
Andy Scherzinger
ff6cf2df4a
Merge pull request #3033 from nextcloud/quickfixForUnknownSharingType
Quickfix for unknown SharingTypes
2018-09-13 10:16:16 +02:00
tobiasKaminsky
9f2b8a73c8
quickfix for unknown SharingTypes
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-13 09:04:41 +02:00
Andy Scherzinger
c4bbb792dc
Merge pull request #3032 from nextcloud/dependabot/gradle/jacocoVersion
Bump jacocoVersion from 0.7.4.201502262128 to 0.8.2
2018-09-13 06:32:54 +02:00
dependabot[bot]
ba84def527
Bump jacocoVersion from 0.7.4.201502262128 to 0.8.2
Bumps `jacocoVersion` from 0.7.4.201502262128 to 0.8.2.

Updates `org.jacoco.ant` from 0.7.4.201502262128 to 0.8.2
- [Release notes](https://github.com/jacoco/jacoco/releases)
- [Commits](https://github.com/jacoco/jacoco/commits/v0.8.2)

Updates `org.jacoco.agent` from 0.7.4.201502262128 to 0.8.2
- [Release notes](https://github.com/jacoco/jacoco/releases)
- [Commits](https://github.com/jacoco/jacoco/commits/v0.8.2)

Updates `org.jacoco.core` from 0.7.4.201502262128 to 0.8.2
- [Release notes](https://github.com/jacoco/jacoco/releases)
- [Commits](https://github.com/jacoco/jacoco/commits/v0.8.2)

Updates `org.jacoco.report` from 0.7.4.201502262128 to 0.8.2
- [Release notes](https://github.com/jacoco/jacoco/releases)
- [Commits](https://github.com/jacoco/jacoco/commits/v0.8.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-13 01:14:21 +00:00
Nextcloud bot
d7d2e1916f
[tx-robot] updated from transifex 2018-09-13 00:49:04 +00:00
Tobias Kaminsky
cc66d8857e daily dev 20180913 2018-09-13 00:33:41 +02:00
Nils Griebner
b49e881d43 Fix upload filepicker footer view 2018-09-12 20:07:44 +02:00
Andy Scherzinger
fc62aa42b8
Merge pull request #3010 from nextcloud/codacy
Codacy
2018-09-12 16:41:32 +02:00
Andy Scherzinger
fc3a911a14
Merge pull request #3028 from nextcloud/deleteProguard
Delete proguard
2018-09-12 16:04:59 +02:00
AndyScherzinger
ee4ec654de
CR 2018-09-12 16:02:59 +02:00
Tobias Kaminsky
755425cf0c
Delete proguard
As discussed in https://github.com/nextcloud/android-library/issues/160 proguard.cfg is not correctly working.
As we do not use it, this should be removed.
2018-09-12 14:51:23 +02:00
AndyScherzinger
c839a5b83e
codacy: avoid using Literals in Conditional Statements 2018-09-12 13:53:21 +02:00