Commit Graph

  • 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
  • fedf062b49 Comments in config file Alexandre Alapetite 2015-05-10 11:50:08 +02:00
  • 4b8dc80dca Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2015-05-10 00:35:40 +02:00
  • f8dfe12f4f Merge pull request #818 from Alkarex/ConfigurationSetterBug Alexandre Alapetite 2015-05-10 00:27:54 +02:00
  • 03607569dd Merge pull request #820 from Alkarex/IDN Alexandre Alapetite 2015-05-10 00:26:51 +02:00
  • 10f9769013 Merge remote-tracking branch 'origin/sql_hash_lastUpdate' into dev Alexandre Alapetite 2015-05-10 00:22:18 +02:00
  • f3aef1e59b Merge branch 'Alkarex/Logging' Alexandre Alapetite 2015-05-10 00:14:41 +02:00
  • e0f9621f40 Merge pull request #815 from Alkarex/Logging Alexandre Alapetite 2015-05-10 00:06:27 +02:00
  • a7bc54bb99 Minor spaces Alexandre Alapetite 2015-05-09 23:45:52 +02:00
  • 9934668444 SQL: more robust purge Alexandre Alapetite 2015-05-09 23:37:56 +02:00
  • 57a21331e3 Merge branch 'FreshRSS/dev' into sql_hash_lastUpdate Alexandre Alapetite 2015-05-09 13:48:33 +02:00
  • 9d92ec30a7 Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2015-05-09 13:32:17 +02:00
  • 71c4c3da5e Merge pull request #825 from aledeg/search-values Alexandre Alapetite 2015-05-09 13:28:30 +02:00
  • 8759fa6c68 Merge remote-tracking branch 'origin/sql_hash_lastUpdate' into dev Alexandre Alapetite 2015-05-09 13:08:29 +02:00
  • 7f7de31c1d SQL: update request for updated articles Alexandre Alapetite 2015-05-09 13:07:54 +02:00
  • d229216ccc Split the search into values Alexis Degrugillier 2015-04-22 00:24:22 -04:00
  • 6ba3257b18 Merge remote-tracking branch 'origin/IDN' into dev Alexandre Alapetite 2015-04-05 13:12:42 +02:00
  • 8ea9cdd703 Revert file supposed to be in another branch Alexandre Alapetite 2015-04-05 13:11:50 +02:00
  • 77cf3e9072 Merge remote-tracking branch 'origin/IDN' into dev Alexandre Alapetite 2015-04-05 13:07:53 +02:00
  • 06b76831de Punycode spelling mistake Alexandre Alapetite 2015-04-05 13:07:34 +02:00
  • b812bb0c14 Merge remote-tracking branch 'origin/IDN' into dev Alexandre Alapetite 2015-04-05 12:44:54 +02:00
  • 2d18910d02 Support for Internationalized Domain Names (IDN) Alexandre Alapetite 2015-04-05 12:41:16 +02:00
  • 7b9ac8c58e Merge remote-tracking branch 'origin/sql_hash_lastUpdate' into dev Alexandre Alapetite 2015-04-04 22:40:05 +02:00
  • 711530a512 SQL: detection of updates, and preparation for better burge Alexandre Alapetite 2015-04-04 22:39:31 +02:00
  • 6588123a97 Merge branch '814-i18n-czech-translation' of https://github.com/Tets42/FreshRSS into 814-i18n-czech-translation Tets 2015-03-27 08:54:19 +01:00
  • 6283fe99b2 Added Czech to the list in other languages in gen.php Tets 2015-03-27 08:13:34 +01:00
  • 91e5231b26 Added Czech translation Tets 2015-03-27 08:13:34 +01:00
  • dd8de21fb8 Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2015-03-26 17:11:39 +01:00
  • 4744a2a2d8 Added Czech translation Tets 2015-03-26 09:27:23 +01:00
  • 2a0d04dd0e Merge pull request #813 from Alkarex/SimplePieDecodeMaybeHTML Alexis Degrugillier 2015-03-25 03:31:11 -04:00
  • b9135d1f06 Merge remote-tracking branch 'origin/ConfigurationSetterBug' into dev Alexandre Alapetite 2015-03-24 22:52:20 +01:00
  • d7706b66f5 Error when deleting a feed, wrong object Alexandre Alapetite 2015-03-24 22:51:51 +01:00
  • 239a010ef2 Error when deleting a feed Alexandre Alapetite 2015-03-24 22:45:27 +01:00
  • 6032caad2f Merge remote-tracking branch 'origin/Logging' into dev Alexandre Alapetite 2015-03-24 21:58:21 +01:00
  • 2bfc4dbf8b SimplePie forgot static keyword Alexandre Alapetite 2015-03-24 21:58:00 +01:00
  • 800f28a5db Merge branch 'FreshRSS/dev' into dev Alexandre Alapetite 2015-03-24 21:11:21 +01:00
  • 5376c37907 Merge pull request #812 from aledeg/configuration-save Alexandre Alapetite 2015-03-24 21:08:06 +01:00
  • a5e960acbe Merge remote-tracking branch 'origin/Logging' into dev Alexandre Alapetite 2015-03-23 21:59:07 +01:00
  • 7735471140 SimplePie faster regex for sanitizing URLs Alexandre Alapetite 2015-03-23 21:58:37 +01:00