Nextcloud bot
|
50889f726b
|
[tx-robot] updated from transifex
|
2017-05-20 00:24:46 +00:00 |
|
Andy Scherzinger
|
c33a88104d
|
Merge pull request #1024 from nextcloud/contactsSort
Sort contact list
|
2017-05-19 14:50:15 +02:00 |
|
tobiasKaminsky
|
28772f1ba9
|
5 cols on portrait
|
2017-05-19 11:49:07 +02:00 |
|
tobiasKaminsky
|
ba14880f3d
|
use 10cols on landscape, 6 on portrait
|
2017-05-19 11:34:49 +02:00 |
|
tobiasKaminsky
|
1ab754278e
|
revert
|
2017-05-19 10:48:26 +02:00 |
|
tobiasKaminsky
|
47b5748b74
|
Merge remote-tracking branch 'remotes/origin/master' into pinchZoom_new
|
2017-05-19 10:43:50 +02:00 |
|
tobiasKaminsky
|
32a5c7d81a
|
formatting
|
2017-05-19 07:47:00 +02:00 |
|
Nextcloud bot
|
4ed4ed8dc0
|
[tx-robot] updated from transifex
|
2017-05-19 00:25:56 +00:00 |
|
alejandro
|
f94169a458
|
Sort contacts list
|
2017-05-18 18:50:21 -05:00 |
|
Tobias Kaminsky
|
332d48abac
|
Merge branch 'master' into crashDueToEmptyString
|
2017-05-18 16:16:45 +02:00 |
|
Tobias Kaminsky
|
a08d17b592
|
Merge pull request #1014 from nextcloud/improve-push
Improve push
|
2017-05-18 15:04:56 +02:00 |
|
tobiaskaminsky
|
7eddd7440c
|
fixed "all files"
|
2017-05-18 14:34:44 +02:00 |
|
tobiaskaminsky
|
fabecc86a5
|
Merge remote-tracking branch 'remotes/origin/master' into contactListImprovement
|
2017-05-18 13:47:03 +02:00 |
|
Tobias Kaminsky
|
98989a9363
|
Merge 44b9355315 into 547453760e
|
2017-05-18 10:52:31 +00:00 |
|
tobiaskaminsky
|
da497abdb6
|
move/copy drawer icons
|
2017-05-18 12:20:55 +02:00 |
|
Nextcloud bot
|
547453760e
|
[tx-robot] updated from transifex
|
2017-05-18 00:24:19 +00:00 |
|
tobiaskaminsky
|
0f6f4ad642
|
do not send status messages if fragment is destroyed
|
2017-05-17 16:41:01 +02:00 |
|
tobiaskaminsky
|
37aac8498c
|
prevent NPE
use boolean to determinate if resume or if new start
|
2017-05-17 16:08:21 +02:00 |
|
tobiaskaminsky
|
9860aaa10f
|
Merge remote-tracking branch 'remotes/origin/master' into audioRotationBug
|
2017-05-17 15:39:28 +02:00 |
|
Tobias Kaminsky
|
c2010bb3d0
|
Merge branch 'master' into crashDueToEmptyString
|
2017-05-17 15:26:05 +02:00 |
|
Mario Đanić
|
c5af507080
|
Merge fd6caadc3f into 01e7112a9a
|
2017-05-17 11:30:59 +00:00 |
|
Mario Danic
|
fd6caadc3f
|
Unify scope
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-05-17 13:30:29 +02:00 |
|
Mario Đanić
|
01e7112a9a
|
Merge pull request #194 from nextcloud/setAsWallpaper
Set as wallpaper/contact-photo/etc.
|
2017-05-17 13:26:51 +02:00 |
|
Tobias Kaminsky
|
d6a1c7ee83
|
Merge branch 'master' into crashDueToEmptyString
|
2017-05-17 12:10:52 +02:00 |
|
Nextcloud bot
|
a79dbe78d4
|
[tx-robot] updated from transifex
|
2017-05-17 09:58:58 +00:00 |
|
Mario Danic
|
fc7c24b610
|
Fix delete
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-05-17 11:17:05 +02:00 |
|
Mario Danic
|
8b923ad8e7
|
Push fix
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-05-17 11:01:00 +02:00 |
|
Nextcloud bot
|
e420fac753
|
[tx-robot] updated from transifex
|
2017-05-17 00:23:49 +00:00 |
|
AndyScherzinger
|
9021848af6
|
use apply instead of commit
|
2017-05-16 21:50:59 +02:00 |
|
AndyScherzinger
|
c749f6ea32
|
Fix javaDoc format
|
2017-05-16 21:41:02 +02:00 |
|
tobiasKaminsky
|
4f8da57a0e
|
minor improvements due to android studio suggestions
|
2017-05-16 13:30:07 +02:00 |
|
tobiasKaminsky
|
5126eeac10
|
do not show "set picture as" for svg images
|
2017-05-16 13:27:16 +02:00 |
|
tobiasKaminsky
|
e520c5a585
|
fix some issues/warnings
fix some issues/warnings
scoping back
|
2017-05-16 13:14:19 +02:00 |
|
Mario Danic
|
05425c0444
|
Fix push
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-05-16 12:33:44 +02:00 |
|
Mario Đanić
|
f1c0317dce
|
Merge pull request #1001 from nextcloud/enhanceParticipate
Minor improvements to participate view
|
2017-05-16 11:06:20 +02:00 |
|
tobiasKaminsky
|
852252717b
|
non-downloaded file will first downloaded and then used for "set as"
|
2017-05-16 09:48:47 +02:00 |
|
Nextcloud bot
|
e4e75bc7cb
|
[tx-robot] updated from transifex
|
2017-05-16 00:23:28 +00:00 |
|
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 |
|