Commit Graph

  • 68172c400f Merge pull request #854 from Alkarex/ConfirmationChrome Alexandre Alapetite 2015-05-30 11:16:59 +02:00
  • a39e48e811 Merge remote-tracking branch 'origin/ConfirmationChrome' into dev Alexandre Alapetite 2015-05-29 23:32:01 +02:00
  • f79f2a7e98 Patch for confirmation in non-Firefox (Chrome) Alexandre Alapetite 2015-05-29 23:30:37 +02:00
  • ed811431a5 Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2015-05-24 02:01:30 +02:00
  • ae277ddefc Merge branch 'FreshRSS/dev' into PubSubHubbub Alexandre Alapetite 2015-05-24 02:01:08 +02:00
  • b7859f4bde Changelog: new confirmation in case on unsaved changes Alexandre Alapetite 2015-05-24 02:00:14 +02:00
  • 9d55ee5ae9 Bug EntryDAO filter Alexandre Alapetite 2015-05-24 01:49:13 +02:00
  • 6e01d4504b Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2015-05-23 18:38:48 +02:00
  • 76ac307b6a Merge branch 'FreshRSS/dev' into PubSubHubbub Alexandre Alapetite 2015-05-23 18:37:50 +02:00
  • 70384b3c99 Details in Credits.md Alexandre Alapetite 2015-05-23 18:34:00 +02:00
  • 126969777a Credits file in Markdown format + details Alexandre Alapetite 2015-05-23 18:31:45 +02:00
  • 6cd5906a26 Changelog typos Alexandre Alapetite 2015-05-23 17:56:48 +02:00
  • ac051ff395 More changelog for beta 1.1.1 Alexandre Alapetite 2015-05-23 17:49:27 +02:00
  • 2b7ba45551 Using Mardown format for changelog https://github.com/FreshRSS/FreshRSS/issues/124 Alexandre Alapetite 2015-05-23 17:33:14 +02:00
  • e3ce10b38a Merge remote-tracking branch 'origin/PubSubHubbub' into dev Alexandre Alapetite 2015-05-23 16:37:30 +02:00
  • 694dfa1f8b PubSubHubbub: remove white list Alexandre Alapetite 2015-05-23 16:37:08 +02:00
  • af388569c2 Merge pull request #847 from Alkarex/NewsPlus Alexandre Alapetite 2015-05-23 16:32:33 +02:00
  • e3f5e157a4 Merge remote-tracking branch 'origin/RssFeed' into dev Alexandre Alapetite 2015-05-23 02:51:29 +02:00
  • 27d2b88a19 Minz getBaseUrl correction and RSS template bug Alexandre Alapetite 2015-05-23 02:23:38 +02:00
  • 59eb4e1c2a Merge remote-tracking branch 'origin/NewsPlus' into dev Alexandre Alapetite 2015-05-21 19:46:54 +02:00
  • 10d98e0ce9 Google Reader API: work-around for News+ bug Alexandre Alapetite 2015-05-21 19:46:32 +02:00
  • 65b41af94d Google Reader API: work-around for News+ bug Alexandre Alapetite 2015-05-21 19:42:03 +02:00
  • 67f66358d4 Merge remote-tracking branch 'origin/PubSubHubbub' into dev Alexandre Alapetite 2015-05-18 17:50:11 +02:00
  • 6c2bebaff2 Merge branch 'FreshRSS/dev' into PubSubHubbub Alexandre Alapetite 2015-05-18 17:49:40 +02:00
  • 8f32dc2b79 Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2015-05-18 17:49:02 +02:00
  • 9b69ec4b31 Merge pull request #842 from Alwaysin/patch-9 Alexandre Alapetite 2015-05-18 10:09:40 +02:00
  • 3e738e91e0 Merge pull request #843 from Alwaysin/patch-10 Alexandre Alapetite 2015-05-18 10:09:29 +02:00
  • c2046e513f Merge pull request #844 from Alwaysin/patch-4 Alexandre Alapetite 2015-05-18 10:09:16 +02:00
  • 7524811c96 Language fix Alwaysin 2015-05-18 09:09:28 +02:00
  • 6263ecef2f Language fix Alwaysin 2015-05-18 09:06:37 +02:00
  • 265f09f257 Language fix Alwaysin 2015-05-18 09:02:28 +02:00
  • 98773aca59 Merge branch 'FreshRSS/dev' into PubSubHubbub Alexandre Alapetite 2015-05-17 22:07:37 +02:00
  • 0ee60dd065 Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2015-05-17 22:07:20 +02:00
  • 83ab561242 Merge remote-tracking branch 'origin/PubSubHubbub' into dev Alexandre Alapetite 2015-05-17 22:06:33 +02:00
  • 001c713f03 PubSubHubbub better gestion of errors Alexandre Alapetite 2015-05-17 22:06:11 +02:00
  • cad42ea55f i18n: en-GB revert Alexandre Alapetite 2015-05-17 12:32:46 +02:00
  • 7a7f6edb15 Merge pull request #840 from Alwaysin/patch-6 Alexandre Alapetite 2015-05-17 11:53:49 +02:00
  • 3d20c98cfc Merge pull request #839 from Alwaysin/patch-5 Alexandre Alapetite 2015-05-17 11:53:34 +02:00
  • 8f89d306e8 Merge pull request #837 from Alwaysin/patch-3 Alexandre Alapetite 2015-05-17 11:53:06 +02:00
  • af166f6c53 Language fix Alwaysin 2015-05-17 01:33:43 +02:00
  • 35cdb89eed Language fix + en_GB standardisation Alwaysin 2015-05-17 01:30:35 +02:00
  • 6d31c60976 Language fix Alwaysin 2015-05-17 01:18:49 +02:00
  • a3df8418c5 Merge remote-tracking branch 'origin/PubSubHubbub' into dev Alexandre Alapetite 2015-05-16 23:46:36 +02:00
  • 5dfa9a9e52 Merge branch 'FreshRSS/dev' into PubSubHubbub Alexandre Alapetite 2015-05-16 23:46:01 +02:00
  • ee39b7e114 Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2015-05-16 23:45:39 +02:00
  • 84ea636d2d PubSubHubbub bug skip pull Alexandre Alapetite 2015-05-16 23:44:36 +02:00
  • c1a5b8045e Merge pull request #835 from Alwaysin/patch-1 Alexandre Alapetite 2015-05-16 23:38:11 +02:00
  • 6985a73f1c Typo fix Alwaysin 2015-05-16 23:37:28 +02:00
  • 94be7f117b Merge remote-tracking branch 'origin/PubSubHubbub' into dev Alexandre Alapetite 2015-05-16 23:02:05 +02:00
  • a5a3789b2c Merge branch 'FreshRSS/dev' into PubSubHubbub Alexandre Alapetite 2015-05-16 23:01:25 +02:00
  • e818cde860 Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2015-05-16 23:01:05 +02:00
  • 005751d3fb jQuery 2.1.4 Alexandre Alapetite 2015-05-16 22:57:51 +02:00
  • 901364ba0e Merge remote-tracking branch 'origin/PubSubHubbub' into dev Alexandre Alapetite 2015-05-16 22:15:33 +02:00
  • 6ebfff2613 Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2015-05-16 22:13:22 +02:00
  • b3e01b11cf Merge branch 'FreshRSS/dev' into PubSubHubbub Alexandre Alapetite 2015-05-16 22:06:19 +02:00
  • a19e908b73 Changelog, readme Alexandre Alapetite 2015-05-16 22:04:47 +02:00
  • 99dd1d37e0 PubSubHubbub changelog Alexandre Alapetite 2015-05-16 21:52:57 +02:00
  • d3af903301 i18n: German PubSubHubbub Alexandre Alapetite 2015-05-16 21:47:26 +02:00
  • abab0f0ce6 Merge branch 'FreshRSS/dev' into PubSubHubbub Alexandre Alapetite 2015-05-16 19:44:52 +02:00
  • 96dab23f2a Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2015-05-16 19:44:19 +02:00
  • 044c442806 i18n: German Alexandre Alapetite 2015-05-16 19:36:42 +02:00
  • fe2f6c74b9 Update install.php thomasE1993 2015-05-16 18:58:57 +02:00
  • 450cc2d66f Update index.php thomasE1993 2015-05-16 18:55:31 +02:00
  • 7c6ce30f59 Update gen.php thomasE1993 2015-05-16 18:54:23 +02:00
  • 70f0fc8d61 Update feedback.php thomasE1993 2015-05-16 18:52:08 +02:00
  • bd21838bd0 Update conf.php thomasE1993 2015-05-15 20:18:24 +02:00
  • 9fe8a7c62d Update admin.php thomasE1993 2015-05-15 20:09:58 +02:00
  • ca58a265e6 Update install.php thomasE1993 2015-05-16 18:58:57 +02:00
  • 853957a74f Update index.php thomasE1993 2015-05-16 18:55:31 +02:00
  • 7bd97184c9 Update gen.php thomasE1993 2015-05-16 18:54:23 +02:00
  • 247bc7578b Update feedback.php thomasE1993 2015-05-16 18:52:08 +02:00
  • 3adab4b70f More PubSubHubbub Alexandre Alapetite 2015-05-16 13:05:43 +02:00
  • b14b1a11dc Update conf.php thomasE1993 2015-05-15 20:18:24 +02:00
  • c6e2e1aa51 Update admin.php thomasE1993 2015-05-15 20:09:58 +02:00
  • 0163564b9e Change some error messages Alexandre Alapetite 2015-05-15 17:58:56 +02:00
  • 18831a89ef PubSubHubbub active only when refreshing, not adding a feed Alexandre Alapetite 2015-05-15 15:46:51 +02:00
  • 040a436974 Merge branch 'FreshRSS/dev' into PubSubHubbub Alexandre Alapetite 2015-05-15 15:40:30 +02:00
  • 5adaf17721 Revert bug HTTP 301 introduced by Refactor feedController Alexandre Alapetite 2015-05-15 15:38:54 +02:00
  • c472569b38 First alpha of PubSubHubbub Alexandre Alapetite 2015-05-15 15:34:51 +02:00
  • 256c8613a4 First draft of PubSubHubbub Alexandre Alapetite 2015-05-15 03:21:36 +02:00
  • f4b0661f3d Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2015-05-12 21:19:55 +02:00
  • 9a189aea3e Merge remote-tracking branch 'origin/dev' into FreshRSS/dev Alexandre Alapetite 2015-05-12 21:08:29 +02:00
  • 64a5cdae7a Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2015-05-12 21:08:05 +02:00
  • 0f408e83e0 Merge pull request #828 from Alkarex/sqliteBug Alexandre Alapetite 2015-05-12 18:31:03 +02:00
  • ab0716c703 Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2015-05-11 23:08:13 +02:00
  • d6c22a0841 Merge pull request #829 from Tets42/814-i18n-czech-translation Alexandre Alapetite 2015-05-11 23:06:36 +02:00
  • 8b27128a62 Merge remote-tracking branch 'origin/sqliteBug' into dev Alexandre Alapetite 2015-05-11 22:47:13 +02:00
  • 217c191a1b More SQLite compatibility Alexandre Alapetite 2015-05-11 22:42:41 +02:00
  • ead849dbe3 Czech translation Tets 2015-05-11 10:20:17 +02:00
  • 0b81d0cbba Merge remote-tracking branch 'origin/sqliteBug' into dev Alexandre Alapetite 2015-05-10 20:34:05 +02:00
  • 0745252b68 Hexadecimal literals do not work with SQLite/PDO Alexandre Alapetite 2015-05-10 20:31:03 +02:00
  • f7a502b06e Cannot create an account with sqlite Alexandre Alapetite 2015-05-10 19:20:46 +02:00
  • 3837e4ced5 Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2015-05-10 18:23:17 +02:00
  • 79f0f2bbb4 Bug Page 403 ne peut s'afficher si Translate n'est pas instancié avant Alexandre Alapetite 2015-05-10 18:21:21 +02:00
  • e6aeade47a Merge remote-tracking branch 'origin/sql_hash_lastUpdate' into dev Alexandre Alapetite 2015-05-10 14:08:25 +02:00
  • 0d0c6b7493 Moved updated/unread option from global to user Alexandre Alapetite 2015-05-10 14:04:12 +02:00
  • b0cfbe3ff6 Merge remote-tracking branch 'origin/sql_hash_lastUpdate' into dev Alexandre Alapetite 2015-05-10 12:16:49 +02:00
  • 5f545dfda2 Global option to mark updated articles as unread Alexandre Alapetite 2015-05-10 12:14:38 +02:00
  • 1f1e68bde1 Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2015-05-10 11:52:18 +02:00
  • 7d1ebd3c23 Merge branch 'FreshRSS/dev' into sql_hash_lastUpdate Alexandre Alapetite 2015-05-10 11:51:59 +02:00