mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-22 16:54:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
14339 commits 221 branches 1589 tags 640 MiB
Commit graph

5061 commits

Author SHA1 Message Date
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
30ac72652e
Fix test 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-05 08:22:58 +01:00
Nextcloud bot
4f47892823
[tx-robot] updated from transifex 2020-03-05 03:31:48 +00:00
Nextcloud bot
24f8bdbd29
[tx-robot] updated from transifex 2020-03-04 03:29:28 +00:00
Andy Scherzinger
2ffb6dab5f
Merge pull request #5566 from nextcloud/hideOldLogin 
Disable old login method
 2020-03-03 13:17:36 +01:00
tobiasKaminsky
7ca6f304ed
Use proper dialog instantiation 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-03 10:31:04 +01:00
tobiasKaminsky
b8c4c68275
Fixes during CR 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-03 10:31:03 +01:00
tobiasKaminsky
836e51fa79
Remove unneeded strings 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-03 10:31:03 +01:00
tobiasKaminsky
628e58e65e
Fixe during CR 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-03 10:31:03 +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
3ae41ec9fa
Merge pull request #5549 from endre-borcsok/bugfix/crash_in_activities 
Fixed crash in Activities tab.
 2020-03-03 10:30:21 +01:00
Tobias Kaminsky
de7b7f5c06
Merge pull request #5345 from Charon77/deep_link 
Allows deep linking to open files
 2020-03-03 10:26:06 +01:00
Tobias Kaminsky
1e3c6d1080
Merge pull request #5537 from nextcloud/folderFileString 
Split up share internal link
 2020-03-03 09:45:22 +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
tobiasKaminsky
01b1e719ff
delombok everything 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-03 09:39:28 +01:00
tobiasKaminsky
daf3e9aebd
remove unneeded strings 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-03 08:49:13 +01:00
tobiasKaminsky
a341ebcc83
Disable old login method 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-03 08:32:16 +01:00
Nextcloud bot
cd794ab1c1
[tx-robot] updated from transifex 2020-03-03 03:31:11 +00:00
Endre Borcsok
bf7d33066b Fixed crash in Activities tab. 
Replaced Toast.makeText() methods to DisplayUtils.showSnackMessage().

Signed-off-by: Endre Borcsok <ebsoftmobile@gmail.com>
 2020-03-02 20:49:53 +00:00
tobiasKaminsky
83b67b93ad
Update english 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-02 15:52:54 +01:00
Nextcloud bot
db8d3a5d18
[tx-robot] updated from transifex 2020-03-02 11:39:28 +00:00
tobiasKaminsky
4013c47b48
Show slideshow as new activity 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-02 08:45:33 +01:00
tobiasKaminsky
78adcfb3d6
Split up share internal link 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-02-27 20:10:51 +01:00
tobiasKaminsky
42d1dafaff
Change to better english 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-02-27 19:26:24 +01:00
Evans Jahja
0467cc37ca Allows deep linking to open files 
Signed-off-by: Evans Jahja <evansjahja13@gmail.com>
 2020-02-26 21:26:48 +07: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
Nextcloud bot
6ab91c959e
[tx-robot] updated from transifex 2020-02-24 03:33:24 +00:00
Nextcloud bot
7b049a99d0
[tx-robot] updated from transifex 2020-02-23 03:33:40 +00:00
Nextcloud bot
bdaaf63fc3
[tx-robot] updated from transifex 2020-02-22 03:32:58 +00: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
Andy Scherzinger
3ec795f0bf
properly colorize text preview gradient based on theme (day/night) 
improve preview textview size/gradient position

Fixes #5232

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2020-02-20 18:30:59 +01: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 bot
0f1da5238b
[tx-robot] updated from transifex 2020-02-19 03:29:10 +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
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