1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-12-23 03:18:04 +01:00
Commit graph

456 commits

Author SHA1 Message Date
Gregor Santner
9ecaf6900a
Update travis 2016-12-22 13:23:20 +01:00
Gregor Santner
165626fc6c
Added flavour secondlion* 2016-12-22 04:07:30 +01:00
Gregor Santner
a31a530c7c Release v0.2.2
* Move toggle mobile/desktop to navslider (opt-in)
* Update TR
2016-12-20 12:19:43 +01:00
Gregor Santner
05e6e4d2bd
Reduce messages by broadcast 2016-12-18 16:10:48 +01:00
Gregor Santner
175125996e
Reformat java files 2016-12-18 15:07:23 +01:00
Gregor Santner
4f3eac9977
Allow to jump to last visited page on stream; FIX NullPtr in shared text methods 2016-12-18 15:07:00 +01:00
Gregor Santner
d567b5fbdd
Update strings.xml 2016-12-18 12:31:35 +01:00
Gregor Santner
4519d16af8
Added hungarian language, Update podlist 2016-12-17 00:59:19 +01:00
Gregor Santner
c461ff5b7c
Fixes #117 - Reset NavHeader on change account, reset web profile 2016-12-16 05:24:03 +01:00
Gregor Santner
9e0c6b1741
Fix Rotation, Remove legacy code, Remove PunkBeer Pod
* Fix #92 Rotation
* Fix #111 Legacy
* Remove punkbeer
<https://diasp.org/posts/6449363>
2016-12-16 04:45:53 +01:00
Gregor Santner
97543ced06 Announce 0.2.1-next 2016-11-24 00:41:51 +01:00
Gregor Santner
8abb662546 Release - v0.2.1 2016-11-22 19:22:44 +01:00
Gregor Santner
bea1a83f90 Changes for dandelion 2016-11-20 16:43:38 +01:00
3a4f41f758 Merge pull request #125 from Diaspora-for-Android/rotation-option
Added option to control screen rotation (Fix #92)
2016-11-20 15:49:46 +01:00
8ede0ea304
Fixed rotation 2016-11-20 15:49:01 +01:00
6037c0b3eb
Fixed #127 2016-11-13 18:21:33 +01:00
b62f8d32b7
Added option to control screen rotation 2016-11-12 15:36:56 +01:00
dbafcc065c
Fixed duplicate strings and removed unnecessary background colors 2016-11-11 20:37:27 +01:00
be0a37dbc8
Workaround for overlapping fragments. Fixes #116 2016-11-11 20:17:59 +01:00
812c4dabf7 Merge pull request #120 from Diaspora-for-Android/option-topbar-stream
Added back stream loading on topbar click. Made it toggleable in sett…
2016-11-11 20:04:51 +01:00
Gregor Santner
499027a8f1 Revoking last commit 2016-11-10 23:09:22 +01:00
b8476aa107
Do not attempt to load stream when there is no registered account 2016-11-10 14:24:31 +01:00
00e238a028
Added back stream loading on topbar click. Made it toggleable in settings 2016-11-10 14:18:22 +01:00
d6c6920840
Merged translations 2016-11-10 13:30:37 +01:00
c02ededf9f New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
Approved. Step name: Proofread
Approved. Step name: Proofread
Approved. Step name: Proofread
Approved. Step name: Proofread
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
Approved. Step name: Proofread
Approved. Step name: Proofread
New translations
New translations
New translations
New translations
Approved. Step name: Proofread
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
Approved. Step name: Proofread
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
Translated
Translated
New translations
Translated
Translated
New translations
New translations
New translations
Translated
Translated
New translations
Approved. Step name: Proofread
Approved. Step name: Proofread
New translations
Approved. Step name: Proofread
Approved. Step name: Proofread
Approved. Step name: Proofread
New translations
New translations
New translations
New translations
New translations
New translations
Approved. Step name: Proofread
New translations
New translations
New translations
New translations
New translations
New translations
New translations
New translations
Approved. Step name: Proofread
New translations
Approved. Step name: Proofread
Approved. Step name: Proofread
Approved. Step name: Proofread
New translations
New translations
Approved. Step name: Proofread
New translations
New translations
New translations
Approved. Step name: Proofread
Approved. Step name: Proofread
Approved. Step name: Proofread
Translated
Translated
New translations
New translations
New translations
Translated
New translations
New translations
New translations
New translations
New translations
New translations
Approved. Step name: Proofread
New translations

Translated
Translated
Translated
Translated
Translated
Translated
New translations
Translated
Translated
New translations
New translations
Translated
New translations
Translated
Translated
Translated
Translated
Translated
New translations
Translated
Translated
Approved. Step name: Proofread
Translated
Approved. Step name: Proofread
Approved. Step name: Proofread
Approved. Step name: Proofread
New translations
Approved. Step name: Proofread
Approved. Step name: Proofread
Approved. Step name: Proofread
Translated
Approved. Step name: Proofread
New translations
New translations
New translations
New translations
Approved. Step name: Proofread
Approved. Step name: Proofread
Approved. Step name: Proofread
Translated
New translations
Translated
Approved. Step name: Proofread
New translations
Translated
Approved. Step name: Proofread
New translations
Translated
Translated
Translated
Translated
New translations
Translated
Translated
Translated
Translated
Translated
New translations
New translations
Approved. Step name: Proofread
Translated
New translations
New translations
Translated
Translated
Approved. Step name: Proofread
Approved. Step name: Proofread
Translated
Translated
Translated
Approved. Step name: Proofread
Approved. Step name: Proofread
Approved. Step name: Proofread
Approved. Step name: Proofread
New translations
New translations
Approved. Step name: Proofread
Approved. Step name: Proofread
Approved. Step name: Proofread
New translations
Approved. Step name: Proofread
Approved. Step name: Proofread
Approved. Step name: Proofread
Translated
New translations
Translated
Translated
Translated
Approved. Step name: Proofread
Translated
Approved. Step name: Proofread
Translated
New translations
Translated
New translations
Translated
New translations
New translations
Approved. Step name: Proofread
New translations
Translated
Approved. Step name: Proofread
New translations
New translations
Translated
New translations
New translations
Translated
Translated
Approved. Step name: Proofread
Translated
New translations
Translated
New translations
Approved. Step name: Proofread
New translations
New translations
2016-11-10 12:20:52 +01:00
c5b201f456
Fixed string 2016-11-08 22:17:15 +01:00
8b48cf38ce
Fixed translatable string 2016-11-08 21:04:01 +01:00
527912e49b
Fixed a ton of lint issues 2016-11-08 20:41:53 +01:00
d0a541bc34
Replaced setTextColor on Buttons with new ThemeHelper method 2016-11-08 16:21:06 +01:00
1db57bd957 Merge pull request #115 from Diaspora-for-Android/rework-about-again
Reworked AboutFragment
2016-11-08 13:45:21 +01:00
f2ed7069a6 Reworked AboutFragment
Reworked licenseFragment

removed unused old layout

Fixed lint issues

Fixed margin

use onClick and fix string indent
2016-11-08 13:07:38 +01:00
Gregor Santner
7a0ec98ed4 Change default signed APK name 2016-11-07 20:53:16 +01:00
Gregor Santner
ff48cb8982 Announcing 0.2.0-next (again) 2016-11-07 18:07:09 +01:00
Gregor Santner
fff3c7a716 v0.2.0a 2016-11-07 17:41:01 +01:00
bea35292f8
Fixed #113 (well, that was quick n easy) 2016-11-06 20:55:51 +01:00
8e324d8f2b Added reports navdrawer entry and divided visibility options into subcategories as suggested by gsantner
Merge PR #110 from DfA/divide-visibility-options

Reports Navdrawer Item reworked
set context of webview in onAttach method of BrowserFragment

Merge branch 'master' of github.com:Diaspora-for-Android/diaspora-android
2016-11-06 20:36:43 +01:00
e6f16fce50
Suppressed unfixable warnings on clearPodSettings and clearAppSettings. 2016-11-06 19:55:45 +01:00
b07a1eba1e
Possible fix for webview crashes 2016-11-06 17:33:22 +01:00
825d9be1e0
Fixed a lint issue and caught potential null pointers in AppLog 2016-11-06 16:45:21 +01:00
dd4af48b8e Fixed lint issues (suppressed, where they cant be fixed)
Release 0.2.0 (Updated translation files)

Announcing 0.2.0-next

Added wipe-settings option

Merge branch 'master' of github.com:Diaspora-for-Android/diaspora-android

Merge branch 'master' into wipe-settings

Added ThemedAlertDialogBuilder and a corresponding method in ThemeHelper

Merge branch 'master' into wipe-settings

Reworked dialog
2016-11-06 16:23:18 +01:00
Gregor Santner
a151d37a4e start of 0.2.0-next 2016-11-04 10:47:33 +01:00
Gregor Santner
bc925e1a1e Release v0.2.0 2016-11-04 03:08:59 +01:00
Gregor Santner
e95082cefb Download podlist at build time 2016-11-02 17:10:29 +01:00
Gregor Santner
95dbb2cd34 TR 2016-11-01 22:49:35 +01:00
a650994626
Prevent loading stream on toggle split screen (Android 7.0.0) 2016-10-31 22:24:26 +01:00
Gregor Santner
d1f837e5f7 same 2016-10-31 18:37:21 +01:00
Gregor Santner
320360afb3 TR/Pod Update 2016-10-31 17:41:28 +01:00
Gregor Santner
caa7f8c59d Update build.gradle 2016-10-31 07:15:29 +01:00
fd05370280
Fixed pod displaying pod domain/name in debug fragment and fixed diaspora markdown link 2016-10-30 21:04:08 +01:00
d8a3e029b1
Fixed some strings 2016-10-28 19:25:43 +02:00
c8eb6f598f
Made proxy description more precise and made verbose logging depended from debugging 2016-10-28 19:19:48 +02:00
666950590b
Reference to strings from font size values array 2016-10-28 19:10:23 +02:00
b9c4223a5e
Fixed intellihide not applied in onresume 2016-10-28 12:51:45 +02:00
Gregor Santner
32b747ebb7 Do not publish active6 to json 2016-10-28 02:35:17 +02:00
Gregor Santner
4d1c12a9d9 Merge PR #101 from DfA/settings_icons
Added icons to the settings
2016-10-28 00:37:44 +02:00
f89f21f979 Added icons to the settings
Chaged some icons

Moved Contacts up one in Settings
2016-10-28 00:18:44 +02:00
765a96f48b
Removed unused applogs 2016-10-27 22:46:21 +02:00
30ca937461
Added info Toasts to Proxy preference, that inform the user about required restart and successful preset setting 2016-10-27 21:42:41 +02:00
d34c75a647
Fixed #91 in a better way 2016-10-27 12:55:42 +02:00
6e1e473aff
Fixed #91 2016-10-27 12:42:44 +02:00
Gregor Santner
9214155425 Move scroll up action to stream only 2016-10-26 23:43:53 +02:00
bafcfd46d6
Fixed #99 2016-10-26 22:35:57 +02:00
ef43ed2f7f
Fixed crashing when clearing cache before selecting pod (Fix #90) 2016-10-26 21:53:27 +02:00
Gregor Santner
4e91d101aa Update NL lanugage 2016-10-26 16:31:21 +02:00
Gregor Santner
b7ca97208a BIG REFACTORING - 0.1.6-next edition 2016-10-26 16:23:14 +02:00
Gregor Santner
2b0a5cd876 ThemedFragment for Aspects & tagst, fixes #94 #81 2016-10-26 14:33:05 +02:00
Gregor Santner
23e1ddc8cf #91 2016-10-26 00:00:44 +02:00
Gregor Santner
80d3d3265e Update TR 2016-10-25 23:20:12 +02:00
Gregor Santner
1cf21f057f Fixes #95 2016-10-25 23:04:16 +02:00
532b80ea84
Added ThemedVisibilityPreference and set it in NavSlider Preference Screen 2016-10-25 21:29:16 +02:00
97d075e210
Added navslider entry contacts 2016-10-25 17:56:35 +02:00
03166de709
Moved WebView related method calls to UiThread 2016-10-25 17:37:22 +02:00
b9221099c2 SQUASH
Rewrote ThemedSettings by inheriting Preference classes

Fixed issues pointed out by gsantner

Added back circle color picker preview to Settings and reflect color changes immediatelly :D

Removed some debug messages and unified usage of Themeable
2016-10-25 17:04:32 +02:00
6ad634cc5b
made getAppSettings more safe 2016-10-23 00:21:17 +02:00
6cc651bfcc
Themed PodSelectionDialog 2016-10-22 23:30:22 +02:00
Gregor Santner
6e7ae16e33 #85 2016-10-22 20:10:48 +02:00
Gregor Santner
866672eb47 Show Tor preset in Pod selection
; Themed BadgeDrawable
; Update TR, Pods
; Show Stream option after login
2016-10-22 19:21:26 +02:00
Gregor Santner
2f5aa1e0e7 backward compatibility - proxy 2016-10-22 16:01:45 +02:00
3e7c843d7b
Update gradle and fix proxy port bug 2016-10-18 21:15:54 +02:00
6b512ee110 Merge branch 'master' of github.com:Diaspora-for-Android/diaspora-android 2016-10-16 19:46:23 +02:00
Gregor Santner
a0d1992829 TR update 2016-10-15 12:42:15 +02:00
ebc70fdff0
Allow more than one line in the nav_header pod notice 2016-10-15 11:21:51 +02:00
f76207e75b
Switched intellihide toolbars on by default 2016-10-14 13:07:07 +02:00
8e852d7ff2
Added notifications dropdown menu with settings 2016-10-14 12:57:17 +02:00
54ba7b389c Merge branch 'notification_toolbar_item_rework' 2016-10-14 12:37:38 +02:00
6d4bc38ea6
Fixed SettingsActivity crash 2016-10-14 12:33:58 +02:00
0a4be1e502
Fixed typo 2016-10-14 12:23:01 +02:00
Gregor Santner
ec8eec2960 Update german translations 2016-10-14 02:06:18 +02:00
Gregor Santner
eee1f3a84a notification_toolbar_item_rework part 1 2016-10-14 01:44:43 +02:00
Gregor Santner
71d8b886f6 Code auto reformatting; Update TR, PodList 2016-10-14 01:26:56 +02:00
Gregor Santner
110598ea85 Merge branch 'master' into poddy_as_podsource 2016-10-14 00:44:23 +02:00
Gregor Santner
627c996f89 PR fixes 2016-10-14 00:22:08 +02:00
14b9b6a8f0
Fixed Settings layout issue 2016-10-13 18:18:47 +02:00
26751ff931
Merged proper-themes 2016-10-13 17:51:35 +02:00
c67992fc37 Proxy tor preset
Set windowSoftInputMode to adjustResize, Repair sharing text into app, Repair image sharing on 4.2

Fix view intent

Update TR; Update buildToolsVersion -> 24.0.2

Update ISSUE_TEMPLATE.md
Update README.md

Switch ic_launcher back to png

Replace blowball image on splash with character

Reworked UI using Fragments

Merge branch 'master' into rework_fragments

Update README.md
Fixed top/bottom menu entry population

Added HashtagFragment

Moved WebClients and ChromeClients to webview package

Removed SplashActivity, migrated PodSelectionActivity to PodSelectionFragment

Merge branch 'master' into rework_fragments

Handle Intent.Action.Main in handleIntent()

Update strings-about.xml
Fixed image sharing to other apps

Get title for image sharing dialog from resources instead of using hardcoded string. Also do not show multiple permission dialogs stacked

Removed test Fragments and old SplashActivity related stuff

Merge branch 'master' into rework_fragments

Added some documentation to MainActivity

Fixed clear webview cache. Thanks @di72nn

Only set window title depending on webviews content, when DiasporaStreamFragment is displayed (do not overwrite other fragments title when the webview loads in the background)

Reworked custom themes

Set customtab color

Do not open load the stream when clicked on toolbar

Added note about customtabs and proxys. Fixes #77

Resolved merge conflicts

Removed duplicate method getAppSettings

Fixed default color was id instead of color value bug

Update TR

Some improvements of code quality

Moved colorpicker repo up

Fixed applying of settings

Fixed bug causing ClassCastException

Moved ThemeHelper and ColorPalette to util.theming

Added missing license headers to source files

Merge branch 'master' into proper-themes

Apply nav-slider entry visibilities in onResume

SettingsActivity: Switched to Toolbar and fixed toolbar color issue

Fixed BrowserFragment reloading in onResume and added credits to LeafPic

Added reference to ColorPicker in 3rd party licenses and updated support libraries

Merged master

Fixed applying proxy settings

Merged master proxy changes

Fixed nav slider layout color issue

Proxy tor preset

Reworked custom themes

Set customtab color

Do not open load the stream when clicked on toolbar

Added note about customtabs and proxys. Fixes #77

Resolved merge conflicts

Removed duplicate method getAppSettings

Fixed default color was id instead of color value bug

Update TR

Some improvements of code quality

Moved colorpicker repo up

Fixed applying of settings

Fixed bug causing ClassCastException

Moved ThemeHelper and ColorPalette to util.theming

Added missing license headers to source files

Merge branch 'master' into proper-themes

Apply nav-slider entry visibilities in onResume

SettingsActivity: Switched to Toolbar and fixed toolbar color issue

Fixed BrowserFragment reloading in onResume and added credits to LeafPic

Added reference to ColorPicker in 3rd party licenses and updated support libraries

Merged master

Fixed applying proxy settings

Merged master proxy changes

Fixed nav slider layout color issue

Merge branch 'proper-themes' of github.com:Diaspora-for-Android/diaspora-android into proper-themes
2016-10-13 16:56:31 +02:00
5d4106e0b3
Updated support libs and added more precise breakage notice 2016-10-10 18:13:41 +02:00
f49877b792
Fixed applying proxy settings 2016-10-10 17:47:04 +02:00
c09618f191
Merged master 2016-10-10 15:07:30 +02:00
d940b6c49a
Added missing license headers to source files 2016-10-09 21:04:12 +02:00
Gregor Santner
d9740d7275 Merge branch 'master' into poddy_as_podsource 2016-10-07 14:36:50 +02:00
Gregor Santner
a2508e4df5 Go to login page instead of podpage 2016-10-07 04:29:32 +02:00
Gregor Santner
64a9d02e7c Update podlist 2016-10-07 03:47:59 +02:00
Gregor Santner
c550c2474e Rework app to use new DiasporaPod class 2016-10-07 02:43:12 +02:00
Gregor Santner
3303a48787 Update TR 2016-10-07 02:11:45 +02:00
7391431501
Added note about customtabs and proxys. Fixes #77 2016-10-06 21:44:13 +02:00
ebedfd9fb5
Do not open load the stream when clicked on toolbar 2016-10-06 21:23:24 +02:00
Gregor Santner
654a00d647 PodSelectionFragment 2016-10-06 05:26:54 +02:00
Gregor Santner
50207181f9 Let PodService fetch from DfA; PodSelection rework 2016-10-05 02:30:10 +02:00
vanitasvitae
91c706ed4a Only set window title depending on webviews content, when DiasporaStreamFragment is displayed (do not overwrite other fragments title when the webview loads in the background) 2016-10-03 23:04:09 +02:00
vanitasvitae
c005ef744d Fixed clear webview cache. Thanks @di72nn 2016-10-03 18:28:08 +02:00
vanitasvitae
68d299f894 Added some documentation to MainActivity 2016-10-02 22:22:08 +02:00
vanitasvitae
160ed992df Merge branch 'master' into rework_fragments 2016-10-02 14:15:50 +02:00
vanitasvitae
88e4636e88 Removed test Fragments and old SplashActivity related stuff 2016-10-02 13:36:57 +02:00
vanitasvitae
7ee5e0f39b Get title for image sharing dialog from resources instead of using hardcoded string. Also do not show multiple permission dialogs stacked 2016-10-02 12:55:05 +02:00
vanitasvitae
036457117c Fixed image sharing to other apps 2016-10-02 12:42:12 +02:00
vanitasvitae
2475c66830 Update strings-about.xml 2016-10-01 01:47:16 +02:00
vanitasvitae
d8cbe480ad Handle Intent.Action.Main in handleIntent() 2016-10-01 01:30:58 +02:00
vanitasvitae
94895f78e0 Removed SplashActivity, migrated PodSelectionActivity to PodSelectionFragment 2016-10-01 01:18:42 +02:00
vanitasvitae
e06e2f3ba1 Moved WebClients and ChromeClients to webview package 2016-10-01 00:24:53 +02:00
vanitasvitae
fec93a0660 Added HashtagFragment 2016-09-30 23:15:10 +02:00
vanitasvitae
850f759cde Fixed top/bottom menu entry population 2016-09-29 19:44:42 +02:00
vanitasvitae
ae26ecd112 Merge branch 'master' into rework_fragments 2016-09-28 21:48:09 +02:00
vanitasvitae
e4d4305fc1 Reworked UI using Fragments 2016-09-28 21:43:25 +02:00
Gregor Santner
8e9dabe951 Replace blowball image on splash with character 2016-09-27 01:24:07 +02:00
Gregor Santner
4c8602b37d Switch ic_launcher back to png 2016-09-27 01:07:40 +02:00
Gregor Santner
a04e2051a8 Update TR; Update buildToolsVersion -> 24.0.2 2016-09-26 16:28:17 +02:00
vanitasvitae
2aaddec3a3 Fix view intent 2016-09-22 23:40:35 +02:00
vanitasvitae
5c41c62c85 Set windowSoftInputMode to adjustResize, Repair sharing text into app, Repair image sharing on 4.2 2016-09-22 23:20:13 +02:00
vanitasvitae
a1ca8596b8 forward clicks on bottom toolbar to fragments onOptionsItemSelected 2016-09-22 00:54:32 +02:00
vanitasvitae
179fb3e741 Removed onPause and onResume in oder to fix issue with image upload 2016-09-22 00:40:35 +02:00
vanitasvitae
3eb5b2c867 Moved some code from WebViewFragment to StreamFragment and vice versa 2016-09-22 00:29:32 +02:00
vanitasvitae
bd8b5381ea Prewarm customTabs 2016-09-21 22:49:37 +02:00
vanitasvitae
3d2fce6ac0 Fixed layout issue (webview below topbar 2016-09-21 21:35:03 +02:00
vanitasvitae
b2337b1955 Moved WebView in own fragments. There is still a bug, where the webview cannot be returned for some reason. 2016-09-21 21:15:34 +02:00
Gregor Santner
c94a511ace Proxy tor preset 2016-09-21 15:03:54 +02:00
Gregor Santner
52d6947d3e Refactor layout file names 2016-09-21 12:36:42 +02:00
Gregor Santner
b12e021e99 Update AppSettings.java 2016-09-20 23:55:50 +02:00
vanitasvitae
a086923804 Removed newNotificationSnackbar 2016-09-20 21:44:43 +02:00
vanitasvitae
adff9667af Version bump 2016-09-20 21:26:23 +02:00
Gregor Santner
aab63bfb13 TR Update 2016-09-20 21:08:11 +02:00
vanitasvitae
2996c63981 Fixed a bug where on Lolipop+ one could only append one image to a post 2016-09-20 20:41:25 +02:00
vanitasvitae
4a135e50d6 Removed animation from customTab 2016-09-20 20:09:30 +02:00
vanitasvitae
504f7cd434 Fixed #68 2016-09-20 19:52:42 +02:00
Gregor Santner
ed55459019 Move Logging to own class; Allow disable normal&spam messages 2016-09-19 01:10:29 +02:00
Gregor Santner
67c416f870 Preference option - Chrome Custom Tab 2016-09-18 23:17:18 +02:00
Gregor Santner
3af1d120d7 Merge branch master into customTabs 2016-09-18 20:15:59 +02:00
Gregor Santner
fb4209b13f bottom toolbar overflow style 2016-09-15 23:08:03 +02:00
Gregor Santner
e2eaa73ba1 #40 new color scheme, Replace png icons with vector drawables 2016-09-15 22:10:43 +02:00
Gregor Santner
0bf2e0aabd Update TR 2016-09-11 19:13:41 +02:00
Gregor Santner
5ba8675c39 Merge branch 'master' of github.com:Diaspora-for-Android/diaspora-android 2016-09-11 17:53:25 +02:00