FreshRSS (Customized)/app/Controllers/importExportController.php, branch 1.1.1 Customized version of FreshRSS, a self-hosted RSS feed aggregator https://git.rdnlsmith.com/fresh-rss-custom/atom?h=1.1.1 2015-04-04T20:39:31+00:00 SQL: detection of updates, and preparation for better burge 2015-04-04T20:39:31+00:00 Alexandre Alapetite alexandre@alapetite.fr 2015-04-04T20:39:31+00:00 urn:sha1:711530a512b370d79b079205ce1f8376174f7f03 https://github.com/FreshRSS/FreshRSS/issues/798 https://github.com/FreshRSS/FreshRSS/issues/493 SQLite not yet tested. Only MySQL tested so far. Update lib_opml.php 2015-01-21T09:50:53+00:00 Marien Fressinaud dev@marienfressinaud.fr 2015-01-21T09:50:53+00:00 urn:sha1:c741fba06c6d866c86306445d625a791249ad3fc - lib_opml was not in its newest version - FRSS supports OPML file without text attributes Fix https://github.com/FreshRSS/FreshRSS/issues/758 Merge branch 'dev' into 252-extensions 2015-01-08T13:18:32+00:00 Marien Fressinaud dev@marienfressinaud.fr 2015-01-08T13:18:32+00:00 urn:sha1:73023bc12b81a27045703e1f733faeb2b4e02cec Conflicts: app/FreshRSS.php app/Models/Configuration.php app/views/index/index.phtml app/views/index/normal.phtml lib/Minz/Configuration.php lib/Minz/Translate.php lib/lib_rss.php Fix Controllers to use the correct config system 2015-01-06T16:38:31+00:00 Marien Fressinaud dev@marienfressinaud.fr 2015-01-06T16:38:31+00:00 urn:sha1:d27efeec04c7c41cf0f52bc7f89879e66f2e44a9 See https://github.com/FreshRSS/FreshRSS/issues/730 Change name of user configuration var in Context 2015-01-05T21:45:03+00:00 Marien Fressinaud dev@marienfressinaud.fr 2015-01-05T21:43:15+00:00 urn:sha1:7cca47d1ab5838f5440b1a1e08fa4c0d43989664 - FreshRSS_Context::$conf is replaced by FreshRSS_Context::$user_conf - Introduce FreshRSS_Context::$system_conf - Remove FreshRSS_Configuration object See https://github.com/FreshRSS/FreshRSS/issues/730 Merge branch 'dev' into 252-extensions 2014-12-17T20:41:33+00:00 Marien Fressinaud dev@marienfressinaud.fr 2014-12-17T20:41:33+00:00 urn:sha1:0b898678003b154fde1abd57da27e9246606085f Conflicts: app/i18n/en/admin.php app/i18n/en/feedback.php app/i18n/en/gen.php app/i18n/fr/admin.php app/i18n/fr/feedback.php app/i18n/fr/gen.php app/views/index/normal.phtml Fix i18n strings for sharing 2014-12-17T16:21:41+00:00 Marien Fressinaud dev@marienfressinaud.fr 2014-12-17T16:21:41+00:00 urn:sha1:7f4ca35fc331ca4ce5e097d574e99417da0ef73e Fix https://github.com/FreshRSS/FreshRSS/issues/728 Fix i18n for auth and category controllers 2014-12-11T17:15:41+00:00 Marien Fressinaud dev@marienfressinaud.fr 2014-12-11T17:15:41+00:00 urn:sha1:c1a3412b97d5f19e6c1102902156b098598e7ce9 Fix i18n for import/export 2014-12-11T16:46:05+00:00 Marien Fressinaud dev@marienfressinaud.fr 2014-12-11T16:46:05+00:00 urn:sha1:0ee16a7d6acb0c0158272fbbdd9ee876d9fb4a4a Add a feed_before_insert hook 2014-12-08T12:05:56+00:00 Marien Fressinaud dev@marienfressinaud.fr 2014-12-08T12:05:56+00:00 urn:sha1:188b517daa174ce494f31dec02ae2cff122488ff See https://github.com/FreshRSS/FreshRSS/issues/252