Commit graph

13357 commits

Author SHA1 Message Date
Andy Scherzinger
a65d1dd210
Merge pull request #4253 from nextcloud/fixMaster
Master: get lint/warnings down
2019-07-23 11:42:15 +02:00
tobiasKaminsky
e9b06843e8
remove leftover
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-07-23 08:19:26 +02:00
tobiasKaminsky
6a925b7f27
wip
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-07-23 07:52:50 +02:00
tobiasKaminsky
fc01e9738e
wip
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-07-23 07:32:11 +02:00
tobiasKaminsky
ac3a6d5421
reformat imports
kotlin: do not use wildcard imports

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-07-23 07:26:35 +02:00
tobiasKaminsky
4c5eca98ec
remove leftovers from bottom bar removing
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-07-23 07:23:07 +02:00
Tobias Kaminsky
040b460811
show "shared" again (#4249)
show "shared" again
2019-07-23 07:01:54 +02:00
Tobias Kaminsky
10644635c5
Bump ktlint from 0.34.0 to 0.34.1 (#4252)
Bump ktlint from 0.34.0 to 0.34.1
2019-07-23 07:01:32 +02:00
tobiasKaminsky
eb68c36335
wip
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-07-23 07:00:19 +02:00
Tobias Kaminsky
a1477a1ea6 daily dev 20190723
eb6ba3de1 fix check if source code was modified (#4250)
d5691e274 fix check if source code was modified
5a4783000 [tx-robot] updated from transifex
5b0a53dbe [tx-robot] updated from transifex
e455de56f daily dev 20190720
2019-07-23 03:34:31 +02:00
dependabot-preview[bot]
31a7f9ad81
Bump ktlint from 0.34.0 to 0.34.1
Bumps [ktlint](https://github.com/pinterest/ktlint) from 0.34.0 to 0.34.1.
- [Release notes](https://github.com/pinterest/ktlint/releases)
- [Changelog](https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pinterest/ktlint/compare/0.34.0...0.34.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-23 01:12:15 +00:00
Tobias Kaminsky
eb6ba3de15
fix check if source code was modified (#4250)
fix check if source code was modified
2019-07-22 15:28:38 +02:00
tobiasKaminsky
d5691e274c
fix check if source code was modified
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-07-22 14:55:49 +02:00
tobiasKaminsky
94e4de20f8
show "shares" again
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-07-22 13:40:05 +02:00
Nextcloud bot
5a4783000d
[tx-robot] updated from transifex 2019-07-21 03:10:08 +00:00
Nextcloud bot
5b0a53dbe0
[tx-robot] updated from transifex 2019-07-20 03:06:13 +00:00
Tobias Kaminsky
e455de56ff daily dev 20190720
b3269e696 Merge pull request #4242 from nextcloud/tintEdit
a22a52ab8 new approach for tinted cursors
813a448bc [tx-robot] updated from transifex
181fb374e daily dev 20190717
2019-07-20 03:34:32 +02:00
Andy Scherzinger
b3269e6960
Merge pull request #4242 from nextcloud/tintEdit
new approach for tinted cursors
2019-07-19 15:58:35 +02:00
tobiasKaminsky
a22a52ab81
new approach for tinted cursors
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-07-19 12:04:28 +02:00
Nextcloud bot
813a448bc0
[tx-robot] updated from transifex 2019-07-19 03:18:28 +00:00
Tobias Kaminsky
181fb374e8 daily dev 20190717
4f1a72594 Merge pull request #4238 from nextcloud/removeBottomBar
e2d34d18c Merge pull request #4237 from nextcloud/removeSSO_SAML
d868fcc15 remove old and unmaintained bottom bar
49cca17fc Remove last usage of SSO/Saml
ee060bd57 Bump ktlint from 0.33.0 to 0.34.0 (#4236)
f71a605a4 [tx-robot] updated from transifex
e83f45a36 daily dev 20190716
2019-07-17 03:35:33 +02:00
Andy Scherzinger
4f1a725942
Merge pull request #4238 from nextcloud/removeBottomBar
Remove old and unmaintained bottom bar
2019-07-16 20:20:40 +02:00
Andy Scherzinger
e2d34d18cf
Merge pull request #4237 from nextcloud/removeSSO_SAML
Remove last usage of SSO/Saml
2019-07-16 18:25:40 +02:00
tobiasKaminsky
d868fcc154
remove old and unmaintained bottom bar
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-07-16 14:51:32 +02:00
tobiasKaminsky
49cca17fcc
Remove last usage of SSO/Saml
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-07-16 10:29:30 +02:00
Tobias Kaminsky
ee060bd576
Bump ktlint from 0.33.0 to 0.34.0 (#4236)
Bump ktlint from 0.33.0 to 0.34.0
2019-07-16 07:15:55 +02:00
Nextcloud bot
f71a605a4d
[tx-robot] updated from transifex 2019-07-16 03:04:23 +00:00
Tobias Kaminsky
e83f45a36e daily dev 20190716
2a13825fe Merge pull request #4226 from nextcloud/runDrone
d9d9ad51c Run drone only if source file changed
2c41e9289 [tx-robot] updated from transifex
7d224f744 daily dev 20190713
2019-07-16 03:34:36 +02:00
dependabot-preview[bot]
d77c977754
Bump ktlint from 0.33.0 to 0.34.0
Bumps [ktlint](https://github.com/pinterest/ktlint) from 0.33.0 to 0.34.0.
- [Release notes](https://github.com/pinterest/ktlint/releases)
- [Changelog](https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pinterest/ktlint/compare/0.33.0...0.34.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-16 01:12:42 +00:00
Tobias Kaminsky
2a13825fec
Merge pull request #4226 from nextcloud/runDrone
Run drone only if source file changed
2019-07-15 08:30:01 +02:00
tobiasKaminsky
d9d9ad51ce
Run drone only if source file changed
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-07-15 08:25:49 +02:00
Nextcloud bot
2c41e9289d
[tx-robot] updated from transifex 2019-07-15 06:05:12 +00:00
Tobias Kaminsky
7d224f7444 daily dev 20190713
84d4d16c1 Merge pull request #4225 from nextcloud/changelog370
453584613 Update changelog to 3.7.0
9fa458e55 daily dev 20190711
2019-07-13 03:34:34 +02:00
Andy Scherzinger
84d4d16c12
Merge pull request #4225 from nextcloud/changelog370
Update changelog to 3.7.0
2019-07-12 13:56:39 +02:00
Andy Scherzinger
453584613d
Update changelog to 3.7.0
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-07-12 13:38:25 +02:00
Tobias Kaminsky
9fa458e55b daily dev 20190711
85c129c9a Merge pull request #4217 from nextcloud/fixGSS
2c2425812 fix GSS on android: we send custom user agent to have info about device, but we need some identifier
e3923b24c Merge pull request #4214 from nextcloud/dependabot/gradle/com.android.tools.build-gradle-3.4.2
5362f4fdc daily dev 20190710
2019-07-11 03:37:21 +02:00
Andy Scherzinger
85c129c9a9
Merge pull request #4217 from nextcloud/fixGSS
fix GSS on android
2019-07-10 19:15:10 +02:00
tobiasKaminsky
2c2425812f
fix GSS on android: we send custom user agent to have info about device, but we need some identifier
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-07-10 16:46:20 +02:00
Andy Scherzinger
e3923b24cf
Merge pull request #4214 from nextcloud/dependabot/gradle/com.android.tools.build-gradle-3.4.2
Bump gradle from 3.4.1 to 3.4.2
2019-07-10 07:25:59 +02:00
Tobias Kaminsky
5362f4fdc9 daily dev 20190710
69aba84d3 Merge pull request #4211 from nextcloud/sameMajor
0e1e7b1a5 bump to 3.8.0-Alpha1
9c715c6ee revert back to master
48ef271b0 Bump mockito-core from 2.28.2 to 3.0.0 (#4209)
883dc6925 Use sameMajorVersion of OwnCloudVersion
3c3de1c14 [tx-robot] updated from transifex
d1bd52ade Bump mockito-core from 2.28.2 to 3.0.0
e48d3597b [tx-robot] updated from transifex
beaedfa1a [tx-robot] updated from transifex
bbe7a5268 daily dev 20190705
2019-07-10 03:35:37 +02:00
dependabot-preview[bot]
c67f2223bd
Bump gradle from 3.4.1 to 3.4.2
Bumps gradle from 3.4.1 to 3.4.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-10 01:12:15 +00:00
Andy Scherzinger
69aba84d34
Merge pull request #4211 from nextcloud/sameMajor
Use sameMajorVersion of OwnCloudVersion
2019-07-10 00:07:23 +02:00
Andy Scherzinger
0e1e7b1a58
bump to 3.8.0-Alpha1
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-07-09 17:14:20 +02:00
Andy Scherzinger
9c715c6eef
revert back to master
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-07-09 17:08:08 +02:00
Tobias Kaminsky
48ef271b02
Bump mockito-core from 2.28.2 to 3.0.0 (#4209)
Bump mockito-core from 2.28.2 to 3.0.0
2019-07-09 11:02:52 +02:00
tobiasKaminsky
883dc6925d
Use sameMajorVersion of OwnCloudVersion
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-07-09 08:24:19 +02:00
Nextcloud bot
3c3de1c149
[tx-robot] updated from transifex 2019-07-09 02:56:43 +00:00
dependabot-preview[bot]
d1bd52ade8
Bump mockito-core from 2.28.2 to 3.0.0
Bumps [mockito-core](https://github.com/mockito/mockito) from 2.28.2 to 3.0.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.28.2...v3.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-09 01:12:35 +00:00
Nextcloud bot
e48d3597bf
[tx-robot] updated from transifex 2019-07-06 02:56:51 +00:00
Nextcloud bot
beaedfa1a9
[tx-robot] updated from transifex 2019-07-05 02:59:17 +00:00