tobiasKaminsky
|
c9fc98499f
|
add missing import
|
2017-05-15 14:18:05 +02:00 |
|
tobiasKaminsky
|
6c6b0465b6
|
Merge remote-tracking branch 'remotes/origin/master' into setAsWallpaper
|
2017-05-15 14:08:36 +02:00 |
|
Tobias Kaminsky
|
cea61893a0
|
Merge branch 'master' into enhanceParticipate
|
2017-05-15 14:04:15 +02:00 |
|
Tobias Kaminsky
|
a2ff44a77e
|
Merge branch 'master' into crashDueToEmptyString
|
2017-05-15 12:44:22 +02:00 |
|
tobiasKaminsky
|
ebd94e889e
|
use contribute url from setup.xml
escape quote signs
|
2017-05-15 11:42:28 +02:00 |
|
tobiasKaminsky
|
6f3c3b5579
|
remove all "string empty"
|
2017-05-15 10:27:43 +02:00 |
|
tobiasKaminsky
|
aeba233894
|
use app specific log folder
|
2017-05-15 09:08:19 +02:00 |
|
tobiasKaminsky
|
4e80906cd9
|
fix typo
|
2017-05-15 07:40:14 +02:00 |
|
tobiasKaminsky
|
c6c1713ec2
|
beautify it
|
2017-05-15 07:39:00 +02:00 |
|
tobiasKaminsky
|
3351cd4541
|
add string.empty
|
2017-05-15 07:38:19 +02:00 |
|
Nextcloud bot
|
0017e16748
|
[tx-robot] updated from transifex
|
2017-05-15 00:23:31 +00:00 |
|
Nextcloud bot
|
6db771d36a
|
[tx-robot] updated from transifex
|
2017-05-14 00:23:16 +00:00 |
|
AndyScherzinger
|
ff65b2b1d1
|
Merge branch 'master' of https://github.com/nextcloud/android into searchViewWrongFiles
|
2017-05-13 23:12:57 +02:00 |
|
tobiaskaminsky
|
c28f17d9af
|
remove old reference to onClick, this is now handled via ButterKnife
use "end" instead of "right" for RTL support
|
2017-05-13 22:30:00 +02:00 |
|
AndyScherzinger
|
1b90c742bf
|
Merge branch 'master' of https://github.com/nextcloud/android into searchViewWrongFiles
|
2017-05-13 16:20:20 +02:00 |
|
AndyScherzinger
|
02100ae744
|
remove unnecessary casts
|
2017-05-13 14:53:01 +02:00 |
|
AndyScherzinger
|
086e18d377
|
use apply() instead of commit()
|
2017-05-13 14:52:39 +02:00 |
|
AndyScherzinger
|
e48cc1bbbc
|
document empty method bodies (codacy)
|
2017-05-13 14:48:40 +02:00 |
|
AndyScherzinger
|
f2a81fcc08
|
fix javaDoc (lint)
|
2017-05-13 14:38:21 +02:00 |
|
AndyScherzinger
|
54b3229c6a
|
add missing super calls (lint)
|
2017-05-13 14:38:08 +02:00 |
|
AndyScherzinger
|
904ec2623d
|
remove unnecessary semicolons (lint)
|
2017-05-13 14:11:20 +02:00 |
|
davigonz
|
a480dff6ca
|
Read modification time from the file in local filesystem and set it to the file
# Conflicts:
# src/com/owncloud/android/operations/UploadFileOperation.java
|
2017-05-13 14:11:04 +02:00 |
|
AndyScherzinger
|
f9e7c85d03
|
fix last modified timestamp
|
2017-05-13 13:55:20 +02:00 |
|
tobiasKaminsky
|
09f9019c9c
|
some minor code formatting
|
2017-05-13 13:50:49 +02:00 |
|
AndyScherzinger
|
433a281665
|
fix codacy warning
|
2017-05-13 13:50:34 +02:00 |
|
AndyScherzinger
|
da73fdbbe9
|
fix import
|
2017-05-13 13:50:33 +02:00 |
|
AndyScherzinger
|
1029a9e2e7
|
adaptes federated shares permission computation
|
2017-05-13 13:50:24 +02:00 |
|
AndyScherzinger
|
e9b25d0a4a
|
fix compile error after lib merges
# Conflicts:
# src/com/owncloud/android/ui/activity/ShareActivity.java
|
2017-05-13 13:50:24 +02:00 |
|
David A. Velasco
|
448e977aca
|
Remove always-true component in condition, from CR
|
2017-05-13 13:50:14 +02:00 |
|
jabarros
|
bc04df153d
|
Fix var name in comment
|
2017-05-13 13:50:13 +02:00 |
|
jabarros
|
0e7496c233
|
Handle create, change and delete options in federated sharing in servers 9.1 or up
# Conflicts:
# src/com/owncloud/android/ui/fragment/EditShareFragment.java
|
2017-05-13 13:50:13 +02:00 |
|
AndyScherzinger
|
c219152db5
|
fix codacy warning
|
2017-05-13 13:50:13 +02:00 |
|
AndyScherzinger
|
9cd963b12c
|
fix import
|
2017-05-13 13:50:12 +02:00 |
|
AndyScherzinger
|
8d7157d4fc
|
adaptes federated shares permission computation
|
2017-05-13 13:50:03 +02:00 |
|
AndyScherzinger
|
e2621389ae
|
fix compile error after lib merges
# Conflicts:
# src/com/owncloud/android/ui/activity/ShareActivity.java
|
2017-05-13 13:50:02 +02:00 |
|
David A. Velasco
|
e93de886b1
|
Remove always-true component in condition, from CR
|
2017-05-13 13:49:52 +02:00 |
|
jabarros
|
73798d2196
|
Fix var name in comment
|
2017-05-13 13:49:52 +02:00 |
|
jabarros
|
1a189a7f3c
|
Handle create, change and delete options in federated sharing in servers 9.1 or up
# Conflicts:
# src/com/owncloud/android/ui/fragment/EditShareFragment.java
|
2017-05-13 13:49:52 +02:00 |
|
AndyScherzinger
|
89eb8f1a49
|
fix codacy warning
|
2017-05-13 13:49:51 +02:00 |
|
AndyScherzinger
|
6e6e1a08b3
|
fix import
|
2017-05-13 13:49:51 +02:00 |
|
AndyScherzinger
|
008a974a74
|
adaptes federated shares permission computation
|
2017-05-13 13:49:41 +02:00 |
|
AndyScherzinger
|
335bbdb511
|
fix compile error after lib merges
# Conflicts:
# src/com/owncloud/android/ui/activity/ShareActivity.java
|
2017-05-13 13:49:41 +02:00 |
|
David A. Velasco
|
40e0f08c79
|
Remove always-true component in condition, from CR
|
2017-05-13 13:49:05 +02:00 |
|
jabarros
|
c41e968e73
|
Fix var name in comment
|
2017-05-13 13:49:05 +02:00 |
|
jabarros
|
712b83dc0e
|
Handle create, change and delete options in federated sharing in servers 9.1 or up
# Conflicts:
# src/com/owncloud/android/ui/fragment/EditShareFragment.java
|
2017-05-13 13:49:05 +02:00 |
|
AndyScherzinger
|
f8bd7e7a19
|
fix codacy warning
|
2017-05-13 13:49:04 +02:00 |
|
AndyScherzinger
|
c7e544ab77
|
reintroduce account for federated sharing permission
|
2017-05-13 13:49:04 +02:00 |
|
AndyScherzinger
|
915cfb4f86
|
fix import
|
2017-05-13 13:49:04 +02:00 |
|
AndyScherzinger
|
a24c4b5878
|
adaptes federated shares permission computation
|
2017-05-13 13:48:54 +02:00 |
|
AndyScherzinger
|
c1c306150f
|
fix compile error after lib merges
# Conflicts:
# src/com/owncloud/android/ui/activity/ShareActivity.java
|
2017-05-13 13:48:53 +02:00 |
|
AndyScherzinger
|
45f5d16038
|
add missing code fragments
|
2017-05-13 13:48:22 +02:00 |
|
David A. Velasco
|
626e639c92
|
Remove always-true component in condition, from CR
|
2017-05-13 13:48:21 +02:00 |
|
jabarros
|
7c81f04a41
|
Fix var name in comment
|
2017-05-13 13:48:21 +02:00 |
|
jabarros
|
b969908e2b
|
Handle create, change and delete options in federated sharing in servers 9.1 or up
# Conflicts:
# src/com/owncloud/android/ui/fragment/EditShareFragment.java
|
2017-05-13 13:48:18 +02:00 |
|
Andy Scherzinger
|
6409e22228
|
Merge pull request #502 from nextcloud/recognizeMaintenanceMode
Recognize maintenance mode
|
2017-05-13 13:31:41 +02:00 |
|
Nextcloud bot
|
d0427e78ab
|
[tx-robot] updated from transifex
|
2017-05-13 00:23:27 +00:00 |
|
AndyScherzinger
|
555d3cf5bd
|
fix duplicate method after rebase
|
2017-05-12 15:46:05 +02:00 |
|
AndyScherzinger
|
e42df5f869
|
Fix after rebase
|
2017-05-12 15:46:04 +02:00 |
|
AndyScherzinger
|
ae1f736db5
|
fix error after rebase
|
2017-05-12 15:46:04 +02:00 |
|
AndyScherzinger
|
494927e217
|
fix codacy warning
|
2017-05-12 15:46:04 +02:00 |
|
AndyScherzinger
|
f12cab7202
|
code shortening after rebase
|
2017-05-12 15:46:03 +02:00 |
|
davigonz
|
5cbf0f9b45
|
Fix pull request requested changes
# Conflicts:
# src/com/owncloud/android/authentication/AuthenticatorActivity.java
# src/com/owncloud/android/utils/ErrorMessageAdapter.java
|
2017-05-12 15:46:03 +02:00 |
|
davigonz
|
cf53342b40
|
Change evaluation order to prevent calling existFile method if maintenance mode is enabled
|
2017-05-12 15:46:02 +02:00 |
|
davigonz
|
badd90ef9d
|
Fix bug Unsharing in maintenance mode removes the file
|
2017-05-12 15:46:02 +02:00 |
|
davigonz
|
5300d96d01
|
Fix bug Shibboleth server does not recognize maintenance mode
# Conflicts:
# src/com/owncloud/android/authentication/AuthenticatorActivity.java
|
2017-05-12 15:46:02 +02:00 |
|
davigonz
|
3ff3dcc62d
|
Fix bug maintenance mode in share view
|
2017-05-12 15:46:01 +02:00 |
|
davigonz
|
ea0b399550
|
Changed maintenance mode message
|
2017-05-12 15:46:01 +02:00 |
|
davigonz
|
9594835f24
|
Change dynamically the authentication maintenance mode message with the name of the app
# Conflicts:
# res/values/strings.xml
|
2017-05-12 15:46:00 +02:00 |
|
davigonz
|
bd24e3a44f
|
Change dynamically the maintenance mode message with the name of the app
|
2017-05-12 15:46:00 +02:00 |
|
davigonz
|
27bf6ecfc1
|
Show maintenance mode message while authenticating
# Conflicts:
# src/com/owncloud/android/authentication/AuthenticatorActivity.java
|
2017-05-12 15:46:00 +02:00 |
|
davigonz
|
ab0c2cd45d
|
Show maintenance mode message while sharing via link, unsharing, updating sharing, moving, synchronizing folders and copying operations
|
2017-05-12 15:45:59 +02:00 |
|
davigonz
|
d2ba8fe0f6
|
Show maintenance mode message while downloading, removing, renaming or creating folder operations
|
2017-05-12 15:45:59 +02:00 |
|
davigonz
|
ec5e81431e
|
Show maintenance mode error in notifications while uploading a file
# Conflicts:
# build.gradle
# res/values/strings.xml
|
2017-05-12 15:45:59 +02:00 |
|
AndyScherzinger
|
dae7bfd9b8
|
fix codacy warning
|
2017-05-12 15:45:58 +02:00 |
|
AndyScherzinger
|
7c62de93fd
|
code shortening after rebase
|
2017-05-12 15:45:58 +02:00 |
|
davigonz
|
74af772032
|
Fix pull request requested changes
# Conflicts:
# src/com/owncloud/android/authentication/AuthenticatorActivity.java
# src/com/owncloud/android/utils/ErrorMessageAdapter.java
|
2017-05-12 15:45:57 +02:00 |
|
davigonz
|
a2d11046a7
|
Fix bug maintenance mode in share view
|
2017-05-12 15:45:57 +02:00 |
|
davigonz
|
4a6b11e251
|
Fix bug maintenance mode message in uploads view
# Conflicts:
# src/com/owncloud/android/db/UploadResult.java
|
2017-05-12 15:45:57 +02:00 |
|
davigonz
|
a08fe1e2c9
|
Changed maintenance mode message
|
2017-05-12 15:45:56 +02:00 |
|
davigonz
|
8b22e17ab2
|
Change dynamically the authentication maintenance mode message with the name of the app
# Conflicts:
# res/values/strings.xml
|
2017-05-12 15:45:56 +02:00 |
|
davigonz
|
21f4806d94
|
Change dynamically the maintenance mode message with the name of the app
|
2017-05-12 15:45:56 +02:00 |
|
davigonz
|
7c56163c82
|
Show maintenance mode message while authenticating
# Conflicts:
# src/com/owncloud/android/authentication/AuthenticatorActivity.java
|
2017-05-12 15:45:55 +02:00 |
|
davigonz
|
2238a09915
|
Show maintenance mode message while sharing via link, unsharing, updating sharing, moving, synchronizing folders and copying operations
|
2017-05-12 15:45:55 +02:00 |
|
davigonz
|
e2befe4c4b
|
Show maintenance mode message while downloading, removing, renaming or creating folder operations
|
2017-05-12 15:45:54 +02:00 |
|
davigonz
|
6b493041f1
|
Show maintenance mode error in notifications while uploading a file
# Conflicts:
# build.gradle
# res/values/strings.xml
|
2017-05-12 15:45:54 +02:00 |
|
AndyScherzinger
|
5e16e35f2a
|
fix error after rebase
|
2017-05-12 15:45:54 +02:00 |
|
AndyScherzinger
|
7b49213514
|
fix codacy warning
|
2017-05-12 15:45:53 +02:00 |
|
AndyScherzinger
|
0384769f2a
|
code shortening after rebase
|
2017-05-12 15:45:53 +02:00 |
|
davigonz
|
72aff4c622
|
Fix pull request requested changes
# Conflicts:
# src/com/owncloud/android/authentication/AuthenticatorActivity.java
# src/com/owncloud/android/utils/ErrorMessageAdapter.java
|
2017-05-12 15:45:52 +02:00 |
|
davigonz
|
501181d9a2
|
Change evaluation order to prevent calling existFile method if maintenance mode is enabled
|
2017-05-12 15:45:52 +02:00 |
|
davigonz
|
0b51dc9f0c
|
Fix bug Unsharing in maintenance mode removes the file
|
2017-05-12 15:45:51 +02:00 |
|
davigonz
|
0b77fe214b
|
Fix bug Shibboleth server does not recognize maintenance mode
# Conflicts:
# src/com/owncloud/android/authentication/AuthenticatorActivity.java
|
2017-05-12 15:45:51 +02:00 |
|
davigonz
|
d07b037da4
|
Fix bug maintenance mode in share view
|
2017-05-12 15:45:51 +02:00 |
|
davigonz
|
74e2438ada
|
Changed maintenance mode message
|
2017-05-12 15:45:50 +02:00 |
|
davigonz
|
036b34ca3c
|
Change dynamically the authentication maintenance mode message with the name of the app
# Conflicts:
# res/values/strings.xml
|
2017-05-12 15:45:50 +02:00 |
|
davigonz
|
597f0deebd
|
Change dynamically the maintenance mode message with the name of the app
|
2017-05-12 15:45:50 +02:00 |
|
davigonz
|
3a1c523d76
|
Show maintenance mode message while authenticating
# Conflicts:
# src/com/owncloud/android/authentication/AuthenticatorActivity.java
|
2017-05-12 15:45:49 +02:00 |
|
davigonz
|
88e85f1520
|
Show maintenance mode message while sharing via link, unsharing, updating sharing, moving, synchronizing folders and copying operations
|
2017-05-12 15:45:49 +02:00 |
|
davigonz
|
3241127b8d
|
Show maintenance mode message while downloading, removing, renaming or creating folder operations
|
2017-05-12 15:45:48 +02:00 |
|
davigonz
|
d98e33235a
|
Show maintenance mode error in notifications while uploading a file
# Conflicts:
# build.gradle
# res/values/strings.xml
|
2017-05-12 15:45:48 +02:00 |
|
AndyScherzinger
|
63e271d7d1
|
fix codacy warning
|
2017-05-12 15:45:48 +02:00 |
|
AndyScherzinger
|
6fbeaf4cae
|
fix compile error
|
2017-05-12 15:45:47 +02:00 |
|
AndyScherzinger
|
884df0c604
|
code shortening after rebase
|
2017-05-12 15:45:47 +02:00 |
|
davigonz
|
91c8f11f2a
|
Fix pull request requested changes
# Conflicts:
# src/com/owncloud/android/authentication/AuthenticatorActivity.java
# src/com/owncloud/android/utils/ErrorMessageAdapter.java
|
2017-05-12 15:45:46 +02:00 |
|
davigonz
|
d4c4d4a62a
|
Change evaluation order to prevent calling existFile method if maintenance mode is enabled
|
2017-05-12 15:45:46 +02:00 |
|
davigonz
|
ffef0fe77a
|
Fix bug Unsharing in maintenance mode removes the file
|
2017-05-12 15:45:45 +02:00 |
|
davigonz
|
33bbbb0be0
|
Fix bug Shibboleth server does not recognize maintenance mode
# Conflicts:
# src/com/owncloud/android/authentication/AuthenticatorActivity.java
|
2017-05-12 15:45:45 +02:00 |
|
davigonz
|
412ce69fcb
|
Fix bug maintenance mode in share view
|
2017-05-12 15:45:45 +02:00 |
|
davigonz
|
f38e0e12a0
|
Fix bug maintenance mode message in uploads view
# Conflicts:
# src/com/owncloud/android/db/UploadResult.java
|
2017-05-12 15:45:44 +02:00 |
|
davigonz
|
81baba92a0
|
Changed maintenance mode message
|
2017-05-12 15:45:44 +02:00 |
|
davigonz
|
1b95c2fb91
|
Change dynamically the authentication maintenance mode message with the name of the app
# Conflicts:
# res/values/strings.xml
|
2017-05-12 15:45:44 +02:00 |
|
davigonz
|
a417f2ab2b
|
Change dynamically the maintenance mode message with the name of the app
|
2017-05-12 15:45:43 +02:00 |
|
davigonz
|
c7ef965564
|
Show maintenance mode message while authenticating
# Conflicts:
# src/com/owncloud/android/authentication/AuthenticatorActivity.java
|
2017-05-12 15:45:43 +02:00 |
|
davigonz
|
ee1e47dff3
|
Show maintenance mode message while sharing via link, unsharing, updating sharing, moving, synchronizing folders and copying operations
|
2017-05-12 15:45:42 +02:00 |
|
davigonz
|
c47970857c
|
Show maintenance mode message while downloading, removing, renaming or creating folder operations
|
2017-05-12 15:45:42 +02:00 |
|
davigonz
|
ad6d867971
|
Show maintenance mode error in notifications while uploading a file
# Conflicts:
# build.gradle
# res/values/strings.xml
|
2017-05-12 15:45:42 +02:00 |
|
Mario Đanić
|
5aaad6a723
|
Merge pull request #986 from nextcloud/sharingBug
Do nothing if sharee already exists
|
2017-05-12 15:41:46 +02:00 |
|
Tobias Kaminsky
|
b98beaf0ef
|
Merge branch 'master' into setAsWallpaper
|
2017-05-12 15:18:52 +02:00 |
|
tobiaskaminsky
|
01761718d9
|
handle Nougat and wallpaper app
|
2017-05-12 15:17:16 +02:00 |
|
tobiaskaminsky
|
58c9a7ddc7
|
remove authority cache
|
2017-05-12 15:03:34 +02:00 |
|
tobiaskaminsky
|
d50ee0085d
|
Merge remote-tracking branch 'remotes/origin/master' into setAsWallpaper
|
2017-05-12 15:02:11 +02:00 |
|
AndyScherzinger
|
28e8eaa376
|
fix DB upgrade routine for virtual table
|
2017-05-12 13:21:03 +02:00 |
|
tobiasKaminsky
|
854a3c026c
|
added privacy webview
restructured setup.xml
adapted modified/setup.xml to general/setup.xml
|
2017-05-12 12:43:36 +02:00 |
|
AndyScherzinger
|
9a88f547f4
|
Merge branch 'master' of https://github.com/nextcloud/android into searchViewWrongFiles
|
2017-05-12 11:01:30 +02:00 |
|
tobiasKaminsky
|
c341c8d204
|
workaround: do nothing if sharee already exists
|
2017-05-12 10:54:50 +02:00 |
|
tobiasKaminsky
|
c4331a10fa
|
re-use second fragment if available
|
2017-05-12 08:47:01 +02:00 |
|
Nextcloud bot
|
8ec2a1de46
|
[tx-robot] updated from transifex
|
2017-05-12 00:22:16 +00:00 |
|
Mario Đanić
|
2d94a9898c
|
Merge pull request #977 from nextcloud/enable-folder-favorite-action
Add support for folder favorite action
|
2017-05-11 11:53:16 +02:00 |
|
Mario Danic
|
4e122a9124
|
Fix issues
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-05-11 11:50:46 +02:00 |
|
Mario Đanić
|
192e4d6213
|
Merge pull request #928 from nextcloud/fix_bug_previewmedia
Fix bug #888
|
2017-05-11 11:40:57 +02:00 |
|
tobiasKaminsky
|
39bf45da64
|
revert this, although it will get removed by a different PR
|
2017-05-11 11:36:41 +02:00 |
|
Mario Đanić
|
99114a2c72
|
Merge pull request #972 from nextcloud/hideContactsBackupFolder
Hide contacts backup folder
|
2017-05-11 11:32:15 +02:00 |
|
tobiaskaminsky
|
399ff5802f
|
get storage manager, stop if null (this happens while a long async thread, e.g. photo fetching, is cancelled by device orientation changing)
|
2017-05-11 09:13:42 +02:00 |
|
klemens
|
f30cbca78c
|
spelling fixes
|
2017-05-10 21:04:47 +02:00 |
|
Mario Danic
|
d3ea3a8ccf
|
Add support for folder favorite action
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-05-10 19:54:40 +02:00 |
|
Nextcloud bot
|
db7e5fae89
|
[tx-robot] updated from transifex
|
2017-05-10 00:24:22 +00:00 |
|
alejandro
|
e101785ce2
|
Show hidden files after enable it
|
2017-05-09 17:44:12 -05:00 |
|
alejandro
|
28dfecc6d9
|
Fix Issue #970
|
2017-05-09 17:43:00 -05:00 |
|
Mario Đanić
|
378fd9b8df
|
Merge pull request #960 from nextcloud/preventUsingDestroyedActivity
prevent using destroyed activity
|
2017-05-09 14:01:28 +02:00 |
|
Nextcloud bot
|
e7fa4d24e5
|
[tx-robot] updated from transifex
|
2017-05-09 00:22:33 +00:00 |
|
Nextcloud bot
|
5dc5863af3
|
[tx-robot] updated from transifex
|
2017-05-08 00:21:53 +00:00 |
|
tobiasKaminsky
|
b1f60cb63b
|
re-use fragments if they exist
|
2017-05-07 10:08:25 +02:00 |
|
Nextcloud bot
|
db660e12d5
|
[tx-robot] updated from transifex
|
2017-05-07 00:21:47 +00:00 |
|
tobiasKaminsky
|
b8197ee993
|
prevent using destroyed activity
|
2017-05-06 12:25:05 +02:00 |
|
Nextcloud bot
|
ada1d9e9ab
|
[tx-robot] updated from transifex
|
2017-05-06 00:21:25 +00:00 |
|
tobiasKaminsky
|
2589471e98
|
show share type
|
2017-05-05 16:00:46 +02:00 |
|
tobiasKaminsky
|
74ab6cf154
|
Merge branch 'searchViewWrongFiles' of https://github.com/nextcloud/android into testSearch2
|
2017-05-05 14:43:06 +02:00 |
|
tobiasKaminsky
|
3735cec70c
|
prevent restoring latest fragment when rotating
|
2017-05-05 14:42:08 +02:00 |
|
tobiasKaminsky
|
5a60a5a531
|
fix swipe to refresh
|
2017-05-05 09:18:56 +02:00 |
|
tobiasKaminsky
|
62818760c1
|
Merge remote-tracking branch 'origin/searchViewWrongFiles' into searchViewWrongFiles
# Conflicts:
# src/main/java/com/owncloud/android/providers/FileContentProvider.java
|
2017-05-05 09:10:16 +02:00 |
|
Nextcloud bot
|
2705f3e116
|
[tx-robot] updated from transifex
|
2017-05-05 00:21:30 +00:00 |
|
tobiasKaminsky
|
9211578a55
|
allow clicking on folder in favorites/search
|
2017-05-04 23:13:39 +02:00 |
|
tobiasKaminsky
|
e8023989bb
|
if search is empty, show file list
|
2017-05-04 23:13:39 +02:00 |
|
tobiasKaminsky
|
6c24bb2c7d
|
removed empty if
|
2017-05-04 23:13:39 +02:00 |
|
tobiasKaminsky
|
3f7263d532
|
enable FAB only if not on searchView
|
2017-05-04 23:13:39 +02:00 |
|
tobiasKaminsky
|
5e1bd31c58
|
make file search working again
|
2017-05-04 23:13:39 +02:00 |
|
tobiasKaminsky
|
c7fa90a3b8
|
revert check for specific fragment while search, as contactBackup does not have a search
|
2017-05-04 23:13:39 +02:00 |
|
tobiasKaminsky
|
33ed0626ff
|
speedup search
|
2017-05-04 23:13:39 +02:00 |
|
tobiasKaminsky
|
6c2d881dfe
|
- search view shows data again
- no crash while rotation during search view is populated
|
2017-05-04 23:13:39 +02:00 |
|
tobiasKaminsky
|
0dc569bc94
|
sort order by creation date
|
2017-05-04 23:13:39 +02:00 |
|
tobiasKaminsky
|
ac8b0b30bb
|
fix for #857
|
2017-05-04 23:13:39 +02:00 |
|
Tobias Kaminsky
|
12ae31601a
|
Merge pull request #950 from nextcloud/codacyCleanUps
further codacy clean ups
|
2017-05-04 15:53:29 +02:00 |
|
Tobias Kaminsky
|
d1a68cc834
|
Merge pull request #947 from nextcloud/externalStorage
Enhance external Sdcard usage
|
2017-05-04 15:51:03 +02:00 |
|
tobiasKaminsky
|
47921b3f6b
|
allow clicking on folder in favorites/search
|
2017-05-04 15:49:46 +02:00 |
|
tobiasKaminsky
|
61069fc4e1
|
if search is empty, show file list
|
2017-05-04 15:39:06 +02:00 |
|
Mario Đanić
|
413147018f
|
Merge pull request #951 from nextcloud/contactBackupReturn
ContactList: handle back press correct
|
2017-05-04 14:54:50 +02:00 |
|
Mario Đanić
|
9fb6b1ca37
|
Merge pull request #952 from nextcloud/wrongTitle
show correct title when switching to "on device"
|
2017-05-04 14:53:48 +02:00 |
|
tobiasKaminsky
|
27db51727e
|
Merge remote-tracking branch 'remotes/origin/master' into searchViewWrongFiles
|
2017-05-04 14:43:50 +02:00 |
|
tobiasKaminsky
|
9544b79197
|
removed empty if
|
2017-05-04 14:37:02 +02:00 |
|
tobiasKaminsky
|
89bc1552b9
|
Merge remote-tracking branch 'origin/externalStorage' into externalStorage2
|
2017-05-04 14:29:54 +02:00 |
|
tobiasKaminsky
|
4ee600f3aa
|
check if writable
|
2017-05-04 14:29:46 +02:00 |
|
tobiasKaminsky
|
9d7a831114
|
show correct title when switching to "on device"
|
2017-05-04 14:18:32 +02:00 |
|
tobiasKaminsky
|
64fad91842
|
handle back press correct
|
2017-05-04 13:36:23 +02:00 |
|
AndyScherzinger
|
01d28bbdbc
|
Codacy: simplify if statement(s)
|
2017-05-04 12:36:17 +02:00 |
|
AndyScherzinger
|
5c9419db90
|
Codacy: Position literals first in String comparisons
|
2017-05-04 12:32:43 +02:00 |
|
AndyScherzinger
|
e85f1592e2
|
codacy: Use one line for each declaration, it enhances code readability.
|
2017-05-04 12:30:03 +02:00 |
|
AndyScherzinger
|
0592eac9bf
|
codacy: put fields on top; they should be declared at the top of the class, before any method declarations, constructors, initializers or inner classes.
|
2017-05-04 12:19:50 +02:00 |
|
Tobias Kaminsky
|
54eba4142a
|
Merge pull request #949 from nextcloud/fix-crash-on-login
Delete all accounts on first run
|
2017-05-04 11:17:08 +02:00 |
|
tobiasKaminsky
|
be4fb43fb4
|
extract strings, use title
|
2017-05-04 11:12:14 +02:00 |
|
Nextcloud bot
|
8a9ff494e2
|
[tx-robot] updated from transifex
|
2017-05-04 09:04:46 +00:00 |
|
Nextcloud bot
|
9cf326d44e
|
[tx-robot] updated from transifex
|
2017-05-04 08:47:51 +00:00 |
|
Nextcloud bot
|
bfa1f060c0
|
[tx-robot] updated from transifex
|
2017-05-04 00:21:28 +00:00 |
|
Mario Đanić
|
4524acfa2d
|
Merge pull request #945 from nextcloud/FileDetailSearchIcon
hide search icon on FileDetailFragment
|
2017-05-03 23:23:41 +02:00 |
|
Mario Danic
|
107f80afaa
|
Delete all accounts on first run
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-05-03 22:40:22 +02:00 |
|
tobiasKaminsky
|
8ccff56370
|
if source folder does not exist, still allow to move to new folder
|
2017-05-03 17:21:02 +02:00 |
|
tobiasKaminsky
|
e68e8f6d32
|
- use externalMediaDir to allow downloaded files to be scanned again
- do not show "unknown" storage path, instead show complete path
|
2017-05-03 16:07:52 +02:00 |
|
tobiasKaminsky
|
2e517f7b33
|
hide search icon on FileDetailFragment
|
2017-05-03 14:03:23 +02:00 |
|
tobiasKaminsky
|
b6b8dc1040
|
enable FAB only if not on searchView
|
2017-05-03 13:55:27 +02:00 |
|
Andy Scherzinger
|
292b4bf83e
|
Merge pull request #944 from nextcloud/fix-autoupload-after-acc-delete
Fix an auto upload still occurring after acc delete
|
2017-05-03 13:53:28 +02:00 |
|
tobiasKaminsky
|
277704e89f
|
make file search working again
|
2017-05-03 13:43:50 +02:00 |
|
tobiasKaminsky
|
e40fd02d72
|
Merge remote-tracking branch 'remotes/origin/master' into searchViewWrongFiles
|
2017-05-03 13:38:23 +02:00 |
|
tobiasKaminsky
|
a304f1b0a0
|
revert check for specific fragment while search, as contactBackup does not have a search
|
2017-05-03 13:35:22 +02:00 |
|
tobiasKaminsky
|
9f7cd59682
|
speedup search
|
2017-05-03 13:14:30 +02:00 |
|
Mario Danic
|
ff3dcb8910
|
Cancel all auto upload jobs
|
2017-05-03 12:05:18 +02:00 |
|
Mario Đanić
|
e55f06ec6e
|
Merge pull request #941 from nextcloud/suppressLint
remove suppressLint
|
2017-05-03 11:56:14 +02:00 |
|
Mario Danic
|
3786d46cf3
|
Simplify code
|
2017-05-03 11:50:59 +02:00 |
|
Mario Danic
|
ed1f05173d
|
Fix an issue
|
2017-05-03 11:49:20 +02:00 |
|
tobiasKaminsky
|
c6268a609a
|
remove suppressLint
Checkerboard on PNG files is only shown in >= M and thus toggle Background is also used in >= M only
|
2017-05-03 08:52:25 +02:00 |
|
Mario Danic
|
12f53eaf85
|
Fix fab stuff
|
2017-05-03 06:14:34 +02:00 |
|
Mario Đanić
|
e058de967c
|
Merge pull request #926 from nextcloud/rotationBug
do not create a new adapter while rotating
|
2017-05-03 06:05:58 +02:00 |
|