Alexandre Alapetite
6c2bebaff2
Merge branch 'FreshRSS/dev' into PubSubHubbub
2015-05-18 17:49:40 +02:00
Alexandre Alapetite
9b69ec4b31
Merge pull request #842 from Alwaysin/patch-9
...
Language fix
2015-05-18 10:09:40 +02:00
Alexandre Alapetite
3e738e91e0
Merge pull request #843 from Alwaysin/patch-10
...
Language fix
2015-05-18 10:09:29 +02:00
Alexandre Alapetite
c2046e513f
Merge pull request #844 from Alwaysin/patch-4
...
Language fix
2015-05-18 10:09:16 +02:00
Alwaysin
7524811c96
Language fix
2015-05-18 09:09:28 +02:00
Alwaysin
6263ecef2f
Language fix
2015-05-18 09:06:37 +02:00
Alwaysin
265f09f257
Language fix
2015-05-18 09:02:28 +02:00
Alexandre Alapetite
98773aca59
Merge branch 'FreshRSS/dev' into PubSubHubbub
2015-05-17 22:07:37 +02:00
Alexandre Alapetite
001c713f03
PubSubHubbub better gestion of errors
...
Do not assume that PubSubHubbub works until the first successul push
https://github.com/FreshRSS/FreshRSS/issues/312#issuecomment-102706500
2015-05-17 22:06:11 +02:00
Alexandre Alapetite
cad42ea55f
i18n: en-GB revert
...
af166f6c53 (commitcomment-11229341)
2015-05-17 12:32:46 +02:00
Alexandre Alapetite
7a7f6edb15
Merge pull request #840 from Alwaysin/patch-6
...
Language fix
2015-05-17 11:53:49 +02:00
Alexandre Alapetite
3d20c98cfc
Merge pull request #839 from Alwaysin/patch-5
...
Language fix + en_GB standardisation
2015-05-17 11:53:34 +02:00
Alexandre Alapetite
8f89d306e8
Merge pull request #837 from Alwaysin/patch-3
...
Language fix
2015-05-17 11:53:06 +02:00
Alwaysin
af166f6c53
Language fix
2015-05-17 01:33:43 +02:00
Alwaysin
35cdb89eed
Language fix + en_GB standardisation
2015-05-17 01:30:35 +02:00
Alwaysin
6d31c60976
Language fix
2015-05-17 01:18:49 +02:00
Alexandre Alapetite
5dfa9a9e52
Merge branch 'FreshRSS/dev' into PubSubHubbub
2015-05-16 23:46:01 +02:00
Alexandre Alapetite
84ea636d2d
PubSubHubbub bug skip pull
...
Do not pull refresh feeds that are PubSubHubbub too often during cron
refresh.
And more debugging info during the test phase.
https://github.com/FreshRSS/FreshRSS/pull/831
2015-05-16 23:44:36 +02:00
Alexandre Alapetite
c1a5b8045e
Merge pull request #835 from Alwaysin/patch-1
...
Typo fix
2015-05-16 23:38:11 +02:00
Alwaysin
6985a73f1c
Typo fix
2015-05-16 23:37:28 +02:00
Alexandre Alapetite
a5a3789b2c
Merge branch 'FreshRSS/dev' into PubSubHubbub
2015-05-16 23:01:25 +02:00
Alexandre Alapetite
005751d3fb
jQuery 2.1.4
...
http://blog.jquery.com/2015/04/28/jquery-1-11-3-and-2-1-4-released-ios-fail-safe-edition/
2015-05-16 22:57:51 +02:00
Alexandre Alapetite
b3e01b11cf
Merge branch 'FreshRSS/dev' into PubSubHubbub
2015-05-16 22:06:19 +02:00
Alexandre Alapetite
a19e908b73
Changelog, readme
...
Several spelling mistakes corrected. Slight rewording of some sentences.
Cherry-picked from PubSubHubbub
https://github.com/FreshRSS/FreshRSS/pull/831 (it should have been a
different branch)
3adab4b70f
2015-05-16 22:04:47 +02:00
Alexandre Alapetite
99dd1d37e0
PubSubHubbub changelog
...
Planned for version beta 1.1.2
https://github.com/FreshRSS/FreshRSS/issues/312
2015-05-16 21:52:57 +02:00
Alexandre Alapetite
d3af903301
i18n: German PubSubHubbub
...
https://github.com/FreshRSS/FreshRSS/pull/831/files#r30463016
https://github.com/FreshRSS/FreshRSS/issues/312
2015-05-16 21:47:26 +02:00
Alexandre Alapetite
abab0f0ce6
Merge branch 'FreshRSS/dev' into PubSubHubbub
2015-05-16 19:44:52 +02:00
Alexandre Alapetite
044c442806
i18n: German
...
Completed cherry-pick of https://github.com/FreshRSS/FreshRSS/pull/832 +
corrections
2015-05-16 19:36:42 +02:00
thomasE1993
fe2f6c74b9
Update install.php
2015-05-16 19:24:32 +02:00
thomasE1993
450cc2d66f
Update index.php
2015-05-16 19:24:26 +02:00
thomasE1993
7c6ce30f59
Update gen.php
2015-05-16 19:24:19 +02:00
thomasE1993
70f0fc8d61
Update feedback.php
2015-05-16 19:24:13 +02:00
thomasE1993
bd21838bd0
Update conf.php
2015-05-16 19:24:04 +02:00
thomasE1993
9fe8a7c62d
Update admin.php
2015-05-16 19:22:56 +02:00
Alexandre Alapetite
3adab4b70f
More PubSubHubbub
...
https://github.com/FreshRSS/FreshRSS/issues/312
Show whether PubSubHubbub is enabled in the Web interface of feed
configuration.
When PubSubHubbub is used, do not pull refresh so often (hard-coded to
max once per 24h for now).
Improved logic for lease renewal, and some detection of lease problems.
Updated read-me and changelog.
2015-05-16 13:05:43 +02:00
Alexandre Alapetite
0163564b9e
Change some error messages
2015-05-15 17:58:56 +02:00
Alexandre Alapetite
18831a89ef
PubSubHubbub active only when refreshing, not adding a feed
...
https://github.com/FreshRSS/FreshRSS/issues/312
2015-05-15 15:46:51 +02:00
Alexandre Alapetite
040a436974
Merge branch 'FreshRSS/dev' into PubSubHubbub
2015-05-15 15:40:30 +02:00
Alexandre Alapetite
5adaf17721
Revert bug HTTP 301 introduced by Refactor feedController
...
e2da6e6e6b
2015-05-15 15:38:54 +02:00
Alexandre Alapetite
c472569b38
First alpha of PubSubHubbub
...
https://github.com/FreshRSS/FreshRSS/issues/312
Using a white list limited to http://push-pub.appspot.com/feed for alpha
testing.
2015-05-15 15:34:51 +02:00
Alexandre Alapetite
256c8613a4
First draft of PubSubHubbub
...
https://github.com/FreshRSS/FreshRSS/issues/312
Requires setting base_url in config.php.
Currently using the filesystem (no change to the database)
2015-05-15 03:21:36 +02:00
Alexandre Alapetite
f4b0661f3d
Merge branch 'FreshRSS/dev' into dev
2015-05-12 21:19:55 +02:00
Alexandre Alapetite
9a189aea3e
Merge remote-tracking branch 'origin/dev' into FreshRSS/dev
2015-05-12 21:08:29 +02:00
Alexandre Alapetite
64a5cdae7a
Merge branch 'FreshRSS/dev' into dev
2015-05-12 21:08:05 +02:00
Alexandre Alapetite
0f408e83e0
Merge pull request #828 from Alkarex/sqliteBug
...
SQLite compatibility with new update mode
2015-05-12 18:31:03 +02:00
Alexandre Alapetite
ab0716c703
Merge branch 'FreshRSS/dev' into dev
2015-05-11 23:08:13 +02:00
Alexandre Alapetite
d6c22a0841
Merge pull request #829 from Tets42/814-i18n-czech-translation
...
814-i18n-czech-translation
2015-05-11 23:06:36 +02:00
Alexandre Alapetite
8b27128a62
Merge remote-tracking branch 'origin/sqliteBug' into dev
2015-05-11 22:47:13 +02:00
Alexandre Alapetite
217c191a1b
More SQLite compatibility
...
Additional changes to add compatibility with SQLite for the new
hash/lastSeen mode of updating articles.
2015-05-11 22:42:41 +02:00
Tets
ead849dbe3
Czech translation
2015-05-11 10:20:17 +02:00
