Commit Graph

  • b1d8f03acb Merge pull request #1085 from ASMfreaK/1029-Translation-to-russian Alexandre Alapetite 2016-06-12 11:49:13 +02:00
  • 0cd237bc49 Merge pull request #1159 from DFabric/dev Alexis Degrugillier 2016-05-22 08:35:44 +02:00
  • 4843dc5a1d Update DPlatform to the new URL JulR 2016-05-22 02:25:39 +01:00
  • 1354610a70 Merge pull request #1155 from hckweb/dev Alexandre Alapetite 2016-05-12 12:15:47 +02:00
  • 6fe1422854 Update install.php hckweb 2016-05-12 10:57:24 +03:00
  • ff436b6d52 Merge pull request #1151 from j8r/dev Alexandre Alapetite 2016-05-03 20:53:05 +02:00
  • fe2a61fb15 Add DPlatform as an installation way j8r 2016-05-03 19:39:46 +02:00
  • a81aa47f36 Merge pull request #1150 from AmauryCarrade/feature-update-wallabagv2-share Alexandre Alapetite 2016-05-03 15:05:13 +02:00
  • 138bbedac6 Added a share for Wallabag v2 Amaury Carrade 2016-05-03 14:42:16 +02:00
  • 94348e5f4f Merge branch 'dev' of https://github.com/Alkarex/FreshRSS; branch 'beta' of https://github.com/FreshRSS/FreshRSS into FreshRSS/dev Alexandre Alapetite 2016-05-01 23:46:05 +02:00
  • 3361bec769 Merge pull request #1147 from Frenzie/beta Alexandre Alapetite 2016-05-01 20:12:29 +02:00
  • c552422445 Fix validator link Frans de Jonge 2016-05-01 13:19:54 +02:00
  • 5592f1873f Merge branch 'FeedTimeout' into dev Alexandre Alapetite 2016-05-01 10:20:10 +02:00
  • ef70782b38 Change default feed timeout Alexandre Alapetite 2016-05-01 10:18:55 +02:00
  • 0d937741f9 Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2016-05-01 00:08:02 +02:00
  • cfb78c6f25 Merge pull request #1143 from Alkarex/SimplePie_Trim Alexandre Alapetite 2016-05-01 00:01:04 +02:00
  • 8ae96d000a SimplePie trim Alexandre Alapetite 2016-04-30 23:53:23 +02:00
  • cd04eb1079 Merge branch 'http2_headers' into dev Alexandre Alapetite 2016-04-29 18:25:04 +02:00
  • 6466fc87ec Load styles for two JSON cases Alexandre Alapetite 2016-04-29 18:24:46 +02:00
  • d2ee43905f Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2016-04-24 15:08:57 +02:00
  • f54876ac2d Merge pull request #1132 from Alkarex/mysql_only_full_group_by Alexandre Alapetite 2016-04-24 14:53:19 +02:00
  • 152b8171b5 Merge pull request #1135 from Alkarex/favicon_bug Alexandre Alapetite 2016-04-24 14:52:08 +02:00
  • f08d991d1a Merge pull request #1136 from Alkarex/entry_post Alexandre Alapetite 2016-04-24 14:51:35 +02:00
  • 5bb45c2e2c Merge pull request #1137 from Alkarex/feed_password Alexandre Alapetite 2016-04-24 14:51:20 +02:00
  • 91593cecd2 But when adding feeds with passwords Alexandre Alapetite 2016-04-24 14:50:31 +02:00
  • 60b1e032bc Merge branch 'http2_headers' into dev Alexandre Alapetite 2016-04-23 23:12:26 +02:00
  • 805ec6392c Revert; Notifications needed also for non-layout requests Alexandre Alapetite 2016-04-23 23:12:08 +02:00
  • 7fb9773c28 Merge branch 'entry_post' into dev Alexandre Alapetite 2016-04-23 23:09:49 +02:00
  • 6b787c7408 Error message when accessing entry by GET Alexandre Alapetite 2016-04-23 23:07:12 +02:00
  • ae6ade25d5 Merge branch 'http2_headers' into dev Alexandre Alapetite 2016-04-23 22:03:07 +02:00
  • be4f588911 Merge branch 'favicon_bug' into dev Alexandre Alapetite 2016-04-23 22:03:03 +02:00
  • 6248246735 Adjust caching for favicon with errors Alexandre Alapetite 2016-04-23 21:48:37 +02:00
  • f3696784ea Favicon array bug Alexandre Alapetite 2016-04-23 21:35:09 +02:00
  • b042d3a772 HTTP2 optimization Alexandre Alapetite 2016-04-23 19:10:32 +02:00
  • 70c842031f Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2016-04-22 14:05:03 +02:00
  • 88be296cb2 Merge branch 'mysql_only_full_group_by' into dev Alexandre Alapetite 2016-04-22 14:04:59 +02:00
  • 4862652585 Merge pull request #1128 from Alkarex/api_fcgi Alexandre Alapetite 2016-04-22 13:57:48 +02:00
  • 89cc2aa3d0 MySQL compatibility only_full_group_by Alexandre Alapetite 2016-04-22 13:55:24 +02:00
  • 9012994afc Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2016-04-22 13:34:08 +02:00
  • 06189cb666 API support for REDIRECT HTTP headers Alexandre Alapetite 2016-04-10 11:52:16 +02:00
  • fc4cd60191 Merge pull request #1120 from Alkarex/Csp-Home Alexandre Alapetite 2016-03-31 23:21:36 +02:00
  • a41163ac46 CSP compatibility for home page Alexandre Alapetite 2016-03-17 21:09:34 +01:00
  • a062a3cff7 Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2016-03-17 20:46:55 +01:00
  • 2f2a385331 Start 1.3.2-dev version Marien Fressinaud 2016-03-12 12:23:04 +01:00
  • dfb8aafe0d Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2016-03-11 23:15:46 +01:00
  • 8dcc0fd65a Merge pull request #1119 from FreshRSS/dev 1.3.1-beta Alexandre Alapetite 2016-03-11 22:57:20 +01:00
  • 8f4c61a415 Merge remote-tracking branch 'FreshRSS/beta' into FreshRSS/dev Alexandre Alapetite 2016-03-11 22:54:39 +01:00
  • c34bdec29b Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2016-03-11 22:35:49 +01:00
  • f64d7384a7 Prepare release 1.3.1-beta Alexandre Alapetite 2016-03-11 22:35:21 +01:00
  • 683232b743 Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2016-03-08 19:38:07 +01:00
  • 90117b0397 Merge pull request #1118 from Alkarex/API-input-sanitize Alexandre Alapetite 2016-03-08 19:36:39 +01:00
  • 9f9698898e Merge branch 'API-input-sanitize' into dev Alexandre Alapetite 2016-03-08 19:33:30 +01:00
  • c9ebbe9657 Changelog API Alexandre Alapetite 2016-03-08 19:32:58 +01:00
  • 7db99b8382 API limit INPUT to 1MB Alexandre Alapetite 2016-03-08 19:30:24 +01:00
  • 2d9c27549d Merge pull request #1117 from Alkarex/cookie_secure Alexandre Alapetite 2016-03-08 19:08:53 +01:00
  • c024cfa25e Merge branch 'cookie_secure' into dev Alexandre Alapetite 2016-03-08 19:02:02 +01:00
  • cd4153912f Changelog secure cookie HTTPS Alexandre Alapetite 2016-03-08 19:01:43 +01:00
  • ba9f4461d8 Secure cookie HTTPS Alexandre Alapetite 2016-03-08 19:00:04 +01:00
  • 5a7455dc62 Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2016-03-08 18:41:59 +01:00
  • b60a9896b1 Merge branch 'dev' of https://github.com/FreshRSS/FreshRSS into FreshRSS/dev Alexandre Alapetite 2016-03-08 18:41:27 +01:00
  • 7f764ca682 Changelog nosniff Alexandre Alapetite 2016-03-08 18:41:03 +01:00
  • 7244b6d486 Merge pull request #1116 from Alkarex/nosniff Alexandre Alapetite 2016-03-08 18:36:30 +01:00
  • 6e2cd46cc4 Merge pull request #1115 from Alkarex/CSP-SVG Alexandre Alapetite 2016-03-08 18:36:21 +01:00
  • 631e0fcbd0 Merge branch 'nosniff' into dev Alexandre Alapetite 2016-03-08 18:28:28 +01:00
  • 44be16d4fb X-Content-Type-Options: nosniff Alexandre Alapetite 2016-03-08 18:28:04 +01:00
  • c25a3b57aa Merge branch 'CSP-SVG' into dev Alexandre Alapetite 2016-03-08 18:20:38 +01:00
  • c4ebc5c4a9 CSP for SVG Alexandre Alapetite 2016-03-08 18:20:14 +01:00
  • 5da50a3c8f Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2016-03-06 18:08:51 +01:00
  • c424c8acef Changelog typo Alexandre Alapetite 2016-03-06 18:08:32 +01:00
  • 5453d943ed Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2016-03-06 18:04:53 +01:00
  • 1aa6321376 Changelog 1.3.1-beta Alexandre Alapetite 2016-03-06 18:04:28 +01:00
  • f6d781833a Merge pull request #1111 from Alkarex/UpradeNewArticles Alexandre Alapetite 2016-03-06 17:28:36 +01:00
  • 604c104d08 Merge pull request #1112 from Alkarex/OpmlTitle Alexandre Alapetite 2016-03-06 17:28:12 +01:00
  • e33b162d9c Merge branch 'OpmlTitle' into dev Alexandre Alapetite 2016-03-06 17:10:02 +01:00
  • 9d1f35d4b8 OPML bug import not using title Alexandre Alapetite 2016-03-06 17:04:21 +01:00
  • 2fedf488b3 Merge branch 'UpradeNewArticles' into dev Alexandre Alapetite 2016-03-06 15:35:56 +01:00
  • 7f91dbf16d SQLite: Articles from old FreshRSS are marked as unread on update Alexandre Alapetite 2016-03-06 15:32:58 +01:00
  • 2daf988f08 Merge pull request #1110 from Alkarex/i18n-cz Alexandre Alapetite 2016-03-06 15:12:27 +01:00
  • e665c819c5 Merge branch 'i18n-cz' into dev Alexandre Alapetite 2016-03-06 15:00:31 +01:00
  • bb0319c1c7 i18n-cz JSON XML Alexandre Alapetite 2016-03-06 14:50:43 +01:00
  • c1358acf1d Merge pull request #1109 from aledeg/fix-redirection-after-deletion Alexandre Alapetite 2016-03-06 14:36:53 +01:00
  • e265c94319 Fix url ending Alexis Degrugillier 2016-03-06 14:26:20 +01:00
  • 5f04462e55 Fix redirection while deleting a feed Alexis Degrugillier 2016-03-06 12:51:39 +01:00
  • 59f1637713 Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2016-03-06 12:38:12 +01:00
  • 765f9802b4 Merge pull request #1108 from Wanabo/dev Alexandre Alapetite 2016-03-06 12:11:53 +01:00
  • f059e4c5ce Added files via upload Wanabo 2016-03-06 12:01:46 +01:00
  • 2740dd0401 Added files via upload Wanabo 2016-03-06 11:52:35 +01:00
  • c1ddc1faf2 Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2016-03-05 19:53:30 +01:00
  • fb6b82167c Merge pull request #1102 from ealdraed/i18n/de/xmljson Alexandre Alapetite 2016-03-05 19:17:53 +01:00
  • 62b4dae5c2 Merge pull request #1099 from Alkarex/CSP-Firefox44 Alexandre Alapetite 2016-03-05 19:16:57 +01:00
  • 6cd59b25f4 Translate four strings for XML and JSON ealdraed 2016-03-04 12:38:16 +01:00
  • cbac2afd23 CSP compatibility with Firefox older than 45 Alexandre Alapetite 2016-03-01 21:56:19 +01:00
  • ee69a24a2d Merge pull request #1098 from Alkarex/HTTPS-enclosures Alexandre Alapetite 2016-03-01 20:53:25 +01:00
  • 4c9377284b Merge branch 'HTTPS-enclosures' into dev Alexandre Alapetite 2016-03-01 19:49:08 +01:00
  • 9e2e5fd594 SimplePie force HTTPS simplifie code Alexandre Alapetite 2016-03-01 19:48:52 +01:00
  • 89669df72b Merge branch 'HTTPS-enclosures' into dev Alexandre Alapetite 2016-03-01 19:14:51 +01:00
  • c1de11f17d SimplePie force HTTPS bug with sub-domains Alexandre Alapetite 2016-03-01 19:14:26 +01:00
  • 059886bb0e Merge branch 'HTTPS-enclosures' into dev Alexandre Alapetite 2016-02-29 20:43:25 +01:00
  • 0eef625b6d SimplePie force HTTPS for enclosures Alexandre Alapetite 2016-02-29 20:38:21 +01:00
  • 657b979224 Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2016-02-29 18:42:16 +01:00