Commit graph

14345 commits

Author SHA1 Message Date
dependabot-preview[bot]
4a957714ea
Bump work-runtime-ktx from 2.3.2 to 2.3.3
Bumps work-runtime-ktx from 2.3.2 to 2.3.3.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-06 11:06:50 +00:00
Andy Scherzinger
232c801c9f
Merge pull request #5569 from nextcloud/removeUnusedClass
remove unused class
2020-03-06 12:03:37 +01:00
Andy Scherzinger
11aa3e1575
master is at 94 lint warnings
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-03-06 11:10:30 +01:00
Andy Scherzinger
98e4acc75a
remove ununsed raw files
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-03-06 09:59:35 +01:00
tobiasKaminsky
793dd901a2
remove unused class
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-06 09:59:34 +01:00
Nextcloud bot
b4a6ce98c1
[tx-robot] updated from transifex 2020-03-06 03:31:35 +00:00
Tobias Kaminsky
2061207e25
Merge pull request #5531 from nextcloud/fix/AS36
Update to Android Studio 3.6
2020-03-05 09:58:46 +01:00
Tobias Kaminsky
bac4e9b854
Merge pull request #5582 from nextcloud/dependabot/gradle/androidx.appcompat-appcompat-1.2.0-alpha03
Bump appcompat from 1.2.0-alpha02 to 1.2.0-alpha03
2020-03-05 08:50:22 +01:00
Tobias Kaminsky
c00b13df12
Merge pull request #5491 from nextcloud/conflictDialog
Enhance conflict dialog
2020-03-05 08:40:07 +01:00
tobiasKaminsky
30ac72652e
Fix test
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-05 08:22:58 +01:00
dependabot-preview[bot]
dc01b2d5ab
Merge pull request #5583 from nextcloud/dependabot/gradle/androidx.work-work-runtime-2.3.3 2020-03-05 07:11:55 +00:00
Nextcloud bot
4f47892823
[tx-robot] updated from transifex 2020-03-05 03:31:48 +00:00
dependabot-preview[bot]
9c10afa84e
Bump work-runtime from 2.3.2 to 2.3.3
Bumps work-runtime from 2.3.2 to 2.3.3.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-05 02:13:15 +00:00
dependabot-preview[bot]
ca6a4e39c2
Bump appcompat from 1.2.0-alpha02 to 1.2.0-alpha03
Bumps appcompat from 1.2.0-alpha02 to 1.2.0-alpha03.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-05 02:12:42 +00:00
Andy Scherzinger
4d231841d0
Merge pull request #5575 from nextcloud/devLibraryChange
update dev changelog recognition for updating library
2020-03-04 11:11:01 +01:00
Andy Scherzinger
7e595f713c
Merge pull request #5574 from nextcloud/dependabot/gradle/kotlin_version-1.3.70
Bump kotlin_version from 1.3.61 to 1.3.70
2020-03-04 11:10:25 +01:00
tobiasKaminsky
185123c58f
update dev changelog recognition for updating library
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-04 07:40:33 +01:00
Nextcloud bot
24f8bdbd29
[tx-robot] updated from transifex 2020-03-04 03:29:28 +00:00
dependabot-preview[bot]
f63502a8fa
Bump kotlin_version from 1.3.61 to 1.3.70
Bumps `kotlin_version` from 1.3.61 to 1.3.70.

Updates `kotlin-gradle-plugin` from 1.3.61 to 1.3.70

Updates `kotlin-stdlib-jdk7` from 1.3.61 to 1.3.70
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.3.70/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.3.61...v1.3.70)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-04 02:14:04 +00:00
Andy Scherzinger
2ffb6dab5f
Merge pull request #5566 from nextcloud/hideOldLogin
Disable old login method
2020-03-03 13:17:36 +01:00
tobiasKaminsky
7ca6f304ed
Use proper dialog instantiation
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-03 10:31:04 +01:00
tobiasKaminsky
b8c4c68275
Fixes during CR
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-03 10:31:03 +01:00
tobiasKaminsky
836e51fa79
Remove unneeded strings
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-03 10:31:03 +01:00
tobiasKaminsky
628e58e65e
Fixe during CR
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-03 10:31:03 +01:00
tobiasKaminsky
ae08a42f8a
Enhance conflict dialog
- fix bug
- add ui tests
- add instrumented tests

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-03 10:31:03 +01:00
Tobias Kaminsky
3ae41ec9fa
Merge pull request #5549 from endre-borcsok/bugfix/crash_in_activities
Fixed crash in Activities tab.
2020-03-03 10:30:21 +01:00
Tobias Kaminsky
de7b7f5c06
Merge pull request #5345 from Charon77/deep_link
Allows deep linking to open files
2020-03-03 10:26:06 +01:00
Tobias Kaminsky
1e3c6d1080
Merge pull request #5537 from nextcloud/folderFileString
Split up share internal link
2020-03-03 09:45:22 +01:00
Tobias Kaminsky
3dde163c70
Merge pull request #5496 from nextcloud/fix/5232
properly colorize text preview gradient based on theme (day/night)
2020-03-03 09:44:37 +01:00
Andy Scherzinger
b9df3de466
use app namespace instead of android
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-03-03 09:39:47 +01:00
tobiasKaminsky
01b1e719ff
delombok everything
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-03 09:39:28 +01:00
Andy Scherzinger
e5e4973c60
Update to AS 3.6.1
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-03-03 09:39:14 +01:00
Andy Scherzinger
bd0d38227a
Update to AS3.6
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-03-03 09:39:06 +01:00
tobiasKaminsky
b9ea5d44ba
switch back to light mode after test
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-03 08:52:32 +01:00
tobiasKaminsky
daf3e9aebd
remove unneeded strings
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-03 08:49:13 +01:00
tobiasKaminsky
a341ebcc83
Disable old login method
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-03 08:32:16 +01:00
Tobias Kaminsky
3ca46b9a19
Merge pull request #5564 from nextcloud/devLibrary2
fix dev lib replacement
2020-03-03 07:23:43 +01:00
tobiasKaminsky
d8ada799f3
fix dev lib replacement
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-03 07:22:49 +01:00
Nextcloud bot
cd794ab1c1
[tx-robot] updated from transifex 2020-03-03 03:31:11 +00:00
Endre Borcsok
bf7d33066b Fixed crash in Activities tab.
Replaced Toast.makeText() methods to DisplayUtils.showSnackMessage().

Signed-off-by: Endre Borcsok <ebsoftmobile@gmail.com>
2020-03-02 20:49:53 +00:00
Tobias Kaminsky
40afe563f3
Merge pull request #5560 from nextcloud/devLibrary
dev: change library before building
2020-03-02 16:16:26 +01:00
tobiasKaminsky
391a9fe8e3
dev: change library before building
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-02 16:15:42 +01:00
Tobias Kaminsky
6d6d8898cd
Merge pull request #5530 from nextcloud/better-dev-changelogs
Improve dev edition changelog generation
2020-03-02 16:13:21 +01:00
tobiasKaminsky
83b67b93ad
Update english
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-02 15:52:54 +01:00
Nextcloud bot
db8d3a5d18
[tx-robot] updated from transifex 2020-03-02 11:39:28 +00:00
Andy Scherzinger
c578eccade
Merge pull request #5557 from nextcloud/slideshow
Show slideshow as new activity
2020-03-02 11:17:59 +01:00
nextcloud-android-bot
059eb9176c Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2020-03-02 08:32:04 +00:00
tobiasKaminsky
4013c47b48
Show slideshow as new activity
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-02 08:45:33 +01:00
tobiasKaminsky
78adcfb3d6
Split up share internal link
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-27 20:10:51 +01:00
Andy Scherzinger
d88dac6284
Merge pull request #5536 from nextcloud/changeFolderString
Change to better english
2020-02-27 20:06:17 +01:00