Alexandre Alapetite
70c842031f
Merge branch 'FreshRSS/dev' into dev
2016-04-22 14:05:03 +02:00
Alexandre Alapetite
88be296cb2
Merge branch 'mysql_only_full_group_by' into dev
2016-04-22 14:04:59 +02:00
Alexandre Alapetite
4862652585
Merge pull request #1128 from Alkarex/api_fcgi
...
API support for REDIRECT HTTP headers
2016-04-22 13:57:48 +02:00
Alexandre Alapetite
89cc2aa3d0
MySQL compatibility only_full_group_by
...
Fix MySQL error, which appeared in MySQL 5.7:
ERROR 1055 (42000): Expression #1 of SELECT list is not in GROUP BY
clause and contains nonaggregated column 'freshrss.c.id' which is not
functionally dependent on columns in GROUP BY clause; this is
incompatible with sql_mode=only_full_group_by
2016-04-22 13:55:24 +02:00
Alexandre Alapetite
9012994afc
Merge branch 'FreshRSS/dev' into dev
2016-04-22 13:34:08 +02:00
Alexandre Alapetite
06189cb666
API support for REDIRECT HTTP headers
...
https://github.com/FreshRSS/FreshRSS/issues/1127
2016-04-10 11:52:16 +02:00
Alexandre Alapetite
fc4cd60191
Merge pull request #1120 from Alkarex/Csp-Home
...
CSP compatibility for home page
2016-03-31 23:21:36 +02:00
Alexandre Alapetite
a41163ac46
CSP compatibility for home page
...
https://github.com/FreshRSS/FreshRSS/issues/1075
2016-03-17 21:09:34 +01:00
Alexandre Alapetite
a062a3cff7
Merge branch 'FreshRSS/dev' into dev
2016-03-17 20:46:55 +01:00
Marien Fressinaud
2f2a385331
Start 1.3.2-dev version
2016-03-12 12:24:25 +01:00
Alexandre Alapetite
dfb8aafe0d
Merge branch 'FreshRSS/dev' into dev
2016-03-11 23:15:46 +01:00
Alexandre Alapetite
8dcc0fd65a
Merge pull request #1119 from FreshRSS/dev
...
Merge dev in 1.3.1-beta
2016-03-11 22:57:20 +01:00
Alexandre Alapetite
8f4c61a415
Merge remote-tracking branch 'FreshRSS/beta' into FreshRSS/dev
2016-03-11 22:54:39 +01:00
Alexandre Alapetite
c34bdec29b
Merge branch 'FreshRSS/dev' into dev
2016-03-11 22:35:49 +01:00
Alexandre Alapetite
f64d7384a7
Prepare release 1.3.1-beta
...
https://github.com/FreshRSS/FreshRSS/issues/1113
2016-03-11 22:35:21 +01:00
Alexandre Alapetite
683232b743
Merge branch 'FreshRSS/dev' into dev
2016-03-08 19:38:07 +01:00
Alexandre Alapetite
90117b0397
Merge pull request #1118 from Alkarex/API-input-sanitize
...
API limit INPUT to 1MB
2016-03-08 19:36:39 +01:00
Alexandre Alapetite
9f9698898e
Merge branch 'API-input-sanitize' into dev
2016-03-08 19:33:30 +01:00
Alexandre Alapetite
c9ebbe9657
Changelog API
2016-03-08 19:32:58 +01:00
Alexandre Alapetite
7db99b8382
API limit INPUT to 1MB
2016-03-08 19:30:24 +01:00
Alexandre Alapetite
2d9c27549d
Merge pull request #1117 from Alkarex/cookie_secure
...
Secure cookie HTTPS
2016-03-08 19:08:53 +01:00
Alexandre Alapetite
c024cfa25e
Merge branch 'cookie_secure' into dev
2016-03-08 19:02:02 +01:00
Alexandre Alapetite
cd4153912f
Changelog secure cookie HTTPS
2016-03-08 19:01:43 +01:00
Alexandre Alapetite
ba9f4461d8
Secure cookie HTTPS
2016-03-08 19:00:04 +01:00
Alexandre Alapetite
5a7455dc62
Merge branch 'FreshRSS/dev' into dev
2016-03-08 18:41:59 +01:00
Alexandre Alapetite
b60a9896b1
Merge branch 'dev' of https://github.com/FreshRSS/FreshRSS into FreshRSS/dev
2016-03-08 18:41:27 +01:00
Alexandre Alapetite
7f764ca682
Changelog nosniff
2016-03-08 18:41:03 +01:00
Alexandre Alapetite
7244b6d486
Merge pull request #1116 from Alkarex/nosniff
...
X-Content-Type-Options: nosniff
2016-03-08 18:36:30 +01:00
Alexandre Alapetite
6e2cd46cc4
Merge pull request #1115 from Alkarex/CSP-SVG
...
CSP for SVG
2016-03-08 18:36:21 +01:00
Alexandre Alapetite
631e0fcbd0
Merge branch 'nosniff' into dev
2016-03-08 18:28:28 +01:00
Alexandre Alapetite
44be16d4fb
X-Content-Type-Options: nosniff
...
https://github.com/FreshRSS/FreshRSS/issues/1114
2016-03-08 18:28:04 +01:00
Alexandre Alapetite
c25a3b57aa
Merge branch 'CSP-SVG' into dev
2016-03-08 18:20:38 +01:00
Alexandre Alapetite
c4ebc5c4a9
CSP for SVG
...
And moved .htaccess rules in the folder there are used
https://github.com/FreshRSS/FreshRSS/issues/1114
2016-03-08 18:20:14 +01:00
Alexandre Alapetite
5da50a3c8f
Merge branch 'FreshRSS/dev' into dev
2016-03-06 18:08:51 +01:00
Alexandre Alapetite
c424c8acef
Changelog typo
2016-03-06 18:08:32 +01:00
Alexandre Alapetite
5453d943ed
Merge branch 'FreshRSS/dev' into dev
2016-03-06 18:04:53 +01:00
Alexandre Alapetite
1aa6321376
Changelog 1.3.1-beta
...
https://github.com/FreshRSS/FreshRSS/issues/1113
2016-03-06 18:04:28 +01:00
Alexandre Alapetite
f6d781833a
Merge pull request #1111 from Alkarex/UpradeNewArticles
...
SQLite: Articles from old version were marked as unread on upgrade
2016-03-06 17:28:36 +01:00
Alexandre Alapetite
604c104d08
Merge pull request #1112 from Alkarex/OpmlTitle
...
OPML bug import not using title
2016-03-06 17:28:12 +01:00
Alexandre Alapetite
e33b162d9c
Merge branch 'OpmlTitle' into dev
2016-03-06 17:10:02 +01:00
Alexandre Alapetite
9d1f35d4b8
OPML bug import not using title
...
Fix https://github.com/FreshRSS/FreshRSS/issues/1048
2016-03-06 17:04:21 +01:00
Alexandre Alapetite
2fedf488b3
Merge branch 'UpradeNewArticles' into dev
2016-03-06 15:35:56 +01:00
Alexandre Alapetite
7f91dbf16d
SQLite: Articles from old FreshRSS are marked as unread on update
...
Bug fixed https://github.com/FreshRSS/FreshRSS/issues/1049
2016-03-06 15:32:58 +01:00
Alexandre Alapetite
2daf988f08
Merge pull request #1110 from Alkarex/i18n-cz
...
i18n-cz JSON XML
2016-03-06 15:12:27 +01:00
Alexandre Alapetite
e665c819c5
Merge branch 'i18n-cz' into dev
2016-03-06 15:00:31 +01:00
Alexandre Alapetite
bb0319c1c7
i18n-cz JSON XML
...
https://github.com/FreshRSS/FreshRSS/pull/1097#commitcomment-16382595
https://github.com/FreshRSS/FreshRSS/issues/1094
2016-03-06 14:50:43 +01:00
Alexandre Alapetite
c1358acf1d
Merge pull request #1109 from aledeg/fix-redirection-after-deletion
...
Fix redirection while deleting a feed
2016-03-06 14:36:53 +01:00
Alexis Degrugillier
e265c94319
Fix url ending
2016-03-06 14:26:20 +01:00
Alexis Degrugillier
5f04462e55
Fix redirection while deleting a feed
...
Before, when deleting a feed from the statistics idle page, there was an error in the redirection process.
Now, the redirection works properly and redirects to the idle page.
2016-03-06 12:51:39 +01:00
Alexandre Alapetite
59f1637713
Merge branch 'FreshRSS/dev' into dev
2016-03-06 12:38:12 +01:00
