diff --git a/CHANGELOG.md b/CHANGELOG.md
index c19b49db..6319ca9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,13 +10,13 @@
- Big thanks and good luck to @scoute-dich and @martinchodev for accompanying this project :)
# v0.1.2 (2016-06-05)
-- Extract and show aspects (by @sangre)
+- Extract and show aspects (by @gsantner)
- Cache last podlist
- Better sharing from app
- Collapsing top menu
- ProgressBar material, Improve search dialog
-- fix keyboard. #4
-- Reworked sharing from activity #12
+- fix keyboard. #4
+- Reworked sharing from activity #12
- toolbar/actions/menu changes, replaced fab
- Refactor layout & menu files, dialogs
- Lots of refactoring; Reworked Splash,PodSelectionActivity; Switch Pod; Clear settings;
@@ -25,7 +25,7 @@
# v0.1.1
- Sharing updated (by @scoute-dich)
- Screenshotting updated
-- Gitter integration (by @sangre)
+- Gitter integration (by @gsantner)
- Code refactoring
- Start working on #6
- Waffle.io integration
@@ -37,7 +37,7 @@ First version of the organization *Diaspora for Android*
Consists mostly of code from:
- Diaspora-Native-Webapp (by @martinchodev )
- scoutedich additions (by @scoute-dich)
-- sangre additions (by @sangre)
+- sangre additions (by @gsantner)
### v1.3 (scoutedich)
*big thanks to sangre*
@@ -45,7 +45,7 @@ Consists mostly of code from:
- Link to profile
- Move menu actions
- Refactoring part1
-- bump libs
+- bump libs
### v1.2 (scoutedich)
- using strings in podactivity
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5fa1f509..7c1f44fb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,3 @@
-We are always open for any kind of contribution. (PR's, bug reports, feature requests, ..)
-If you got any questions feel free to ask at Gitter.
-Note that the main project members are mostly busy with their job/university/school and may not react or start coding immediately.
\ No newline at end of file
+We are always open for any kind of contribution. (PR's, bug reports, feature requests, translations, ..)
+If you got any questions feel free to join our XMPP/Jabber conference at [diaspora-android@conference.jabberhead.tk](xmpp:diaspora-android@conference.jabberhead.tk) or [Gitter](https://gitter.im/Diaspora-for-Android/diaspora-android).
+Note that the main project members are mostly busy with their job/university/school and may not react or start coding immediately.
diff --git a/README.md b/README.md
index 5bbe7d09..5a06cf79 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
[![Build Status](https://travis-ci.org/Diaspora-for-Android/diaspora-android.svg?branch=master)](https://travis-ci.org/Diaspora-for-Android/diaspora-android)
[![Join the chat at https://gitter.im/Diaspora-for-Android/diaspora-android](https://badges.gitter.im/Diaspora-for-Android/diaspora-android.svg)](https://gitter.im/Diaspora-for-Android/diaspora-android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Stories in Start](https://badge.waffle.io/Diaspora-for-Android/diaspora-android.svg?label=help%20wanted&title=waffle.io)](http://waffle.io/Diaspora-for-Android/diaspora-android)
+[![Join the chat (XMPP) at diaspora-android@conference.jabberhead.tk](https://img.shields.io/badge/xmpp-join-blue.svg)](xmpp:diaspora-android@conference.jabberhead.tk)
# Diaspora for Android
@@ -15,27 +15,26 @@ This is an unofficial webview based client for the community-run, distributed so
- See [Screenshots](https://github.com/Diaspora-for-Android/diaspora-android/blob/master/SCREENSHOTS.md)
## Contributions
-We are always open for any kind of contribution. (PR's, bug reports, feature requests, ..)
-If you got any questions feel free to ask at [Gitter](https://gitter.im/Diaspora-for-Android/diaspora-android) or join our XMPP/Jabber conference at diaspora-android@conference.jabberhead.tk.
+We are always open for any kind of contribution. (PR's, bug reports, feature requests, translations, ..)
+If you got any questions feel free to join our XMPP/Jabber conference at diaspora-android@conference.jabberhead.tk or [Gitter](https://gitter.im/Diaspora-for-Android/diaspora-android).
Note that the main project members are mostly busy with their job/university/school and may not react or start coding immediately.
### License
It's released under GNU GENERAL PUBLIC LICENSE (see [LICENCE](https://github.com/Diaspora-for-Android/diaspora-android/blob/master/LICENSE.md)).
-### Native
-It's "native" because it's developed in Java + the Android SDK (Android Studio). Other Diaspora clients are developed using frameworks like AppCelerator Titanium. A native app will always be more efficient and almost certainly be faster and make better use of the resources of the device.
+### WebApp
+The app is developed as an WebApp because currently Diaspora doesn't have an API that can be used to create a native interface to retrieve the user's data, publications, direct messages and so on, that's why there are only WebApps for Diaspora out there.
+API is discussed frequently on Diaspora, but the main developers seem to not give the API and mobile view the attention it needs. [Stay tuned on Diaspora* Issues](https://github.com/diaspora/diaspora/labels/api).
-### "WebApp"
-It's a WebApp because at this moment Diaspora doesn't have an API that can be used to create a native interface to retrieve the user's data, publications, direct messages and so on, that's why there are only WebApps for Diaspora out there.
-Why a WebApp is better than using the mobile site on a browser? Basically it provides better integration with the system (events coming into and going out of the app), notifications, customized interface and functions and a nice little icon that takes you directly to your favorite social network :)
+Why a WebApp is better than using the mobile site on a browser?
+Basically it provides better integration with the system (events coming into and going out of the app), notifications, customized interface and functions and a nice little icon that takes you directly to your favorite social network :)
### Device Requirements
-The minimum version supported is Ice Cream Sandwitch, Android version 4.0.3 (or API 15)
+The minimum version supported is Ice Cream Sandwich, Android v4.0.3 / API 15
### App Permissions
It requires access to the Internet and to external storage to be able to upload photos when creating a new post and for taking screenshots.
## Maintainers
-
-- sangre ()
+- sangre (@gsantner) ()
- vanitasvitae ()
diff --git a/app/build.gradle b/app/build.gradle
index ac73d8d0..5768da63 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,6 +19,10 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+
+ lintOptions {
+ disable 'MissingTranslation'
+ }
}
dependencies {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 520bf20a..bfe27275 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -158,5 +158,7 @@ along with this program. If not, see http://www.gnu.org/licenses.<br> <br
Mobil-/Desktopansicht umschalten
Alle Tags
+ WebView Cache leeren
+ Cache leeren