Commit graph

7532 commits

Author SHA1 Message Date
Mario Danic
ba9a3a2886 Push 2017-04-19 19:48:50 +02:00
Mario Đanić
24ed2a1249 Merge pull request #848 from nextcloud/fix-drone
Fix drone
2017-04-19 19:47:47 +02:00
Mario Danic
4cd4af9824 Fix drone 2017-04-19 19:46:58 +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
79a0a380eb
move to master snapshot of library 2017-04-19 18:08:54 +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
8d2d9303d9
Merge remote-tracking branch 'origin/notifications' into notifications
# Conflicts:
#	src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
2017-04-19 16:26:50 +02:00
tobiasKaminsky
c070e9d1bb
missing merge commit 2017-04-19 16:26:29 +02:00
Andy Scherzinger
029b4a1a02 Merge pull request #805 from nextcloud/svgViewRedone
Show SVG images
2017-04-19 16:23:17 +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
AndyScherzinger
a0fd11b3c4
updated lib references 2017-04-19 16:06:13 +02:00
Mario Danic
ae58e82f0a
dont build modified 2017-04-19 15:55:56 +02:00
Mario Danic
b3a9c56511
Update things 2017-04-19 15:55:55 +02:00
Mario Danic
0eab8f9a2e
Fix initial subscription 2017-04-19 15:55:55 +02:00
Mario Danic
b787ee6caa
Work 2017-04-19 15:55:53 +02:00
Mario Danic
89ef51b703
Only send registration if all is well 2017-04-19 15:54:55 +02:00
Mario Danic
0cabc398b1
Fix sha512 magic 2017-04-19 15:54:55 +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
Mario Danic
50bed99eec
clear up notifications 2017-04-19 15:54:54 +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
76471322ef
Remove Mario 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
Andy Scherzinger
53678207f0
WiP use notifications library branch 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
d5170673ff
Remove Mario 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
AndyScherzinger
febf476534
enforce refresh of SNAPSHOT lib dependencies 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