287 commits

Author	SHA1	Message	Date
Gregor Santner	5f815dae70	Proxy http update	2016-10-22 19:54:10 +02:00
vanitasvitae	ca29333806	Merge master	2016-10-22 16:06:25 +02:00
Gregor Santner	2f5aa1e0e7	backward compatibility - proxy	2016-10-22 16:01:45 +02:00
vanitasvitae	8d8bbf4b50	Cleaned up and removed unused methods	2016-10-21 21:21:51 +02:00
vanitasvitae	3e7c843d7b	Update gradle and fix proxy port bug	2016-10-18 21:15:54 +02:00
vanitasvitae	f1bab5d2c1	Fixed bug where appSettings.getProxyHttpPort() always returned 0	2016-10-18 19:04:04 +02:00
vanitasvitae	722204c6a4	Merge branch 'master' into ThemedSettings	2016-10-16 19:46:58 +02:00
vanitasvitae	6b512ee110	Merge branch 'master' of github.com:Diaspora-for-Android/diaspora-android	2016-10-16 19:46:23 +02:00
vanitasvitae	894d1233d5	Removed SettingsActivity2 from Manifest	2016-10-16 19:43:11 +02:00
vanitasvitae	fc26af5844	Added missing onClick options to NavSlider settings fragment and added missing license headers	2016-10-16 19:16:09 +02:00
vanitasvitae	06c8b06feb	Reimplemented the settings to allow customization with colors	2016-10-16 02:43:38 +02:00
Gregor Santner	a0d1992829	TR update	2016-10-15 12:42:15 +02:00
vanitasvitae	ebc70fdff0	Allow more than one line in the nav_header pod notice	2016-10-15 11:21:51 +02:00
vanitasvitae	f76207e75b	Switched intellihide toolbars on by default	2016-10-14 13:07:07 +02:00
vanitasvitae	8e852d7ff2	Added notifications dropdown menu with settings	2016-10-14 12:57:17 +02:00
vanitasvitae	54ba7b389c	Merge branch 'notification_toolbar_item_rework'	2016-10-14 12:37:38 +02:00
vanitasvitae	6d4bc38ea6	Fixed SettingsActivity crash	2016-10-14 12:33:58 +02:00
vanitasvitae	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
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	5d4106e0b3	Updated support libs and added more precise breakage notice	2016-10-10 18:13:41 +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