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

7490 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
AndyScherzinger
28e8eaa376
fix DB upgrade routine for virtual table 2017-05-12 13:21:03 +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
AndyScherzinger
9a88f547f4
Merge branch 'master' of https://github.com/nextcloud/android into searchViewWrongFiles 2017-05-12 11:01:30 +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
tobiaskaminsky
82784a8a54
use branch, user, pass 2017-05-11 14:42:29 +02:00
tobiaskaminsky
80dfc59d50
after all other flavours 2017-05-11 14:25:42 +02:00
tobiaskaminsky
5e1e5a88e6
use lint checker 2017-05-11 13:59:54 +02:00
Mario Đanić
2d94a9898c Merge pull request #977 from nextcloud/enable-folder-favorite-action 
Add support for folder favorite action
 2017-05-11 11:53:16 +02:00
Mario Danic
4e122a9124 Fix issues 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-11 11:50:46 +02:00
Mario Đanić
192e4d6213 Merge pull request #928 from nextcloud/fix_bug_previewmedia 
Fix bug #888
 2017-05-11 11:40:57 +02:00
tobiasKaminsky
39bf45da64
revert this, although it will get removed by a different PR 2017-05-11 11:36:41 +02:00
Mario Đanić
99114a2c72 Merge pull request #972 from nextcloud/hideContactsBackupFolder 
Hide contacts backup folder
 2017-05-11 11:32:15 +02:00
Tobias Kaminsky
888ee65b77 Merge pull request #978 from ka7/feature/spelling 
spelling fixes
 2017-05-11 09:36:36 +02:00
tobiaskaminsky
399ff5802f
get storage manager, stop if null (this happens while a long async thread, e.g. photo fetching, is cancelled by device orientation changing) 2017-05-11 09:13:42 +02:00
klemens
f30cbca78c spelling fixes 2017-05-10 21:04:47 +02:00
Mario Danic
d3ea3a8ccf Add support for folder favorite action 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-10 19:54:40 +02:00
Nextcloud bot
db7e5fae89
[tx-robot] updated from transifex 2017-05-10 00:24:22 +00:00
alejandro
e101785ce2 Show hidden files after enable it 2017-05-09 17:44:12 -05:00