Commit graph

14690 commits

Author SHA1 Message Date
tobiasKaminsky
6f5b671d8c
Directly show loading spinner
show "no files" only if folder is known to be empty

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-08 06:56:18 +02:00
tobiasKaminsky
949a5c3a4f
Fix crash while showing ConflictDialog
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-08 06:38:22 +02:00
Tobias Kaminsky
676e41092f
Merge pull request #5803 from nextcloud/disableRichWorkspace
Rich workspaces: can be null (if disabled), or string (empty or with content)
2020-04-07 17:58:09 +02:00
tobiasKaminsky
c43b234ae4
Rich workspaces: can be null (if disabled), or string (empty or with content)
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-07 16:57:40 +02:00
Andy Scherzinger
b413d942ad
Merge pull request #5823 from nextcloud/npeSearch
Search: only parse search if search event is there
2020-04-07 14:40:08 +02:00
tobiasKaminsky
54134c43b2
Search: only parse search if search event is there
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-07 13:33:26 +02:00
Tobias Kaminsky
b73040ec62
Merge pull request #5817 from nextcloud/GroupUserExpire
NC18+: add possibility to set expiration date on user/group shares
2020-04-07 10:37:03 +02:00
Nextcloud bot
d423baa0a3
[tx-robot] updated from transifex 2020-04-07 03:27:56 +00:00
tobiasKaminsky
4ea0892630
NC18+: add possibility to set expiration date on user/group shares
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-04-06 15:34:09 +02:00
Andy Scherzinger
e0d4a9df26
Merge pull request #5811 from nextcloud/dependabot/gradle/io.gitlab.arturbosch.detekt-detekt-gradle-plugin-1.7.4
Bump detekt-gradle-plugin from 1.7.3 to 1.7.4
2020-04-06 06:53:40 +02:00
Nextcloud bot
34ee2dd4a9
[tx-robot] updated from transifex 2020-04-06 03:30:22 +00:00
dependabot-preview[bot]
6b851a73df
Bump detekt-gradle-plugin from 1.7.3 to 1.7.4
Bumps detekt-gradle-plugin from 1.7.3 to 1.7.4.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-06 01:12:21 +00:00
Nextcloud bot
5cd1feaf7b
[tx-robot] updated from transifex 2020-04-04 03:30:19 +00:00
Andy Scherzinger
f83566febc
Merge pull request #5793 from nextcloud/dependabot/gradle/androidx.appcompat-appcompat-1.2.0-beta01
Bump appcompat from 1.2.0-alpha03 to 1.2.0-beta01
2020-04-03 19:12:50 +02:00
Nextcloud bot
4fc05e63b4
[tx-robot] updated from transifex 2020-04-03 03:22:56 +00:00
Andy Scherzinger
0f64f96478
Merge pull request #5698 from nextcloud/dependabot/gradle/androidx.work-work-runtime-2.3.4
Bump work-runtime from 2.3.3 to 2.3.4
2020-04-02 13:48:29 +02:00
Andy Scherzinger
c7c6827e18
Merge pull request #5786 from nextcloud/dependabot/gradle/com.android.tools.build-gradle-3.6.2
Bump gradle from 3.6.1 to 3.6.2
2020-04-02 09:35:59 +02:00
dependabot-preview[bot]
98fe1a788e
Bump work-runtime from 2.3.3 to 2.3.4
Bumps work-runtime from 2.3.3 to 2.3.4.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-02 07:23:54 +00:00
dependabot-preview[bot]
b2220226d0
Bump appcompat from 1.2.0-alpha03 to 1.2.0-beta01
Bumps appcompat from 1.2.0-alpha03 to 1.2.0-beta01.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-02 07:23:46 +00:00
Andy Scherzinger
7d0bbc6f37
Merge pull request #5795 from nextcloud/dependabot/gradle/io.gitlab.arturbosch.detekt-detekt-gradle-plugin-1.7.3
Bump detekt-gradle-plugin from 1.7.2 to 1.7.3
2020-04-02 09:23:36 +02:00
Andy Scherzinger
fd3daa7968
Merge pull request #5794 from nextcloud/dependabot/gradle/androidx.exifinterface-exifinterface-1.2.0
Bump exifinterface from 1.1.0 to 1.2.0
2020-04-02 09:22:35 +02:00
Andy Scherzinger
4425f8672c
Merge pull request #5792 from nextcloud/dependabot/gradle/markwonVersion-4.3.1
Bump markwonVersion from 4.3.0 to 4.3.1
2020-04-02 09:19:32 +02:00
Nextcloud bot
5053c2bf6a
[tx-robot] updated from transifex 2020-04-02 03:21:56 +00:00
dependabot-preview[bot]
b3f8860fa7
Bump detekt-gradle-plugin from 1.7.2 to 1.7.3
Bumps detekt-gradle-plugin from 1.7.2 to 1.7.3.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-02 01:14:54 +00:00
dependabot-preview[bot]
05852e9594
Bump exifinterface from 1.1.0 to 1.2.0
Bumps exifinterface from 1.1.0 to 1.2.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-02 01:13:56 +00:00
dependabot-preview[bot]
721a5debce
Bump markwonVersion from 4.3.0 to 4.3.1
Bumps `markwonVersion` from 4.3.0 to 4.3.1.

Updates `core` from 4.3.0 to 4.3.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.3.0...v4.3.1)

Updates `ext-strikethrough` from 4.3.0 to 4.3.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.3.0...v4.3.1)

Updates `ext-tables` from 4.3.0 to 4.3.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.3.0...v4.3.1)

Updates `ext-tasklist` from 4.3.0 to 4.3.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.3.0...v4.3.1)

Updates `html` from 4.3.0 to 4.3.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.3.0...v4.3.1)

Updates `syntax-highlight` from 4.3.0 to 4.3.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.3.0...v4.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-02 01:13:07 +00:00
AJ Jordan
d31dd61b1b
Ignore CHANGELOG.md while generating changelogs
I heard you liked changelogs, so I put a changelog in your changelog...
or something. How meta.

Signed-off-by: AJ Jordan <alex@strugee.net>
2020-04-01 20:00:15 -04:00
Dave Erdman
01f138a761
Ninja-fix formatting of CONTRIBUTING.md 2020-04-01 09:28:06 -07:00
Nextcloud bot
5e2241d4ae
[tx-robot] updated from transifex 2020-04-01 03:22:49 +00:00
dependabot-preview[bot]
de65ab841e
Bump gradle from 3.6.1 to 3.6.2
Bumps gradle from 3.6.1 to 3.6.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-01 01:12:52 +00:00
Andy Scherzinger
2acb8c7117
Merge pull request #5781 from nextcloud/dependabot/gradle/org.powermock-powermock-api-mockito2-2.0.7
Bump powermock-api-mockito2 from 2.0.6 to 2.0.7
2020-03-31 16:52:46 +02:00
dependabot-preview[bot]
572c26071f
Bump powermock-api-mockito2 from 2.0.6 to 2.0.7
Bumps [powermock-api-mockito2](https://github.com/powermock/powermock) from 2.0.6 to 2.0.7.
- [Release notes](https://github.com/powermock/powermock/releases)
- [Changelog](https://github.com/powermock/powermock/blob/release/2.x/docs/changelog.txt)
- [Commits](https://github.com/powermock/powermock/compare/powermock-2.0.6...powermock-2.0.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-31 12:10:45 +00:00
Andy Scherzinger
2ae6c5f01b
Merge pull request #5782 from nextcloud/dependabot/gradle/org.powermock-powermock-module-junit4-2.0.7
Bump powermock-module-junit4 from 2.0.6 to 2.0.7
2020-03-31 14:09:30 +02:00
dependabot-preview[bot]
9e71804337
Bump powermock-module-junit4 from 2.0.6 to 2.0.7
Bumps [powermock-module-junit4](https://github.com/powermock/powermock) from 2.0.6 to 2.0.7.
- [Release notes](https://github.com/powermock/powermock/releases)
- [Changelog](https://github.com/powermock/powermock/blob/release/2.x/docs/changelog.txt)
- [Commits](https://github.com/powermock/powermock/compare/powermock-2.0.6...powermock-2.0.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-31 12:02:33 +00:00
Andy Scherzinger
2a73db1ea3
Merge pull request #5780 from nextcloud/dependabot/gradle/org.powermock-powermock-core-2.0.7
Bump powermock-core from 2.0.6 to 2.0.7
2020-03-31 14:01:21 +02:00
dependabot-preview[bot]
d25c8f25df
Bump powermock-core from 2.0.6 to 2.0.7
Bumps [powermock-core](https://github.com/powermock/powermock) from 2.0.6 to 2.0.7.
- [Release notes](https://github.com/powermock/powermock/releases)
- [Changelog](https://github.com/powermock/powermock/blob/release/2.x/docs/changelog.txt)
- [Commits](https://github.com/powermock/powermock/compare/powermock-2.0.6...powermock-2.0.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-31 01:12:05 +00:00
Andy Scherzinger
61c8cd76dd
Merge pull request #5772 from nextcloud/wrongTextOpening
First use preferred mimetypes, then editor for optional mimetypes
2020-03-30 22:35:43 +02:00
Andy Scherzinger
c6be91a096
Merge pull request #5775 from nextcloud/fallbackIfNoLocal
if no offline editor is available, use OO/Cool/Text
2020-03-30 20:06:30 +02:00
Andy Scherzinger
b130690bd8
Merge pull request #5773 from nextcloud/fixEditText
edit downloaded md/text file is working now
2020-03-30 17:18:57 +02:00
tobiasKaminsky
d3f3b98be0
if no offline editor is available, use OO/Cool/Text
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-30 16:12:16 +02:00
tobiasKaminsky
12a6cdfcea
edit downloaded md/text file is working now
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-30 14:13:09 +02:00
tobiasKaminsky
456ae330dd
First use preferred mimetypes, then editor for optional mimetypes
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-30 13:15:37 +02:00
Andy Scherzinger
62074a00a6
Merge pull request #5770 from nextcloud/dependabot/gradle/io.gitlab.arturbosch.detekt-detekt-gradle-plugin-1.7.2
Bump detekt-gradle-plugin from 1.7.0 to 1.7.2
2020-03-30 09:03:40 +02:00
Nextcloud bot
b93b8e6dd8
[tx-robot] updated from transifex 2020-03-30 03:33:05 +00:00
dependabot-preview[bot]
ff07f3b8f2
Bump detekt-gradle-plugin from 1.7.0 to 1.7.2
Bumps detekt-gradle-plugin from 1.7.0 to 1.7.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-30 01:11:47 +00:00
Nextcloud bot
f72c7ac2c3
[tx-robot] updated from transifex 2020-03-29 03:39:18 +00:00
Chris Narkiewicz
5204ba7541
Migrate contacts import job to new API
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-03-28 22:07:03 +00:00
Chris Narkiewicz
6f34899327
Migrate ChooseRichDocumentsTemplateDialogFragment to User
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-03-28 12:51:12 +00:00
Nextcloud bot
5faff2fa59
[tx-robot] updated from transifex 2020-03-28 03:33:52 +00:00
Chris Narkiewicz
ba1c2f517c
Migrate EditShareFragment to new User model
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-03-28 00:48:11 +00:00