mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-24 22:25:44 +03:00
Code Issues Projects Releases Packages Wiki Activity
15750 commits 228 branches 1571 tags 618 MiB
Commit graph

15750 commits

This branch
This branch
All branches
Author SHA1 Message Date
dependabot-preview[bot]
de38e90acb
Merge pull request #6764 from nextcloud/dependabot/gradle/io.gitlab.arturbosch.detekt-detekt-gradle-plugin-1.11.2 2020-08-21 07:33:04 +00:00
Tobias Kaminsky
6c043bff77
Merge pull request #6763 from nextcloud/dependabot/gradle/org.conscrypt-conscrypt-android-2.5.0 
Bump conscrypt-android from 2.4.0 to 2.5.0
 2020-08-21 09:32:50 +02:00
tobiasKaminsky
23b05f3a56
Fix #5755 
- use correct name collision info by synced folder
- syncedFolder.getNameCollisionPolicyInt -> returns int
- syncedFolder.getNameColllisionPolicy -> returns enum
- remove not needed backgroundJobManager from FilesSyncWork.kt

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-21 09:21:32 +02:00
Nextcloud bot
bf460b7451
[tx-robot] updated from transifex 2020-08-21 03:31:44 +00:00
dependabot-preview[bot]
da01fff04f
Bump detekt-gradle-plugin from 1.11.1 to 1.11.2 
Bumps detekt-gradle-plugin from 1.11.1 to 1.11.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-20 15:04:06 +00:00
dependabot-preview[bot]
916c503a2f
Bump conscrypt-android from 2.4.0 to 2.5.0 
Bumps [conscrypt-android](https://github.com/google/conscrypt) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/google/conscrypt/releases)
- [Commits](https://github.com/google/conscrypt/compare/2.4.0...2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-20 15:03:02 +00:00
Andy Scherzinger
dcf7455e57
Merge pull request #6760 from nextcloud/passwortToShare 
Fix crash on setting password
 2020-08-20 14:00:11 +02:00
tobiasKaminsky
886d42dc0f
Fix crash on setting password 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-20 12:30:18 +02:00
Tobias Kaminsky
800da337e9
Merge pull request #6744 from nextcloud/mnemonicTest 
fix mnemonic test
 2020-08-20 10:39:10 +02:00
Nextcloud bot
b75b151906
[tx-robot] updated from transifex 2020-08-20 03:33:56 +00:00
Tobias Kaminsky
4b9546335e
Merge pull request #6747 from nextcloud/bumpTo3.14Alpha 
Bump to 3.14.0 Alpha
 2020-08-19 10:48:36 +02:00
tobiasKaminsky
43d2edec47
also fix FDA open test 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-19 10:22:06 +02:00
Andy Scherzinger
457a5f1e90
Bump to 3.14.0 Alpha 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2020-08-19 09:48:20 +02:00
Andy Scherzinger
9a72f408c4
Merge pull request #6743 from nextcloud/changelog-master-stable-3.13.0 
Add changelog for 3.13.0
 2020-08-19 09:39:55 +02:00
tobiasKaminsky
0ecc933d5f
fix mnemonic test 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-19 09:19:26 +02:00
Tobias Kaminsky
8e33dd89fc
Merge pull request #6740 from nextcloud/dependabot/gradle/io.gitlab.arturbosch.detekt-detekt-gradle-plugin-1.11.1 
Bump detekt-gradle-plugin from 1.11.0 to 1.11.1
 2020-08-19 09:19:00 +02:00
Nextcloud bot
47898e5d0d
[tx-robot] updated from transifex 2020-08-19 03:34:36 +00:00
dependabot-preview[bot]
51ebac6aa4
Bump detekt-gradle-plugin from 1.11.0 to 1.11.1 
Bumps detekt-gradle-plugin from 1.11.0 to 1.11.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-19 01:13:25 +00:00
Jos Poortvliet
b5ff570d3c
Update CONTRIBUTING.md 2020-08-18 15:07:42 +02:00
tobiasKaminsky
039c4ee350
Add changelog for 3.13.0 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-18 10:37:42 +02:00
Tobias Kaminsky
5a1e57dbd1
Merge pull request #6724 from nextcloud/hideBigLoadingSpinner 
Do not show big spinner when initial loading a folder that is known to be not empty
 2020-08-18 09:38:39 +02:00
Tobias Kaminsky
5640c8c522
Merge pull request #6715 from nextcloud/fabOnSharing 
hide FAB on sharing view
 2020-08-18 08:45:05 +02:00
tobiasKaminsky
a6e0d2b8bf
Do not show big spinner when initial loading a folder that is known to be not empty, or on PhotoFragment 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-18 08:40:15 +02:00
Tobias Kaminsky
cd3cd7962a
Merge pull request #6701 from nextcloud/fix/dialogButtonTinting 
Correct call order when tinting the dialog button
 2020-08-18 08:30:27 +02:00
Tobias Kaminsky
872901fca4
Merge pull request #6714 from nextcloud/e2e_oldsupport 
E2E: support old iv delimiter, read only
 2020-08-18 07:54:28 +02:00
Nextcloud bot
0fe4115a67
[tx-robot] updated from transifex 2020-08-18 03:36:21 +00:00
Tobias Kaminsky
ee075f285c
Merge pull request #6721 from grote/6719-npe-onTransferProgress 
Prevent NPE: Ensure that mNotificationManager is not null
 2020-08-17 20:32:27 +02:00
tobiasKaminsky
c88cd18774
E2E: support old iv delimiter, read only 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-17 20:28:45 +02:00
Torsten Grote
8fbfc9028a
Ensure that mNotificationManager is not null when updating transfer progress 
This might happen, if the FileUploader service is being destroyed,
so mNotificationManager is set to null.

The applied fix has been used in a couple of other places in this file
as well, so it is at least consistent.

Signed-off-by: Torsten Grote <t@grobox.de>
 2020-08-17 11:03:39 -03:00
Andy Scherzinger
2bead6a747
make sure sorting is hidden too for details view 
remove redundant calls

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2020-08-17 13:58:47 +02:00
tobiasKaminsky
2a48130c55
hide FAB on sharing view 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-17 11:22:29 +02:00
Nextcloud bot
f71827c014
[tx-robot] updated from transifex 2020-08-17 03:29:39 +00:00
tobiasKaminsky
be04dec3ea
add tests 
- for error: UI test
- for mnemonic: we cannot capture dialog, so it is only an integration test

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-17 03:01:30 +02:00
Tobias Kaminsky
9cbbc556e0
Merge pull request #6703 from nextcloud/dependabot/gradle/kotlin_version-1.4.0 
Bump kotlin_version from 1.3.72 to 1.4.0
 2020-08-17 02:20:17 +02:00
Nextcloud bot
e26b403e42
[tx-robot] updated from transifex 2020-08-16 03:29:45 +00:00
dependabot-preview[bot]
4427aa8204
Merge pull request #6702 from nextcloud/dependabot/gradle/markwonVersion-4.5.1 2020-08-14 16:03:56 +00:00
dependabot-preview[bot]
2bde2df257
Bump kotlin_version from 1.3.72 to 1.4.0 
Bumps `kotlin_version` from 1.3.72 to 1.4.0.

Updates `kotlin-gradle-plugin` from 1.3.72 to 1.4.0

Updates `kotlin-stdlib-jdk7` from 1.3.72 to 1.4.0
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Commits](https://github.com/JetBrains/kotlin/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-14 14:22:23 +00:00
dependabot-preview[bot]
622f1ae1d6
Bump markwonVersion from 4.5.0 to 4.5.1 
Bumps `markwonVersion` from 4.5.0 to 4.5.1.

Updates `core` from 4.5.0 to 4.5.1
- [Release notes](https://github.com/noties/Markwon/releases)
- [Changelog](https://github.com/noties/Markwon/blob/master/CHANGELOG.md)
- [Commits](https://github.com/noties/Markwon/compare/v4.5.0...v4.5.1)

Updates `ext-strikethrough` from 4.5.0 to 4.5.1
- [Release notes](https://github.com/noties/Markwon/releases)
- [Changelog](https://github.com/noties/Markwon/blob/master/CHANGELOG.md)
- [Commits](https://github.com/noties/Markwon/compare/v4.5.0...v4.5.1)

Updates `ext-tables` from 4.5.0 to 4.5.1
- [Release notes](https://github.com/noties/Markwon/releases)
- [Changelog](https://github.com/noties/Markwon/blob/master/CHANGELOG.md)
- [Commits](https://github.com/noties/Markwon/compare/v4.5.0...v4.5.1)

Updates `ext-tasklist` from 4.5.0 to 4.5.1
- [Release notes](https://github.com/noties/Markwon/releases)
- [Changelog](https://github.com/noties/Markwon/blob/master/CHANGELOG.md)
- [Commits](https://github.com/noties/Markwon/compare/v4.5.0...v4.5.1)

Updates `html` from 4.5.0 to 4.5.1
- [Release notes](https://github.com/noties/Markwon/releases)
- [Changelog](https://github.com/noties/Markwon/blob/master/CHANGELOG.md)
- [Commits](https://github.com/noties/Markwon/compare/v4.5.0...v4.5.1)

Updates `syntax-highlight` from 4.5.0 to 4.5.1
- [Release notes](https://github.com/noties/Markwon/releases)
- [Changelog](https://github.com/noties/Markwon/blob/master/CHANGELOG.md)
- [Commits](https://github.com/noties/Markwon/compare/v4.5.0...v4.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-14 14:19:40 +00:00
Andy Scherzinger
f2f4265a42
Fixes #6675 correct call order when tinting the dialog button 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2020-08-14 10:09:21 +02:00
Andy Scherzinger
c65d50a8ee
Merge pull request #6698 from nextcloud/dependabot/gradle/io.gitlab.arturbosch.detekt-detekt-gradle-plugin-1.11.0 
Bump detekt-gradle-plugin from 1.10.0 to 1.11.0
 2020-08-14 09:17:38 +02:00
Nextcloud bot
d85063ef67
[tx-robot] updated from transifex 2020-08-14 03:46:02 +00:00
dependabot-preview[bot]
d3fb6a2ab6
Bump detekt-gradle-plugin from 1.10.0 to 1.11.0 
Bumps detekt-gradle-plugin from 1.10.0 to 1.11.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-14 01:14:09 +00:00
dependabot-preview[bot]
18b9b0f147
Merge pull request #6695 from nextcloud/dependabot/gradle/butterknifeVersion-10.2.3 2020-08-13 15:05:48 +00:00
Nextcloud bot
f1dfd44f07
[tx-robot] updated from transifex 2020-08-13 03:32:10 +00:00
dependabot-preview[bot]
3d934ed9fa
Bump butterknifeVersion from 10.2.2 to 10.2.3 
Bumps `butterknifeVersion` from 10.2.2 to 10.2.3.

Updates `butterknife` from 10.2.2 to 10.2.3
- [Release notes](https://github.com/JakeWharton/butterknife/releases)
- [Changelog](https://github.com/JakeWharton/butterknife/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JakeWharton/butterknife/compare/10.2.2...10.2.3)

Updates `butterknife-compiler` from 10.2.2 to 10.2.3
- [Release notes](https://github.com/JakeWharton/butterknife/releases)
- [Changelog](https://github.com/JakeWharton/butterknife/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JakeWharton/butterknife/compare/10.2.2...10.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-13 01:13:36 +00:00
Nextcloud bot
f35ef1b320
[tx-robot] updated from transifex 2020-08-12 03:31:51 +00:00
Nextcloud bot
7daf2bfa5d
[tx-robot] updated from transifex 2020-08-11 03:31:28 +00:00
Tobias Kaminsky
7e08278246
Merge pull request #6667 from nextcloud/sortUpload 
add sort option to UploadFilesActivity and FolderPickerActivity
 2020-08-07 19:09:00 +02:00
tobiasKaminsky
bee0c7b4a1
add sort option to UploadFilesActivity and FolderPickerActivity 
added UI tests

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-07 17:51:22 +02:00
Andy Scherzinger
babbd23bf2
Merge pull request #6669 from nextcloud/duplicatedFAB 
removed FAB from text file preview and use FDA one
 2020-08-07 14:17:34 +02:00