Commit graph

406 commits

Author SHA1 Message Date
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
nextcloud-android-bot
18cdde1acd Drone: update Lint results to reflect reduced error/warning count [skip ci]
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2020-03-23 06:55:36 +00:00
tobiasKaminsky
25b8886ba2
manually increase lint
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-19 19:12:36 +01:00
tobiasKaminsky
7eb0f66079
Add circle support for searching / displaying
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-19 19:12:23 +01:00
nextcloud-android-bot
b34bf03551 Drone: update Lint results to reflect reduced error/warning count [skip ci]
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2020-03-19 13:17:48 +00:00
Andy Scherzinger
0925f54d84
Merge pull request #5598 from nextcloud/changelog-ancestry-fix
Fix the dev edition changelog excluding stuff
2020-03-12 08:38:37 +01:00
tobiasKaminsky
9ead4432e8
manually increase spotbug/lint
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-10 09:21:00 +01:00
AJ Jordan
9686d38f95
Expand paths to ignore for dev edition changelogs 2020-03-06 21:34:22 -05:00
AJ Jordan
a712d61386
Fix commits missing from dev edition changelogs
Ref #5525

Signed-off-by: AJ Jordan <alex@strugee.net>
2020-03-06 21:34:17 -05: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
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
c00b13df12
Merge pull request #5491 from nextcloud/conflictDialog
Enhance conflict dialog
2020-03-05 08:40:07 +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
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
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
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
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
d8ada799f3
fix dev lib replacement
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-03-03 07:22:49 +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
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
AJ Jordan
a6c95934cf
Improve dev edition changelog generation
We:

* No longer include commit ids
* Exclude merges, individual Dependabot commits, commits including only
  non-user-facing changes, or version bump commits
* Collapse all Dependabot commits into a single "Update dependencies"
  changelog entry
* Do the same for Transifex updates, which get turned into a single
  "Update translations" changelog entry
* Say if the Android Nextcloud library has changed instead of including
  its commit id

The list of paths to ignore is probably incomplete, but it's easier to
just revisit this script over time and add to it as new contenders pop
up, rather than trying to find everything now.

Fixes #5525

Signed-off-by: AJ Jordan <alex@strugee.net>
2020-02-27 10:04:34 -05:00
tobiasKaminsky
ecd5379646
Add screenshot tests
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-21 19:40:43 +01:00
nextcloud-android-bot
ac6a64b672 Drone: update Lint results to reflect reduced error/warning count [skip ci]
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2020-02-20 02:25:48 +00:00
Alice Gaudon
49f3a67251
ConflictsResolveActivity: code style and readability improvements
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-18 07:39:13 +01:00
Chris Narkiewicz
0977c37916
Fix crash during text file creation
Fixes #5330

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-17 09:30:37 +01:00
tobiasKaminsky
5cc0360855
upload preliminary step
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-13 15:34:53 +01:00
tobiasKaminsky
26d7b9c692
Fix after rebase
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-11 08:58:31 +01:00
tobiasKaminsky
c2750aabda
Add ui test for list shares
add test user to drone
switch back to master
use "waitForIdleSync" instead of sleep

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-11 08:57:09 +01:00
tobiasKaminsky
1bb04aa29e
also increase annotationProcessor
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-10 08:48:52 +01:00
tobiasKaminsky
8ce35e3f59
manually bump lint
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-07 08:44:18 +01:00
nextcloud-android-bot
dc1a3f1f06 Drone: update Lint results to reflect reduced error/warning count [skip ci]
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2020-02-06 07:28:36 +00:00
tobiasKaminsky
4a1e1b1ca8
Bump to "Obsolete custom lint check"
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-06 08:14:07 +01:00
Tobias Kaminsky
c5be0ad7e4
Merge pull request #5399 from nextcloud/extractArbitraryDataSet
extract ArbitraryDataSet class
2020-02-05 12:30:37 +01:00
tobiasKaminsky
7e4711a23c
github comment if preliminary step failed
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-05 11:35:02 +01:00
tobiasKaminsky
c7ea6458bf
extract ArbitraryDataSet class
cleanup

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-05 10:58:05 +01:00
nextcloud-android-bot
0d0a4a3198 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2020-02-05 09:34:45 +00:00
Tobias Kaminsky
0c272ad1d7
Merge pull request #5231 from nextcloud/roundedCorners
images: slightly rounded corners
2020-02-03 13:47:15 +01:00
tobiasKaminsky
b787284ab6
bump spotbugs
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-03 11:53:37 +01:00
tobiasKaminsky
b8d042e171
Basic documentation of how to test
add checklist as PR template

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-01-31 09:50:00 +01:00
tobiasKaminsky
cfb8306681
dev: do not modify master, but push everything to dev branch
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-01-29 08:38:03 +01:00
tobiasKaminsky
c14725fdbc
reproducable dev version: use commit instead of master snapshot for dev version
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-01-23 13:43:50 +01:00
nextcloud-android-bot
19f2a5024d Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2020-01-11 21:40:56 +00:00
tobiasKaminsky
91252852c7
manually increasing lint due to "autoMirrored" warning
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-01-10 09:32:43 +01:00
tobiasKaminsky
1ec8b067f0
- fix not clickable rich workspace area
- fix crash on first loading

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-01-08 08:42:29 +01:00
tobiasKaminsky
74f8a723b8
fixes from CI
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-01-07 08:23:48 +01:00
nextcloud-android-bot
2310c9c453 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2019-12-22 14:28:02 +00:00
tobiasKaminsky
0d84a2dd34
warning about used feature in newer SDK
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-12-19 08:57:39 +01:00
tobiasKaminsky
f2627a29a8
enable caching
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-12-19 08:57:39 +01:00