Commit graph

14285 commits

Author SHA1 Message Date
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
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
Alice Gaudon
7713a28a4f
FileUploader: require explicit NameCollisionPolicy and change default used value
- Changes NameConflictPolicy for manual uploads from default RENAME to ASK_USER
- Removal of helper class FileUploader.UploadRequester (methods become static and go to FileUploader)

Signed-off-by: Alice Gaudon <alice@gaudon.pro>
2020-02-18 07:38:35 +01:00
Alice Gaudon
6783e8ab4c
Make file uploads ask the user what to do when the file already exists on remote
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
2020-02-18 07:38:16 +01:00
Alice Gaudon
213002f44e
Make newly created synced folders auto upload existing files by default
Signed-off-by: Alice Gaudon <alice@gaudon.pro>
2020-02-18 07:37:54 +01:00
Chris Koying Browet
1b7bd72c49
ADD: [instantupload] setting to also upload existing files
Signed-off-by: Chris Koying Browet <cbro@semperpax.com>
2020-02-18 07:37:54 +01:00
Tobias Kaminsky
c243453168
Merge pull request #5465 from nextcloud/fix/create-folder-crash-autosync
Fixed crash during folder creation (autosync)
2020-02-18 07:28:12 +01:00
tobiasKaminsky
a93313ca19
added tests
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-17 15:05:14 +01:00
Kilian Périsset
467104c455
Replaced OCFile by File in getFolder() method 2020-02-17 14:45:14 +01:00
Kilian Périsset
c59f9c0b91
Formated the code + added header 2020-02-17 14:45:07 +01:00
Kilian Périsset
c821f192d6
Formated the code (removed useless spaces) 2020-02-17 14:45:07 +01:00
Kilian Périsset
389090d3e8
Implemented tests for FolderPickerActivity 2020-02-17 14:45:07 +01:00
Kilian Périsset
511a16612d
Fixed bug relative to null folder in FolderPicker 2020-02-17 14:45:07 +01:00
Tobias Kaminsky
4616b0d40b
Merge pull request #5447 from nextcloud/ezaquarii/migrate-jobs-to-new-user-model
Migrate jobs to new user model
2020-02-17 10:40:04 +01:00
Tobias Kaminsky
20b910a646
Merge pull request #5442 from nextcloud/ezaquarii/fix-crash-on-text-file-creation
Fix crash during text file creation
2020-02-17 10:34:26 +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
Nextcloud bot
5c74f2b1be
[tx-robot] updated from transifex 2020-02-16 03:28:46 +00:00
Nextcloud bot
27fabe745b
[tx-robot] updated from transifex 2020-02-15 03:29:51 +00:00
Andy Scherzinger
490b292ad9
Merge pull request #5300 from nextcloud/sharedSearchAgain
Re-enable shared search and add ui test for list shares
2020-02-14 13:52:18 +01:00
tobiasKaminsky
61027524f7
test
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-14 13:01:21 +01:00
tobiasKaminsky
7b4e1b82e3
change cancelContactBackupJobForAccount to user new User class
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-14 11:08:38 +01:00
tobiasKaminsky
87df2c8e1c
Show "add folder info" only if text app is available
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-14 10:31:23 +01:00