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 |
|
Mario Danic
|
6906eab645
|
Few fixes
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2017-05-12 15:20:42 +02:00 |
|
Andy Scherzinger
|
b2405c4517
|
Merge pull request #987 from nextcloud/privacy
Privacy webview
|
2017-05-12 14:50:28 +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 |
|
tobiasKaminsky
|
c341c8d204
|
workaround: do nothing if sharee already exists
|
2017-05-12 10:54:50 +02:00 |
|
Nextcloud bot
|
8ec2a1de46
|
[tx-robot] updated from transifex
|
2017-05-12 00:22:16 +00:00 |
|
tobiaskaminsky
|
141aac2862
|
sign
|
2017-05-11 20:19:58 +02:00 |
|
tobiaskaminsky
|
989c463b9c
|
enable tests again
|
2017-05-11 20:19:40 +02:00 |
|
nextcloud-android-bot
|
11212017fe
|
Drone: update Lint results to reflect reduced error/warning count [skip ci]
|
2017-05-11 18:10:07 +00:00 |
|
Tobias Kaminsky
|
94bceebb06
|
Merge 4b2c5af73a into 2d94a9898c
|
2017-05-11 18:05:58 +00:00 |
|
tobiaskaminsky
|
4b2c5af73a
|
restart drone.io, again
|
2017-05-11 20:05:49 +02:00 |
|
tobiaskaminsky
|
2a78dad8bc
|
restart drone.io
|
2017-05-11 20:02:33 +02:00 |
|
tobiaskaminsky
|
bacb77257e
|
[skip ci] dummy change 4
|
2017-05-11 16:05:04 +02:00 |
|
tobiaskaminsky
|
cd32f58a2c
|
[skip ci] dummy change 3
|
2017-05-11 16:02:56 +02:00 |
|
tobiaskaminsky
|
579c7c6a3d
|
[skip ci] dummy change 2
|
2017-05-11 16:00:23 +02:00 |
|
tobiaskaminsky
|
a32f65371e
|
[skip ci] dummy change
|
2017-05-11 15:49:09 +02:00 |
|
nextcloud-android-bot
|
e78dfdb00a
|
Drone: update Lint results to reflect reduced error/warning count [skip ci]
|
2017-05-11 13:25:12 +00:00 |
|
Tobias Kaminsky
|
97b9fa39c7
|
Merge c9498d66b8 into 2d94a9898c
|
2017-05-11 12:58:57 +00:00 |
|
tobiaskaminsky
|
c9498d66b8
|
push to right branch
|
2017-05-11 14:58:34 +02:00 |
|
tobiaskaminsky
|
8d1621bc44
|
travis -> drone
|
2017-05-11 14:47:06 +02:00 |
|