Commit graph

16163 commits

Author SHA1 Message Date
Andy Scherzinger
aa54d02631
remove unused resource
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-11-17 22:16:41 +01:00
Andy Scherzinger
7807e1e829
update dark screenshots
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-11-17 21:56:44 +01:00
tobiasKaminsky
85551b5eec
Updated avatar handling
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-11-17 19:17:10 +01:00
Andy Scherzinger
f0b7eb46a4
Merge pull request #7346 from kimminji00/master
Fix a typing error in CONTRIBUTING.md
2020-11-17 14:19:34 +01:00
kimminji00
70efff5322
Fix a typing error in CONTRIBUTING.md
I fixed "comparision" to "comparison".
2020-11-17 22:11:37 +09:00
Andy Scherzinger
8101dacecb
Merge pull request #7308 from hochwasser/patch-1
Get last modified time from SAF files put it on the uploaded file
2020-11-16 09:25:22 +01:00
Tobias Kaminsky
b9d0d49c10
Merge pull request #7326 from nextcloud/dependabot/gradle/org.json-json-20201115
Bump json from 20200518 to 20201115
2020-11-16 07:44:26 +01:00
Nextcloud bot
ec9bf0b828
[tx-robot] updated from transifex 2020-11-16 03:45:11 +00:00
dependabot-preview[bot]
1d68c5f450
Bump json from 20200518 to 20201115
Bumps [json](https://github.com/douglascrockford/JSON-java) from 20200518 to 20201115.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-16 02:13:43 +00:00
Christian Tacke
1974689974 Reformat if / try to make Codecy happy
It's nicer to put the try inside the if, anyway.

Signed-off-by: Christian Tacke <8560110+ChristianTacke@users.noreply.github.com>
2020-11-15 21:59:36 +01:00
Nextcloud bot
3ef396befc
[tx-robot] updated from transifex 2020-11-14 03:45:42 +00:00
hochwasser
d814802fa9
Check if cursor is null added
This was found by @tobiasKaminsky thx

Co-authored-by: Tobias Kaminsky <tobias@nextcloud.com>
2020-11-13 15:08:49 +01:00
Andy Scherzinger
7f0ef32dfd
Merge pull request #7316 from KwonEunKyung/ek
fixed typo in Migrations.kt
2020-11-13 13:13:41 +01:00
KwonEunKyung
ce4b98eb57 fixed typo in Migrations.kt 2020-11-13 18:59:52 +09:00
hochwasser
ec16755e5c
added imports for Cursor and DocumentsContract 2020-11-13 00:14:23 +01:00
hochwasser
e36d1e5c41
Get last modified time from SAF files put it on the uploaded file
Get the modified time from SAF files and set it on the cache file.
The uploaded then sets the correct modified time ob the server.
This fixes #5660
2020-11-13 00:04:15 +01:00
Nextcloud bot
c2fb05a743
[tx-robot] updated from transifex 2020-11-12 03:46:15 +00:00
Tobias Kaminsky
e3e178b683
Merge pull request #7294 from nextcloud/dependabot/gradle/com.android.tools.build-gradle-4.1.1
Bump gradle from 4.1.0 to 4.1.1
2020-11-11 09:34:17 +01:00
Nextcloud bot
70f5670c94
[tx-robot] updated from transifex 2020-11-11 03:48:55 +00:00
dependabot-preview[bot]
cafecdfc29
Bump gradle from 4.1.0 to 4.1.1
Bumps gradle from 4.1.0 to 4.1.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-11 02:12:49 +00:00
Andy Scherzinger
2db40c36ca
Merge pull request #7271 from nextcloud/differentAvatars
Show generated avatars is file detail sharing list
2020-11-10 10:44:33 +01:00
tobiasKaminsky
a733d1e5f0
Show generated avatars is file detail sharing list
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-11-10 10:15:17 +01:00
Andy Scherzinger
6ef4f51ed7
Merge pull request #7284 from Kuuuna98/Fix_typo
Fixed a typo in a comment
2020-11-10 09:29:31 +01:00
Kuuuna98
cf62ff3a60 fixed typo in comment 2020-11-10 17:20:59 +09:00
Andy Scherzinger
1767d35535
Merge pull request #7281 from Kuuuna98/Fix_typo
Fixed a typo in a comment
2020-11-10 09:16:49 +01:00
Andy Scherzinger
527c7707f2
Merge pull request #7277 from aqaqsubin/Fix_Md_Typing_Error
Fix CONTRIBUTING.md Typing Error
2020-11-10 09:15:36 +01:00
Tobias Kaminsky
c899c3ef08
Merge pull request #7279 from nextcloud/combinationResult
use result from combinations
2020-11-10 09:10:44 +01:00
tobiasKaminsky
a506c31f76
use result from combinations
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-11-10 09:10:05 +01:00
Tobias Kaminsky
9d3f5dac38
Merge pull request #7181 from nextcloud/themeStatusEditText
Theme edit text status message
2020-11-10 09:03:18 +01:00
Kuuuna98
318cea9e34 fixed typo in comment 2020-11-10 16:35:26 +09:00
Andy Scherzinger
706f371634
proper edit text coloring
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-11-10 08:28:38 +01:00
Tobias Kaminsky
b571847c73
Merge pull request #7278 from nextcloud/sdkLint
use higher sdk only for lint
2020-11-10 08:22:55 +01:00
tobiasKaminsky
e4c7e22c59
use higher sdk only for lint
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-11-10 07:50:59 +01:00
Nextcloud bot
05ebdd8853
[tx-robot] updated from transifex 2020-11-10 03:47:27 +00:00
aqaqsubin
1d8b5d9bc9 Fix CONTRIBUTING.md Typing Error
Signed-off-by: aqaqsubin <aqaq925120k@naver.com>
2020-11-10 11:30:06 +09:00
Andy Scherzinger
5d035b31d9
Merge pull request #7186 from nextcloud/screenshots
Update Screenshots
2020-11-09 23:17:54 +01:00
Andy Scherzinger
e17f7f4b71
update screenshots
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-11-09 20:08:43 +01:00
Andy Scherzinger
7b7677c666
stabilize rich workspace UI test
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-11-09 20:08:42 +01:00
Andy Scherzinger
76a77bb370
update screenshots
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-11-09 20:08:41 +01:00
Andy Scherzinger
723c4042df
use our screenshot function, which obeys dark/color
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-11-09 20:08:41 +01:00
Andy Scherzinger
933ed34c49
Do not use images for tests, as text placeholder tends to get rendered randomly
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-11-09 20:08:40 +01:00
Andy Scherzinger
a335cd12e8
add wait for stabilizing text file icon rendering
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-11-09 20:08:39 +01:00
Andy Scherzinger
9e6ee79c3f
use dark/light aware screenshot method
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-11-09 20:08:39 +01:00
Andy Scherzinger
973977e6ff
Update Screenshots
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-11-09 20:08:30 +01:00
Andy Scherzinger
33ede0b617
Merge pull request #7268 from aqaqsubin/Fix_Typing_Error
Fix AppPreferences Comment Typing Error
2020-11-09 19:19:25 +01:00
Tobias Kaminsky
502d167be6
Merge pull request #7264 from nextcloud/ci
simplify test min sdk
2020-11-09 14:31:20 +01:00
aqaqsubin
a4343dc050 Fix AppPreferencee Comment Typing Error
Signed-off-by: aqaqsubin <aqaq925120k@naver.com>
2020-11-09 21:54:51 +09:00
Andy Scherzinger
b3aa5a9ff6
Merge pull request #7246 from nextcloud/resetCapability
Reset eTag so that capability get parsed again, so status is set
2020-11-09 10:24:45 +01:00
tobiasKaminsky
1b461d3e03
simplify test min sdk
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-11-09 10:09:53 +01:00
Tobias Kaminsky
8dba90993d
Merge pull request #7105 from nextcloud/viewBindingFileDetailsFragments
Replace butterknife with native view binding (File Details Fragments)
2020-11-09 09:24:51 +01:00