Commit Graph

2138 Commits

Author SHA1 Message Date
Alwaysin
7524811c96 Language fix 2015-05-18 09:09:28 +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
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
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
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
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
5adaf17721 Revert bug HTTP 301 introduced by Refactor feedController
e2da6e6e6b
2015-05-15 15:38:54 +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
Alexandre Alapetite
0b81d0cbba Merge remote-tracking branch 'origin/sqliteBug' into dev 2015-05-10 20:34:05 +02:00
Alexandre Alapetite
0745252b68 Hexadecimal literals do not work with SQLite/PDO
X'09AF' hexadecimal literals do not work with SQLite/PDO. Replaced by
PHP hex2bin().

711530a512
2015-05-10 20:31:03 +02:00
Alexandre Alapetite
f7a502b06e Cannot create an account with sqlite
https://github.com/FreshRSS/FreshRSS/issues/770
2015-05-10 19:20:46 +02:00
Alexandre Alapetite
3837e4ced5 Merge branch 'FreshRSS/dev' into dev 2015-05-10 18:23:17 +02:00
Alexandre Alapetite
79f0f2bbb4 Bug Page 403 ne peut s'afficher si Translate n'est pas instancié avant
https://github.com/FreshRSS/FreshRSS/issues/821
2015-05-10 18:21:21 +02:00
Alexandre Alapetite
e6aeade47a Merge remote-tracking branch 'origin/sql_hash_lastUpdate' into dev 2015-05-10 14:08:25 +02:00
Alexandre Alapetite
0d0c6b7493 Moved updated/unread option from global to user
https://github.com/FreshRSS/FreshRSS/issues/798
2015-05-10 14:04:12 +02:00
Alexandre Alapetite
b0cfbe3ff6 Merge remote-tracking branch 'origin/sql_hash_lastUpdate' into dev 2015-05-10 12:16:49 +02:00
Alexandre Alapetite
5f545dfda2 Global option to mark updated articles as unread
https://github.com/FreshRSS/FreshRSS/issues/798
2015-05-10 12:14:38 +02:00
Alexandre Alapetite
1f1e68bde1 Merge branch 'FreshRSS/dev' into dev 2015-05-10 11:52:18 +02:00
Alexandre Alapetite
7d1ebd3c23 Merge branch 'FreshRSS/dev' into sql_hash_lastUpdate 2015-05-10 11:51:59 +02:00
Alexandre Alapetite
fedf062b49 Comments in config file
Documentation https://github.com/FreshRSS/FreshRSS/issues/123
2015-05-10 11:50:08 +02:00
Alexandre Alapetite
4b8dc80dca Merge branch 'FreshRSS/dev' into dev 2015-05-10 00:35:40 +02:00
Alexandre Alapetite
f8dfe12f4f Merge pull request #818 from Alkarex/ConfigurationSetterBug
Configuration setter bug
2015-05-10 00:27:54 +02:00
Alexandre Alapetite
03607569dd Merge pull request #820 from Alkarex/IDN
Support for Internationalized Domain Names (IDN)
2015-05-10 00:26:51 +02:00
Alexandre Alapetite
10f9769013 Merge remote-tracking branch 'origin/sql_hash_lastUpdate' into dev 2015-05-10 00:22:18 +02:00
Alexandre Alapetite
f3aef1e59b Merge branch 'Alkarex/Logging'
https://github.com/FreshRSS/FreshRSS/pull/815
2015-05-10 00:14:41 +02:00
Alexandre Alapetite
e0f9621f40 Merge pull request #815 from Alkarex/Logging
SimplePie logging of HTTP requests
2015-05-10 00:06:27 +02:00
Alexandre Alapetite
a7bc54bb99 Minor spaces 2015-05-09 23:45:52 +02:00
Alexandre Alapetite
9934668444 SQL: more robust purge
https://github.com/FreshRSS/FreshRSS/issues/798
https://github.com/FreshRSS/FreshRSS/issues/493
2015-05-09 23:37:56 +02:00
Alexandre Alapetite
57a21331e3 Merge branch 'FreshRSS/dev' into sql_hash_lastUpdate 2015-05-09 13:48:33 +02:00