12 commits

Author	SHA1	Message	Date
vanitasvitae	a1a2750da8	Merge branch 'master' of github.com:Diaspora-for-Android/diaspora-android	2016-08-02 23:58:51 +02:00
vanitasvitae	08e2849a36	removed ShareActivity, moved sharing code to MainActivity, made adding shared-by-notice toggleable	2016-08-02 23:58:36 +02:00
Gregor Santner	b4c0797155	tr fix	2016-08-02 23:06:10 +02:00
Gregor Santner	ad2cb4c615	Merge preferences from AppSettings and SettingsActivy/preferences.xml	2016-08-02 21:33:13 +02:00
Dmitriy Bogdanov	1fead42868	Add an option to clear WebView cache	2016-07-27 00:52:26 +04:00
vanitasvitae	d2cf0d8a4c	Merged and moved french translation. Removed unused strings	2016-06-24 13:06:18 +02:00
vanitasvitae	f5e2aef90f	Added some more preference summaries	2016-06-20 10:51:20 +02:00
vanitasvitae	dbfa8692e8	Moved pod settings to SettingsActivity	2016-06-18 15:53:49 +02:00
vanitasvitae	b807939652	Moved desktop/mobile toggle from settingsactivity to bottom bar, updated german translations, removed unused settings methods	2016-06-17 19:43:28 +02:00
vanitasvitae	766a854a92	Made SettingsActivity use correct sharedPrefs, made FontSize and loadImages preferences work, removed unused code, moved webview initialization code in own method	2016-06-16 22:55:06 +02:00
vanitasvitae	8996d4a73a	Added some strings and started to integrate settingsActivity into the app	2016-06-11 00:28:26 +02:00
vanitasvitae	ec922f139f	Added first design of a SettingsActivity	2016-06-09 22:21:49 +02:00