mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-18 23:11:58 +03:00
Code Issues Projects Releases Packages Wiki Activity
7442 commits 221 branches 1585 tags 637 MiB
Commit graph

7442 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
0f7e51fc37
temp gradle dependency to library PR 2017-05-13 13:48:41 +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
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