Commit graph

7758 commits

Author SHA1 Message Date
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
bdc376d573
use temp jitpack snapshot for our lib 2017-05-12 15:45:53 +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
8f07e4f201
add maintenance mode lib change 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ć
45d305afd6 Merge pull request #982 from nextcloud/newLint
Use lint checker
2017-05-12 15:42:52 +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