Commit graph

14620 commits

Author SHA1 Message Date
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
tobiasKaminsky
af93382c66
test
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-14 08:46:08 +01:00
Chris Narkiewicz
0afc2645c4
Migrated jobs to new user model
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-02-14 06:22:20 +00:00
Nextcloud bot
68f06ea158
[tx-robot] updated from transifex 2020-02-14 03:28:53 +00:00
Andy Scherzinger
045a7aa9e7
Merge pull request #5466 from nextcloud/squareIcon
Add square google icon
2020-02-13 16:34:18 +01:00
tobiasKaminsky
5cc0360855
upload preliminary step
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-13 15:34:53 +01:00
tobiasKaminsky
eefeda930c
Add square google icon
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-13 15:32:24 +01:00
Nextcloud bot
7156aaff2a
[tx-robot] updated from transifex 2020-02-13 03:33:37 +00:00
Andy Scherzinger
67880e2758
Merge pull request #5450 from nextcloud/etmScreenshots
Screenshot tests for ETM
2020-02-12 21:35:07 +01:00
Tobias Kaminsky
a063f32d25
Merge pull request #5434 from nextcloud/ezaquarii/migrate-account-list-to-new-user-model
Migrate account list to new user model
2020-02-12 12:18:00 +01:00
tobiasKaminsky
d841f64254
Screenshot tests for ETM
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-12 11:47:55 +01:00
tobiasKaminsky
0569b0de65
Screenshot tests ManageAccountsActivity
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-02-12 09:34:59 +01:00
Chris Narkiewicz
53024d1cd1
Migrate account list to new user model
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2020-02-12 07:31:38 +00:00
Nextcloud bot
e716c99a9b
[tx-robot] updated from transifex 2020-02-12 03:28:27 +00:00
Tobias Kaminsky
f520f2f9a2
Merge pull request #5436 from nextcloud/ezaquarii/make-user-model-parcelable
Make user model parcelable
2020-02-11 09:26:26 +01:00
Tobias Kaminsky
25cbeb4bd8
Merge pull request #5422 from nextcloud/gplayScreenshots
switch to gplay connected tests, to not run both generic and gplay on drone
2020-02-11 09:01:04 +01:00