martin scharm
32dc9ec854
undocumenting the proxy settings [see #36 ]
...
in response to https://git.tt-rss.org/git/tt-rss/pulls/36#issuecomment-119
2018-01-18 08:48:53 +01:00
martin scharm
213c01d459
some proxies require `request_fulluri` set to true [see #36 ]
...
at least polipo won't work for plain HTTP URLs (HTTPS strangely also works without `request_fulluri`..?)
see https://git.tt-rss.org/git/tt-rss/pulls/36
2018-01-17 12:28:47 +01:00
martin scharm
ea55f2e11c
Add proper support for proxies
...
There are situations where you want tt-rss to use a proxy (e.g.
because of network restrictions, or privacy concerns).
tt-rss already comes with an undocumented `_CURL_HTTP_PROXY`
variable (see eg https://binfalse.de/2015/05/06/ttrss-with-proxy/ ),
however that won't have an effect when, for example, php-curl is
not installed, see
c30f5e1811/include/functions.php (L377)
In this case it would use the `file_get_contents` with a stream
context without a proxy definition:
c30f5e1811/include/functions.php (L487)
Here I propose to properly support proxies, and I introduced a
`PROXY` variable, that is respected in both scenarios, with and
without curl installed.
2018-01-14 00:30:22 +01:00
Andrew Dolgov
c30f5e1811
subscribe_to_feed: force-cast login and password to string
2018-01-05 06:50:37 +03:00
fox
4178dc85ab
Merge branch 'improvement/digest-pdo-params' of immanuelfodor/tt-rss into master
2018-01-02 06:47:55 +00:00
immanuelfodor
09be7cdd73
binding statement named param instead of positional replacement
2018-01-02 06:30:22 +00:00
fox
2395dc3b04
Merge branch 'fix-pdo-mail-plugin' of JustAMacUser/tt-rss into master
2018-01-02 06:23:43 +00:00
Dave Z
12bfce5e66
Fix missing parenthesis.
2018-01-01 18:59:28 -05:00
Dave Z
33c850f5ab
Fix PDO query in mail plugin.
2018-01-01 13:33:58 -05:00
Andrew Dolgov
8dedacf497
remove synchronous feed refreshing on ForceUpdate
2017-12-31 07:37:49 +03:00
Andrew Dolgov
9274109c19
search_to_sql: quote fallback search language
2017-12-30 16:27:05 +03:00
fox
96d8c40188
Merge branch 'func-missing-quotes' of JustAMacUser/tt-rss into master
2017-12-30 06:12:22 +00:00
JustAMacUser
56c2216295
Add missing quotes to array_map.
2017-12-30 01:00:56 -05:00
fox
6062e563ff
Merge branch 'opml-titles' of tianon/tt-rss into master
2017-12-30 05:55:06 +00:00
Tianon Gravi
bbc4d4bf34
treat OPML-imported feeds without a title the same as a batch import
2017-12-29 15:33:01 -08:00
fox
bb0a8e323e
Merge branch 'otp' of fturco/tt-rss into master
2017-12-22 15:00:32 +00:00
Francesco Turco
1a7277570b
fix two-factor authenticaton
2017-12-22 12:29:25 +01:00
Andrew Dolgov
d4c05d0be2
update_rss_feed: don't try to use quoted NOW() in query
2017-12-18 18:27:23 +03:00
Andrew Dolgov
6fb5f17be6
pluginhost: always return an array in get_all()
2017-12-17 19:06:18 +03:00
Andrew Dolgov
bed2d6e054
force-cast some variables used in queries to integer
...
do not display SQL query in headlines debug mode
2017-12-17 16:24:13 +03:00
Andrew Dolgov
d0cce0c7a4
isdefaultpassword: use method_exists() to check for check_password
2017-12-15 12:15:15 +03:00
Andrew Dolgov
0f05147531
properly highlight search keywords containing forward slash
2017-12-15 08:33:59 +03:00
fox
f559d74a4e
Merge branch 'master' of simonpl/tt-rss into master
2017-12-14 18:01:21 +00:00
simonp
5f19596651
Fix typo from previous pull request
2017-12-14 18:43:42 +01:00
fox
fde50b4e63
Merge branch 'master' of bcollet/tt-rss-fix-auth into master
2017-12-14 17:09:32 +00:00
Benjamin Collet
44c6a04b61
Check if the auth module supports check_password() method before using it
2017-12-14 18:02:37 +01:00
Andrew Dolgov
9390ddeae2
fix single user mode login failing because of isdefaultpassword()
2017-12-14 19:27:55 +03:00
Andrew Dolgov
072a348f93
minor css updates
2017-12-13 20:17:19 +03:00
Andrew Dolgov
7651b6e2cd
sanitize: disable referrer via referrerpolicy for img elements
2017-12-13 20:07:10 +03:00
Andrew Dolgov
6184f5264e
style updates for combined expandable mode, etc
2017-12-13 19:18:53 +03:00
Andrew Dolgov
2b724177ae
style updates for 3 panel mode
2017-12-13 19:09:14 +03:00
Andrew Dolgov
bf6ea2ee86
hl selection: use accent color
2017-12-13 18:53:31 +03:00
Andrew Dolgov
3fd7e4e85a
add ::selection
2017-12-13 15:54:08 +03:00
Andrew Dolgov
f830f853a9
Merge branch 'master' of git.tt-rss.org:git/tt-rss into pdo-experimental
2017-12-13 08:21:50 +03:00
fox
d23e4b43b0
Merge branch 'readability-urls' of JustAMacUser/tt-rss into master
2017-12-13 05:21:10 +00:00
JustAMacUser
3ee48ac830
Make af_readability use resolved URL when rewriting relative URLs in the article.
2017-12-13 00:17:43 -05:00
Andrew Dolgov
e2cb5e6cb9
rebase translations
2017-12-11 19:06:22 +03:00
Andrew Dolgov
31f7966567
use button-style links for bookmarklets
2017-12-11 19:04:06 +03:00
Andrew Dolgov
1bf468ba1a
pref-prefs: set button classes
2017-12-11 18:50:00 +03:00
Andrew Dolgov
121ac0481f
filter rule/action dialogs: set default action
2017-12-11 18:46:27 +03:00
Andrew Dolgov
ef1feb3610
subscribe dialog: add primary action
2017-12-11 18:43:53 +03:00
Andrew Dolgov
05e81655c3
user editor: add primary action
2017-12-11 18:41:32 +03:00
Andrew Dolgov
6fb5ce5e35
add some primary dialog actions; update css
2017-12-11 18:36:36 +03:00
Andrew Dolgov
5f7be9957f
filter,label dlg: use default action
2017-12-11 18:23:30 +03:00
Andrew Dolgov
320a3ba529
search form: set default action
2017-12-11 18:14:45 +03:00
Andrew Dolgov
f70d456a5b
Merge branch 'master' of git.tt-rss.org:git/tt-rss into pdo-experimental
2017-12-11 12:54:30 +03:00
fox
c463a95dca
Merge branch 'master' of dim0x69/tt-rss into master
2017-12-11 09:47:04 +00:00
dim0x69
e58a14de72
Check return value from Plugins
2017-12-11 09:41:45 +00:00
fox
9306918767
Merge branch 'pda-rss-now' of richm/tt-rss into pdo-experimental
2017-12-11 04:01:28 +00:00
Richard Mortimer
aa16334f1f
Include NOW() in prepared SQL for rssutils.php
2017-12-10 23:05:52 +00:00