Commit graph

410 commits

Author SHA1 Message Date
Mario Đanić
89f4d81ff1 Merge pull request #824 from nextcloud/contactBackupRestore
Contact backup & import
2017-04-20 22:36:00 +02:00
AndyScherzinger
299f08694f
fixes due to code review 2017-04-20 21:51:08 +02:00
tobiasKaminsky
fe6171571f
prevent NPE if trying to store grid preference for favorites/shared 2017-04-20 15:34:36 +02:00
tobiasKaminsky
9377f22f51
swipe to refresh for "search" 2017-04-20 11:26:22 +02:00
tobiasKaminsky
95d9ea014c
fix missing long click in "search" 2017-04-20 11:21:25 +02:00
tobiasKaminsky
9c1339b1e4
prevent crash when fetching search event while rotating 2017-04-20 10:32:45 +02:00
AndyScherzinger
ed59604d3f
fixes after rebase 2017-04-20 09:09:14 +02:00
AndyScherzinger
744a1fc549
fix remove line 2017-04-20 09:09:13 +02:00
AndyScherzinger
8bdb8614e6
fixes after rebase due to project structure changes 2017-04-20 09:09:13 +02:00
Flole998
b291d6b3c1
Update strings.xml 2017-04-20 09:09:12 +02:00
Flole998
10f787b186
Update strings.xml 2017-04-20 09:09:12 +02:00
Flole
043ff2ad8f
Fixing issues mentioned in review. 2017-04-20 09:09:11 +02:00
Flole
99bf76657a
Added Fingerprint Support 2017-04-20 09:09:10 +02:00
Flole
8da1057f3b
Added Fingerprint Support 2017-04-20 09:08:59 +02:00
Nextcloud bot
fb4374d9fc
[tx-robot] updated from transifex 2017-04-20 00:21:12 +00:00
AndyScherzinger
cf7ccdfc65
Merge branch 'master' of https://github.com/nextcloud/android into contactBackupRestore
# Conflicts:
#	src/main/res/values/strings.xml
2017-04-19 23:38:31 +02:00
AndyScherzinger
22976389c2
add generic circular avatars for contacts and use slightly smaller, more material like font size 2017-04-19 19:08:59 +02:00
AndyScherzinger
f9c0e1ca09
align text to the right 2017-04-19 18:31:20 +02:00
Mario Danic
312c09b902 Implement icon loading 2017-04-19 18:28:57 +02:00
AndyScherzinger
8187a2582f
Merge branch 'master' of https://github.com/nextcloud/android into contactBackupRestore
# Conflicts:
#	src/main/res/values/setup.xml
#	src/modified/res/values/setup.xml
2017-04-19 18:25:51 +02:00
AndyScherzinger
4c46665d0c
Merge branch 'master' of https://github.com/nextcloud/android into notifications 2017-04-19 18:11:42 +02:00
AndyScherzinger
cb281d3bb1
further cleanups 2017-04-19 17:41:20 +02:00
AndyScherzinger
a04b3e63dc
cleanups 2017-04-19 17:09:45 +02:00
tobiasKaminsky
c070e9d1bb
missing merge commit 2017-04-19 16:26:29 +02:00
Mario Danic
c0f4b80c43
Implement checkboards for svg 2017-04-19 16:06:23 +02:00
AndyScherzinger
320d991c19
show SVG images 2017-04-19 16:06:22 +02:00
Mario Danic
b3a9c56511
Update things 2017-04-19 15:55:55 +02:00
Mario Danic
b787ee6caa
Work 2017-04-19 15:55:53 +02:00
Mario Danic
8ef8a68a86
Fix a few things 2017-04-19 15:54:55 +02:00
Mario Danic
047bd3cc8e
Work a bit more on notifications 2017-04-19 15:54:55 +02:00
AndyScherzinger
8604a14448
fix double method call 2017-04-19 15:54:54 +02:00
Mario Danic
e429f351a3
Fix drawer menu item 2017-04-19 15:54:54 +02:00
Mario Danic
efeeaf83d9
Make notifications single instance 2017-04-19 15:54:54 +02:00
Mario Danic
f21fe2b972
Remove push enabled 2017-04-19 15:54:53 +02:00
Mario Danic
1ea6607186
Improve custom handling 2017-04-19 15:54:53 +02:00
Mario Danic
9ea45c74a7
Basics of push 2017-04-19 15:54:53 +02:00
AndyScherzinger
a49f8792ee
WiP data fetching 2017-04-19 15:54:53 +02:00
AndyScherzinger
a382872313
WiP activity for notifications 2017-04-19 15:54:52 +02:00
Mario Danic
1ab159163c
Fix bunch of stuff 2017-04-19 15:54:52 +02:00
Mario Danic
9684e89daf
Fix drawer menu item 2017-04-19 15:54:52 +02:00
Mario Danic
537c6a12f4
Make notifications single instance 2017-04-19 15:54:52 +02:00
AndyScherzinger
8eeec5f891
add item divider via decorator 2017-04-19 15:54:51 +02:00
AndyScherzinger
ac088c14a0
initial UI implementation displaying notifications 2017-04-19 15:54:51 +02:00
Mario Danic
9e1ceebf9c
Remove push enabled 2017-04-19 15:54:51 +02:00
Mario Danic
c14d26f635
Improve custom handling 2017-04-19 15:54:51 +02:00
Mario Danic
dfc95e6edd
Basics of push 2017-04-19 15:54:50 +02:00
Mario Danic
6e934c5e6d
Fix notifications 2017-04-19 15:54:50 +02:00
Mario Danic
d66499e125
Try to fix 2017-04-19 15:54:50 +02:00
AndyScherzinger
669f68444d
WiP data fetching 2017-04-19 15:54:50 +02:00
AndyScherzinger
20ac3b4e69
empty list icon, use latest empty list layout and butterknife 2017-04-19 15:54:49 +02:00
AndyScherzinger
cb8c8caf7d
WiP activity for notifications 2017-04-19 15:54:49 +02:00
AndyScherzinger
0325dd37e5
notifications icon work 2017-04-19 15:54:49 +02:00
Mario Đanić
0677d536c0 Merge pull request #845 from nextcloud/fixNavigation
bugfix for #798
2017-04-19 15:16:18 +02:00
tobiasKaminsky
06275e0f79
and the last one... 2017-04-19 14:54:36 +02:00
tobiasKaminsky
0d29d949c5
fixed missing drawer events 2017-04-19 14:52:26 +02:00
Mario Đanić
1a18de8cc4 Merge pull request #826 from nextcloud/fix_bug_firstlogin
Fix bug firstlogin
2017-04-19 14:39:21 +02:00
Tobias Kaminsky
20e83d269b Merge pull request #830 from nextcloud/fix-fileprovider
Fix fileprovider
2017-04-19 14:07:57 +02:00
Tobias Kaminsky
751e5068d1 Merge pull request #828 from nextcloud/fix-branding
Improve branding
2017-04-19 14:02:09 +02:00
Andy Scherzinger
abe6f9fb42 Merge pull request #832 from nextcloud/remove-play-stuff
Remove gcm stuff
2017-04-19 13:42:50 +02:00
tobiasKaminsky
1a6b14c0ff
bugfix for #798
checking cast if remote request is long running
preventing MissingActivityException if fragment is detached from Activity
2017-04-19 13:41:31 +02:00
Tobias Kaminsky
2033b81f80 Merge pull request #829 from nextcloud/ignore-thumbnails
Ignore thumbnail files
2017-04-19 12:22:15 +02:00
Mario Đanić
e9c9884357 Merge pull request #827 from nextcloud/welcome-webview
Implement webview welcome pages
2017-04-19 09:05:17 +02:00
tobiasKaminsky
ae75177f75
smaller borders, vertical centered text 2017-04-19 08:45:46 +02:00
Nextcloud bot
9da87449d7
[tx-robot] updated from transifex 2017-04-19 00:21:05 +00:00
alejandro
7701b697a1 Revert "Bug #810 was Fixed"
This reverts commit 845762f8d0.
2017-04-18 10:13:48 -05:00
Mario Đanić
34f79b757f Merge pull request #825 from nextcloud/fix_bug_mediaplayer
Bug #810 Media Control
2017-04-18 16:54:52 +02:00
tobiasKaminsky
33544f65e7
hide search and option menu when showing contact list 2017-04-18 10:55:46 +02:00
tobiasKaminsky
54f8d3091c
use input stream reader for backward compatibility 2017-04-18 10:41:09 +02:00
tobiasKaminsky
57d210c49f
use collections sort to support older apis 2017-04-18 10:34:08 +02:00
tobiasKaminsky
c4e2e6a07f
prevent NPE if name is null 2017-04-18 09:33:24 +02:00
tobiasKaminsky
c47408d33c
Merge remote-tracking branch 'origin/master' into contactBackupRestore 2017-04-18 09:14:13 +02:00
tobiasKaminsky
e0a71f8810
Merge remote-tracking branch 'remotes/origin/contactBackupRestore' into contactBackupRestore 2017-04-18 09:07:41 +02:00
tobiasKaminsky
fa414c2a1b
"backup now" asks for permission 2017-04-18 09:01:44 +02:00
tobiasKaminsky
3186c21619
do not explicity start the service
always unbind
2017-04-18 08:50:19 +02:00
Mario Đanić
c76943803b Merge pull request #836 from nextcloud/UploadListCount
Upload: count uploads
2017-04-18 08:36:07 +02:00
tobiasKaminsky
84ff5832ba
satisfy codacy ;-) 2017-04-18 08:23:56 +02:00
tobiasKaminsky
0ab392a00d
use recyclerview 2017-04-18 08:23:56 +02:00
tobiasKaminsky
d058efc2de
contact list: text is now in line with header
round images
2017-04-18 08:23:56 +02:00
tobiasKaminsky
9aff159c16
make headlines bold
set initial state of last backup to "never"
2017-04-18 08:23:55 +02:00
tobiasKaminsky
72ee736184
expire files on daily backup is now working 2017-04-18 08:23:55 +02:00
tobiasKaminsky
b23b46dfe8
fix showing wrong jobs, only autoUploadJobs should be shown in UploadActivity 2017-04-18 08:23:55 +02:00
tobiasKaminsky
bdc549eee7
fix showing wrong badges 2017-04-18 08:23:55 +02:00
tobiasKaminsky
35e683546c
contact backup & import 2017-04-18 08:23:55 +02:00
Nextcloud bot
538ca93c5a
[tx-robot] updated from transifex 2017-04-18 00:20:54 +00:00
AndyScherzinger
708a261409
minor material design layout fixes 2017-04-17 20:12:27 +02:00
tobiasKaminsky
5c01f75c64
satisfy codacy ;-) 2017-04-17 19:45:17 +02:00
tobiasKaminsky
b5a9813cbc
use recyclerview 2017-04-17 19:45:17 +02:00
tobiasKaminsky
16296153de
contact list: text is now in line with header
round images
2017-04-17 19:45:16 +02:00
tobiasKaminsky
9c37334ef7
make headlines bold
set initial state of last backup to "never"
2017-04-17 19:45:16 +02:00
tobiasKaminsky
07e3fc524d
expire files on daily backup is now working 2017-04-17 19:45:16 +02:00
tobiasKaminsky
9d1f2666cd
fix showing wrong jobs, only autoUploadJobs should be shown in UploadActivity 2017-04-17 19:45:15 +02:00
tobiasKaminsky
778c4e9ec2
fix showing wrong badges 2017-04-17 19:45:15 +02:00
tobiasKaminsky
d1d01db7a1
contact backup & import 2017-04-17 19:45:12 +02:00
AndyScherzinger
c90354af17
For pending, failed, etc. show the item count 2017-04-17 19:25:12 +02:00
Nextcloud bot
8d3617a742
[tx-robot] updated from transifex 2017-04-17 00:20:39 +00:00
Nextcloud bot
d024dceb9e
[tx-robot] updated from transifex 2017-04-16 00:20:42 +00:00
Nextcloud bot
c5744c61b5
[tx-robot] updated from transifex 2017-04-15 00:22:23 +00:00
Nextcloud bot
e781d20704
[tx-robot] updated from transifex 2017-04-14 00:21:31 +00:00
Mario Danic
8717832fbb Remove gcm stuff 2017-04-13 22:54:37 +02:00
tobiasKaminsky
f239dfbdb2
put icon fetching into DisplayUtils 2017-04-13 13:49:58 +02:00