vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-12-23 11:28:00 +01:00
Code Issues Releases Wiki Activity
533 commits 1 branch 40 tags 14 MiB
Commit graph

403 commits

Author SHA1 Message Date
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
vanitasvitae
14b9b6a8f0
Fixed Settings layout issue 2016-10-13 18:18:47 +02:00
vanitasvitae
26751ff931
Merged proper-themes 2016-10-13 17:51:35 +02:00
vanitasvitae
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
vanitasvitae
f49877b792
Fixed applying proxy settings 2016-10-10 17:47:04 +02:00
vanitasvitae
c09618f191
Merged master 2016-10-10 15:07:30 +02:00
vanitasvitae
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
vanitasvitae
7391431501
Added note about customtabs and proxys. Fixes #77 2016-10-06 21:44:13 +02:00
vanitasvitae
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
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
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
Gregor Santner
ac19efd847 Accent color orange; Notification/Message count badge; Reworked progressbar #40 2016-09-11 17:15:26 +02:00
vanitasvitae
1261d93a17 Moved TitleUpdateReceiver in own class and added some debug logs 2016-09-11 15:22:16 +02:00
vanitasvitae
dc8349a4e8 Moved BroadcastReceiver for CustomTabs in own class 2016-09-11 14:51:23 +02:00
vanitasvitae
916ee58690 setupUI before applying proxy settings to mitigate nullpointer on WebView 2016-09-11 13:06:13 +02:00
vanitasvitae
40592ffae8 set Animations to CustomTabs 2016-09-11 13:05:26 +02:00
vanitasvitae
ae2cefd6a5 Use customTabs to open external links. This is a very basic implementation 2016-09-11 12:35:16 +02:00
vanitasvitae
b8ba6bb443 Added a lot of debug logs to MainActivity 2016-09-10 16:54:48 +02:00
vanitasvitae
f58fbd8364 Fixed crash when opening search dialog 2016-09-10 10:47:29 +02:00
Gregor Santner
1dcd05af10 Update design #40, fixes #65 2016-09-09 20:56:43 +02:00
vanitasvitae
1b06e20c84 Added long click action to Debug Log. User can copy log to clipboard using long click 2016-09-09 19:50:11 +02:00
vanitasvitae
02f56f25fb Cleaned code, added debug log to DebugFragment of AboutActivity 2016-09-09 19:27:07 +02:00
vanitasvitae
2a4706654f Translated about text to german 2016-09-08 14:28:09 +02:00
vanitasvitae
9e0a364bc8 Merge branch 'keepWebView' 2016-09-08 10:19:15 +02:00
vanitasvitae
e6446217a8 Fixed image upload on 4.2 devices 2016-09-07 23:55:25 +02:00
vanitasvitae
7dbfb10229 Added permission check to FileChooser and added missing file choosing method for Android 4.2 WIP WARNING 2016-09-07 23:12:17 +02:00
vanitasvitae
305a40c8c5 Added some experimental changes to keep the webview on orientation changes 2016-09-05 20:42:57 +02:00
Gregor Santner
87363d204a TR update 2016-09-05 20:07:46 +02:00
vanitasvitae
e7f74eb08d Added information about android version and device to AboutActivity 2016-09-05 18:45:22 +02:00
vanitasvitae
823ab7b8d8 AboutActivity respects intellihide settings, all coordinatorlayouts do now snap, added back button to AboutActivity and SettingsActivity 2016-09-05 18:15:29 +02:00
vanitasvitae
315361e2b2 Fixed crowdin issues 2016-09-05 14:23:03 +02:00
Gregor Santner
4ad9828f2c Update CONTRIBUTORS.txt, LICENSE.md, Translations 2016-09-01 19:18:22 +02:00
Gregor Santner
78b96d9ade Improve navigation drawer, default visibilities 2016-08-28 17:54:35 +02:00
Gregor Santner
40a9823b19 Update Translations 2016-08-27 16:59:28 +02:00
Gregor Santner
c93e28cdc7 Load license, contributors, maintainers and 3party libs from ressources 2016-08-27 16:40:16 +02:00
vanitasvitae
8ae74d97d4 Reworked search dialog to use layout resource and some code cleanup 2016-08-27 12:34:08 +02:00
vanitasvitae
18eeb76079 Forgot to add HashtagProvider 2016-08-27 09:24:14 +02:00
vanitasvitae
5a6910b447 Added license headers and some documentation to AboutActivity, HtmlTextView, HashtagProvider 2016-08-27 09:23:58 +02:00
vanitasvitae
48f0997864 Merge branch 'master' of github.com:Diaspora-for-Android/diaspora-android 2016-08-27 00:46:54 +02:00
vanitasvitae
240551f34c Made hashtags in textviews clickable. Hashtags open post editor with hashtag inserted. Also cleaned up text sharing in general 2016-08-27 00:04:07 +02:00
Gregor Santner
e3a777a800 Fix new TR errors 2016-08-26 19:35:02 +02:00
vanitasvitae
f26f1539ec Added some more features and information to the AboutActivity 2016-08-26 17:08:57 +02:00
vanitasvitae
c62f38e693 Added lorem ipsum and some more visual tweaks to AboutActivity 2016-08-25 00:23:20 +02:00
vanitasvitae
50f5a79c30 Added changes to Manifest 2016-08-24 22:07:15 +02:00
vanitasvitae
0b8dbcc35d Added first design of an AboutActivity 2016-08-24 22:05:35 +02:00
Gregor Santner
12d12cdd39 TR update 2016-08-23 22:20:06 +02:00
vanitasvitae
f8d8126c0e Removed unused classes and cleaned code up 2016-08-23 21:23:36 +02:00
vanitasvitae
7091b1ba31 Updated NetCipher from 1.2.1 to 2.0.0-alpha1. This fixes #58 2016-08-23 14:36:03 +02:00
vanitasvitae
7c1510a272 Added first design of StatisticsFetchTask (currently not working/needed) 2016-08-23 14:28:34 +02:00
Gregor Santner
75106e2c12 Update strings.xml 2016-08-22 10:00:58 +02:00
vanitasvitae
5bcc99dfba Display app launcher icon instead of nothing when no avatar image set. Fix #55 2016-08-21 17:04:51 +02:00
Gregor Santner
024bba8260 TR update 2016-08-19 19:33:23 +02:00
vanitasvitae
417a695a6b Made description of navigation drawer settings more precise 2016-08-19 14:07:37 +02:00
vanitasvitae
c3006f9fb2 Fix #54 2016-08-19 13:54:03 +02:00
Gregor Santner
38ae98478c update TR 2016-08-16 21:05:36 +02:00
vanitasvitae
08b39b16c9 Fixed #51 2016-08-14 18:23:23 +02:00
Gregor Santner
352d644bc3 Release v0.1.5 2016-08-14 11:34:36 +02:00
vanitasvitae
99349fc13a Migrated SettingsActivity to using PreferenceFragment 2016-08-13 19:54:16 +02:00
vanitasvitae
48a7680930 Fixed Navslider option changes not causing activity restart 2016-08-13 16:36:11 +02:00
Gregor Santner
8854ba35b2 Update strings 2016-08-13 15:54:18 +02:00
Gregor Santner
4f148191f7 Aspect name as title (fixes#44 , fixes #47) 2016-08-13 15:37:08 +02:00
Gregor Santner
4f8215beee Allow most navigation items to hide as pref 2016-08-13 14:13:14 +02:00
Gregor Santner
a4864714bf japan translation 2016-08-13 13:22:05 +02:00
vanitasvitae
9c572fff6a Merge pull request #50 from Diaspora-for-Android/disable_backup 
Disabled Backup
 2016-08-13 00:56:16 +02:00
vanitasvitae
d53e955985 Disable Webview FileAccess 2016-08-13 00:42:13 +02:00
vanitasvitae
44bec084e2 Disabled Backup 2016-08-13 00:21:43 +02:00
vanitasvitae
79e8ead9bc Some cleaning up 2016-08-10 23:43:00 +02:00
vanitasvitae
be54e65abe Commented DiasporaUrlHelper and added license 2016-08-10 23:21:34 +02:00
Gregor Santner
c2e5dab920 Added Kannada language (thanks yogi) 2016-08-10 22:53:16 +02:00
vanitasvitae
7e352c1aeb Readded profile item to navdrawer 2016-08-10 17:47:21 +02:00
vanitasvitae
16e1a4ea0c Made navdrawer header section with profile image and name clickable as replacement for removed profile navdrawer item 2016-08-10 17:28:54 +02:00
vanitasvitae
4cb91d430a Capsulated diaspora urls into util.DiasporaUrlHelper 2016-08-10 17:14:05 +02:00
Gregor Santner
237a2f21e4 Update localization 2016-08-08 20:41:26 +02:00
Gregor Santner
ebb6d36b7d Improve sharing to activity (Kepp one webview) #32 2016-08-08 08:24:58 +02:00
Gregor Santner
d64a79dcf8 . 2016-08-08 07:41:36 +02:00
Gregor Santner
2507dbd015 Use Vector Drawables instead of pngs 2016-08-07 23:51:31 +02:00
Gregor Santner
ac81091cce Remove markdown from translateable list 2016-08-07 23:37:02 +02:00
vanitasvitae
c6e3a60411 Merge 2016-08-07 23:14:07 +02:00
vanitasvitae
9ecf55ca82 Removed buggy swipe refresh layout and added reload button to top toolbar 2016-08-07 23:11:47 +02:00
Gregor Santner
e5219c4f78 Update Translations - Brazilian 2016-08-07 22:52:00 +02:00
Gregor Santner
a494bffcbe Translation tool; Update new languages 2016-08-07 22:08:05 +02:00
Gregor Santner
fb4baa6481 Update sharing functionality 2016-08-07 14:29:52 +02:00
Gregor Santner
8f2a01ca73 Load from/save counts from prefs 2016-08-07 11:41:26 +02:00
Gregor Santner
a5d9f05700 Update notification&message icon to visualize current state 2016-08-07 03:42:20 +02:00
Gregor Santner
4b9bbdb5d7 Update icons #40 2016-08-07 03:30:44 +02:00
Gregor Santner
78f6c7e6e2 Optionally allow exit button in nav drawer 2016-08-07 02:28:37 +02:00
vanitasvitae
e1b02c42d2 Removed unnecessary and buggy collapsableToolbarLayout 2016-08-07 01:51:07 +02:00
vanitasvitae
6534a89721 Merge branch 'master' of github.com:Diaspora-for-Android/diaspora-android 2016-08-07 01:09:26 +02:00
vanitasvitae
ec3de5c320 Updated BottomBarBehavior 2016-08-07 01:09:19 +02:00
Gregor Santner
fa1222ffbb Remove unused translations 2016-08-07 00:51:39 +02:00
Gregor Santner
21006f60e1 Merge branch 'master' of github.com:diaspora-for-android/diaspora-android 2016-08-07 00:32:40 +02:00
Gregor Santner
770e744c18 Update podlist; TR refs 2016-08-07 00:32:30 +02:00
vanitasvitae
d6b1641854 Increase min-api to 17 2016-08-06 22:53:20 +02:00
Gregor Santner
7e98069ae2 New translations 2016-08-06 01:45:31 +02:00
Gregor Santner
3a593b0618 Update Crowdin configuration file ; Update and refactor translations 2016-08-06 01:35:52 +02:00
vanitasvitae
e13f10a688 Removed setNestedScrollEnabled 2016-08-03 00:15:25 +02:00
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
vanitasvitae
1a0e295aeb Disabled nested scrolling in webview. Fixes #28 2016-08-02 22:02:15 +02:00
vanitasvitae
49ba5ca2da Merge branch 'master' of github.com:Diaspora-for-Android/diaspora-android 2016-08-02 21:43:44 +02:00
Gregor Santner
72e15c1611 colour changes #40 2016-08-02 21:39:47 +02:00
vanitasvitae
f2fd4e4c4d Merge branch 'master' of github.com:Diaspora-for-Android/diaspora-android 2016-08-02 21:35:58 +02:00
vanitasvitae
b3498a6c2e Small changes, wanna pull 2016-08-02 21:35:51 +02:00
Gregor Santner
ad2cb4c615 Merge preferences from AppSettings and SettingsActivy/preferences.xml 2016-08-02 21:33:13 +02:00
vanitasvitae
3c6558df9c Forgot to change title when openend some post, #41 2016-08-01 01:21:35 +02:00
vanitasvitae
efba350907 Fix #41: Update activity title from webview's loadUrl. 2016-08-01 01:14:44 +02:00
Gregor Santner
a15e060e25 Allow turning off toolbar intellihide 2016-07-31 15:16:22 +02:00
Gregor Santner
05aa6231c7 Handle links from browseable intent filter #38 2016-07-30 16:48:43 +02:00
Gregor Santner
389bb1b4e5 Intent filter for pods #38 2016-07-30 16:15:33 +02:00
Gregor Santner
08d634c7f1 Update license infos of source files 2016-07-29 14:00:28 +02:00
Gregor Santner
61bdbaaea9 Localization lint; Translation; Readme 2016-07-27 21:54:54 +02:00
Dmitriy Bogdanov
1fead42868
Add an option to clear WebView cache 2016-07-27 00:52:26 +04:00
Dmitriy Bogdanov
dd98ce4389
Don't use startActivityForResult on SettingsActivity 2016-07-27 00:47:11 +04:00
Gregor Santner
50b11a2747 Disable swipe refresh in tags&aspect list 2016-07-18 15:47:53 +02:00
Dmitriy Bogdanov
7e4bd4afce
Fix WebView not being refreshed on local content loading 2016-07-18 16:04:31 +04:00
Dmitriy Bogdanov
147eff61cf
Add "All tags" link 2016-07-18 16:03:53 +04:00
Dmitriy Bogdanov
568d542df5
Add try-catch to followed tags obtaining 
Just in case.
 2016-07-18 16:02:59 +04:00
Dmitriy Bogdanov
0072f22845
Add "Followed tags" listing 2016-07-18 16:02:18 +04:00
Gregor Santner
6003cdfb7e Share screenshot fix; Minor Aspects rework 2016-07-18 13:25:10 +02:00
Gregor Santner
a1962a723d Fix Travis CI -> SDK 24 2016-07-18 11:59:10 +02:00
vanitasvitae
bb0ef44719 Removed redundant changelog 2016-07-04 16:04:38 +02:00
vanitasvitae
2024f5d8fa Cleanup and release v0.1.3 2016-07-04 11:19:09 +02:00
vanitasvitae
91ac7aa33b Prevent showing 'new message snackbar' in notification center 2016-06-24 13:39:52 +02:00
vanitasvitae
ab4ffebb49 Capsuled all reused snackbars 2016-06-24 13:31:01 +02:00
vanitasvitae
d2cf0d8a4c Merged and moved french translation. Removed unused strings 2016-06-24 13:06:18 +02:00
vanitasvitae
becef9ca71 Merge remote-tracking branch 'origin/master' into rework_settings 2016-06-24 12:40:56 +02:00
vanitasvitae
971bebde6d Merge branch 'master' of github.com:Diaspora-for-Android/diaspora-android 2016-06-22 21:43:22 +02:00
vanitasvitae
868e269a5c Removed swipe-to-refresh functionality in new status messages and existing conversations to approach #33 2016-06-22 21:43:00 +02:00
vanitasvitae
fcb4cf2829 Merge pull request #29 from Diaspora-for-Android/hide_bottom_bar 
Hide bottom bar #22
 2016-06-22 21:08:15 +02:00
SansPseudoFix
8321f1546a Comments formatting 
French translation

App name error
 2016-06-21 19:32:04 +02:00
vanitasvitae
9e5b2b1235 Blend out bottom bar 2016-06-21 16:18:19 +02:00
vanitasvitae
f7f72a404b Added animations 2016-06-21 12:05:59 +02:00
vanitasvitae
f5e2aef90f Added some more preference summaries 2016-06-20 10:51:20 +02:00
vanitasvitae
28bc94da44 Added change-pod-option to SettingsActivity 2016-06-18 21:45:23 +02:00
vanitasvitae
dbfa8692e8 Moved pod settings to SettingsActivity 2016-06-18 15:53:49 +02:00
vanitasvitae
b8cb2d1b84 Reorganized german strings and removed some unused ones 2016-06-17 19:52:23 +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
85e54f03e9 Removed old font size configuration dialog layout 2016-06-17 19:09:59 +02:00
vanitasvitae
e904b24aeb Removed old proxy configuration dialog layout 2016-06-17 19:09:19 +02:00
vanitasvitae
e532cbc215 Connected proxy settings to SettingsActivity. 2016-06-16 23:36:52 +02:00
vanitasvitae
414b314649 Merged master's changes 2016-06-16 23:01:23 +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
8466c279bb Add isLoadDesktopPage to Preferences, make SettingsActivity list changed settings in Intent 2016-06-16 21:18:42 +02:00
vanitasvitae
e48edbf652 Merge pull request #26 from vanitasvitae/feature_proxy 
Feature: Allow configuring proxy server
 2016-06-16 21:10:13 +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
vanitasvitae
b01a40bc07 Added german strings 2016-06-09 01:57:50 +02:00
vanitasvitae
af0070df66 Let elements other than the webView use the proxy (HttpsUrlConnections) 2016-06-09 01:53:47 +02:00
vanitasvitae
61c92349aa Added option to set manual proxy 2016-06-09 01:03:50 +02:00
vanitasvitae
ef8efb4e06 Added option to share image from WebView to external app 2016-06-07 23:44:39 +02:00