Commit graph

8611 commits

Author SHA1 Message Date
Andrew Dolgov
e7c9bc60ec fix previous wrt if-modified-since being added to context options headers 2018-02-25 14:22:46 +03:00
fox
8f60cb4400 Merge branch 'master' of Metallizzer/tt-rss into master 2018-02-25 11:05:16 +00:00
Metallizzer
dd597297cb Обновить 'include/functions.php'
The "Connection: close" header is added to the context_options
2018-02-25 10:03:09 +00:00
Andrew Dolgov
7e6bb21ff5 auto_assign_labels: pass delimiter to preg_quote() to escape slashes properly 2018-02-23 13:31:08 +03:00
Andrew Dolgov
bcdbfa7c67 Merge branch 'master' of git.tt-rss.org:fox/tt-rss 2018-02-12 09:38:17 +03:00
fox
478e990beb Merge branch 'af_readability-refactor' of JustAMacUser/tt-rss into master 2018-02-12 06:38:11 +00:00
Andrew Dolgov
3d7db21602 Merge branch 'master' of git.fakecake.org:tt-rss 2018-02-12 09:37:31 +03:00
JustAMacUser
e26cb06179 af_readability: Use new global fetch_effective_url for canonical URL. 2018-02-11 21:02:17 +00:00
Andrew Dolgov
8babb8e75a sanitize: disallow width and height attributes for images 2018-02-11 16:47:19 +03:00
fox
1aeb282be1 Merge branch 'save-effective-url' of JustAMacUser/tt-rss into master 2018-02-11 08:57:12 +00:00
JustAMacUser
7ae05ed790 Have fetch_file_contents() save the effective URL. 2018-02-11 07:56:28 +00:00
Andrew Dolgov
2eaf2a1f36 tag_is_valid: simplify code 2018-02-11 10:26:33 +03:00
Andrew Dolgov
5edf4b73a4 add a workaround to support numeric tags 2018-02-11 10:24:24 +03:00
fox
304d898e6b Merge branch 'master' of JustAMacUser/tt-rss into master 2018-02-11 07:10:13 +00:00
JustAMacUser
3f5f5bc73f af_comics: Fix typo -- call to undefined method. 2018-02-11 07:01:29 +00:00
Andrew Dolgov
f63a7c4142 update CSS 2018-02-08 13:54:38 +03:00
Andrew Dolgov
f6269d1bc4 add special class for feeds with disabled updates 2018-02-08 13:54:06 +03:00
Andrew Dolgov
cc16b7ba39 minor updates for utility/zoom CSS 2018-02-08 13:17:04 +03:00
fox
60361f7c7d Merge branch 'fix-gocomics-subscribe' of JustAMacUser/tt-rss into master 2018-02-07 17:18:38 +00:00
Dave Z
d92fcaa9c8 af_comics: Workaround for GoComics' lazy loading images in srcset. 2018-02-07 16:57:32 +00:00
Dave Z
fc756975ab af_comics: Allow subscribing to GoComics URLs via page (only this time, *actually allow* it). 2018-02-07 06:52:36 +00:00
Andrew Dolgov
44eda8521e filter delete action/rule: fix selector syntax 2018-02-04 12:50:21 +03:00
Andrew Dolgov
a340b29ba9 pref-feeds: disable tree autoexpand 2018-02-04 09:36:56 +03:00
Andrew Dolgov
67bf38afda savefeedorder, savefilterorder: do not use clean() on json payload 2018-02-04 09:33:28 +03:00
Andrew Dolgov
2c51facf61 Revert "import_export: do not use DOMDocument->loadXML in static context"
This reverts commit 1ddf3a28e5.
2018-01-30 14:41:27 +03:00
Andrew Dolgov
1ddf3a28e5 import_export: do not use DOMDocument->loadXML in static context 2018-01-30 13:17:05 +03:00
Andrew Dolgov
365f5c8b53 import_export: use legacy true/false values 2018-01-30 11:45:15 +03:00
Andrew Dolgov
7f4a404566 include: convert some spaces to tabs 2018-01-30 10:44:31 +03:00
Andrew Dolgov
2aec1b030c add .editorconfig 2018-01-30 10:36:41 +03:00
Andrew Dolgov
102a01354b strip utf8mb4 characters in enclosures on mysql 2018-01-29 23:24:11 +03:00
Andrew Dolgov
e038374608 gocomics: remove width attribute to fix improper scaling of images 2018-01-27 09:50:49 +03:00
fox
fdde115557 Merge branch 'master' of jsoares/tt-rss into master 2018-01-24 07:03:59 +00:00
jsoares
26ad257de5 Fixed time stamping of new unmarked/unpublished articles 2018-01-22 22:41:24 +00:00
fox
36eed4d737 Merge branch 'master' of binfalse/tt-rss into master 2018-01-18 12:40:24 +00:00
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
fox
a421eb655d Merge branch 'master' of cvidal/tt-rss into master 2018-01-17 17:45:28 +00: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
Colin Vidal
c217de557f rpc: addfeed: gets login and pass only if need_auth is checked.
Because of browser form auto-completion, the hidden field login and
password can be automatically filled when adding a feed. It would
enable feed authentication even if the user doesn't click on need_auth
button.
2018-01-14 20:55:39 +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