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 |
|
tobiasKaminsky
|
480014e27f
|
Merge remote-tracking branch 'remotes/origin/master' into lintConfig
|
2017-05-13 09:28:43 +02:00 |
|
tobiasKaminsky
|
6719fba5b9
|
disable 'MissingTranslation' as this is handled by transifex
|
2017-05-13 08:52:56 +02:00 |
|
Nextcloud bot
|
d0427e78ab
|
[tx-robot] updated from transifex
|
2017-05-13 00:23:27 +00:00 |
|
AndyScherzinger
|
371ea460f1
|
bump lib version to 1.0.16
|
2017-05-12 15:51:59 +02: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
|
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 |
|