mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-25 14:45:47 +03:00
Code Issues Projects Releases Packages Wiki Activity
14305 commits 226 branches 1572 tags 619 MiB
Commit graph

14305 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Andy Scherzinger
d88dac6284
Merge pull request #5536 from nextcloud/changeFolderString 
Change to better english
 2020-02-27 20:06:17 +01:00
tobiasKaminsky
42d1dafaff
Change to better english 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-02-27 19:26:24 +01: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
dependabot-preview[bot]
43dfa7a779
Merge pull request #5528 from nextcloud/dependabot/gradle/io.gitlab.arturbosch.detekt-detekt-gradle-plugin-1.6.0 2020-02-27 07:08:36 +00:00
dependabot-preview[bot]
4481af43fc
Merge pull request #5529 from nextcloud/dependabot/gradle/org.mockito-mockito-core-3.3.1 2020-02-27 07:06:23 +00:00
dependabot-preview[bot]
36dbdf5f6e
Merge pull request #5527 from nextcloud/dependabot/gradle/markwonVersion-4.2.2 2020-02-27 06:59:46 +00:00
dependabot-preview[bot]
cd893c685b
Bump mockito-core from 3.3.0 to 3.3.1 
Bumps [mockito-core](https://github.com/mockito/mockito) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.3.0...v3.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-27 02:14:16 +00:00
dependabot-preview[bot]
8b14e8a8bc
Bump detekt-gradle-plugin from 1.5.1 to 1.6.0 
Bumps detekt-gradle-plugin from 1.5.1 to 1.6.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-27 02:13:46 +00:00
dependabot-preview[bot]
82d0ad98d7
Bump markwonVersion from 4.2.1 to 4.2.2 
Bumps `markwonVersion` from 4.2.1 to 4.2.2.

Updates `core` from 4.2.1 to 4.2.2
- [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.2.1...v4.2.2)

Updates `ext-strikethrough` from 4.2.1 to 4.2.2
- [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.2.1...v4.2.2)

Updates `ext-tables` from 4.2.1 to 4.2.2
- [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.2.1...v4.2.2)

Updates `ext-tasklist` from 4.2.1 to 4.2.2
- [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.2.1...v4.2.2)

Updates `html` from 4.2.1 to 4.2.2
- [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.2.1...v4.2.2)

Updates `syntax-highlight` from 4.2.1 to 4.2.2
- [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.2.1...v4.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-27 02:13:15 +00:00
Nextcloud bot
eb94a66b2f
[tx-robot] updated from transifex 2020-02-26 03:31:45 +00:00
Nextcloud bot
543e25667a
[tx-robot] updated from transifex 2020-02-25 03:37:04 +00:00
dependabot-preview[bot]
a163321fa1
Merge pull request #5511 from nextcloud/dependabot/gradle/org.mockito-mockito-core-3.3.0 2020-02-24 08:30:24 +00:00
Nextcloud bot
6ab91c959e
[tx-robot] updated from transifex 2020-02-24 03:33:24 +00:00
dependabot-preview[bot]
aed8a1ade0
Bump mockito-core from 3.2.4 to 3.3.0 
Bumps [mockito-core](https://github.com/mockito/mockito) from 3.2.4 to 3.3.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.2.4...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-24 02:14:20 +00:00
Andy Scherzinger
c6bb9744ee
Merge pull request #5498 from nextcloud/stableMaterial 
Bump material manuelly to 1.1.0, after that dependabot should be on track again
 2020-02-23 21:39:10 +01:00
Nextcloud bot
0b90250b69
[tx-robot] updated from transifex 2020-02-23 03:35:10 +00:00
Nextcloud bot
7b049a99d0
[tx-robot] updated from transifex 2020-02-23 03:33:40 +00:00
Nextcloud bot
70471b6233
[tx-robot] updated from transifex 2020-02-22 03:34:29 +00:00
Nextcloud bot
bdaaf63fc3
[tx-robot] updated from transifex 2020-02-22 03:32:58 +00:00
tobiasKaminsky
5969d0a6eb
Bump material manuelly to 1.1.0, after that dependabot should be on track again 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-02-21 08:42:32 +01:00
Tobias Kaminsky
e1b8d525e5
Merge pull request #5445 from nextcloud/headMethod 
add HEAD Method support for SSO
 2020-02-21 08:37:16 +01:00
Nextcloud bot
92f5e07b9f
[tx-robot] updated from transifex 2020-02-21 03:33:33 +00:00
dependabot-preview[bot]
da6a29a51e
Merge pull request #5493 from nextcloud/dependabot/gradle/androidx.work-work-runtime-ktx-2.3.2 2020-02-20 09:05:39 +00:00
dependabot-preview[bot]
2356e839d3
Bump work-runtime-ktx from 2.3.1 to 2.3.2 
Bumps work-runtime-ktx from 2.3.1 to 2.3.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-20 07:43:07 +00:00
dependabot-preview[bot]
7305272bda
Merge pull request #5494 from nextcloud/dependabot/gradle/androidx.work-work-runtime-2.3.2 2020-02-20 06:51:33 +00:00
Tobias Kaminsky
be238a3f96
Merge pull request #5471 from nextcloud/richWorkspace18only 
Show "add folder info" only if text app is available
 2020-02-20 07:49:47 +01:00
Nextcloud bot
65548c4b4b
[tx-robot] updated from transifex 2020-02-20 03:32:12 +00: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
dependabot-preview[bot]
993aa4afb2
Bump work-runtime from 2.3.0 to 2.3.2 
Bumps work-runtime from 2.3.0 to 2.3.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-20 02:12:17 +00:00
Nextcloud bot
0f1da5238b
[tx-robot] updated from transifex 2020-02-19 03:29:10 +00:00
Tobias Kaminsky
5d428fe9a2
Merge pull request #4788 from nextcloud/instantupload_all 
Setting to also upload existing files
 2020-02-18 08:45:03 +01: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
Alice Gaudon
6540e3ef71
Upload list conflicts: replace trash icon with menu and add resolve action 
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
 2020-02-18 07:38:35 +01:00
Alice Gaudon
a4ff1f11d7
Customize upload sync conflict notification strings 
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
 2020-02-18 07:38:35 +01:00
Alice Gaudon
e77ffa00a8
Fix synced folder layout form control widgets alignment 
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
 2020-02-18 07:38:35 +01:00
Alice Gaudon
91ef307e7a
Fix database migration of field forceOverwrite to NameCollisionPolicy 
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
 2020-02-18 07:38:35 +01:00
Alice Gaudon
52d089b18a
FileUploader: fix codacy issues and SpotBugs 
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
 2020-02-18 07:38:35 +01:00
Alice Gaudon
ec27f840a6
FileUploader: code cleanup 
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
 2020-02-18 07:38:35 +01:00