Commit graph

6976 commits

Author SHA1 Message Date
Andrew Dolgov
bd207093ee Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS 2013-07-06 12:03:13 +04:00
Andrew Dolgov
e9687f67e0 date_reverse view mode: take scoring into account 2013-07-06 12:03:01 +04:00
Andrew Dolgov
d7a2741343 Merge pull request #245 from shibuya246/master
add <source><title> to feed rss output as is common in other rss feeds
2013-07-06 00:47:47 -07:00
Andrew Dolgov
28b474c3c2 Merge pull request #246 from KestL/master
Google Reader Import plugin - right datetime in last_marked
2013-07-06 00:47:21 -07:00
Andrew Dolgov
cc89ff5be3 Merge pull request #247 from TheSpyder/hotkey_fixes
Hotkey fixes
2013-07-06 00:46:44 -07:00
Andrew Dolgov
80028907b5 Merge pull request #249 from qwerdy/master
Filter test from web interface now replicates behaviour from pull #167
2013-07-06 00:43:30 -07:00
Joakim
4cb2c55025 Filter test from web interface now replicates behaviour from pull #167 2013-07-05 20:34:38 +02:00
syrnon
bfc24f3794 Update atom.php 2013-07-03 22:36:33 +03:00
syrnon
deeeee76d2 Update feedparser.php 2013-07-03 22:35:38 +03:00
Andrew Herron
c65bd1027a Added alt and meta key handling to hotkeys 2013-07-02 22:36:29 +10:00
Andrew Herron
d999bc3eb2 prevent accidental ctrl_key global 2013-07-02 22:29:19 +10:00
Konstantin Ufimtsev
af26179d15 getting last_marked value from starred.json 2013-07-01 22:52:14 +10:00
shibuya246
ab10707fac add <source><title> to feed rss output 2013-07-01 19:53:27 +09:00
shibuya246
29a963c14f add <source><title> to feed rss output 2013-07-01 19:51:32 +09:00
justauser
ef3a8db1cc Merge remote-tracking branch 'origin' into hookhead
update to latest
2013-06-29 05:54:45 -04:00
justauser
575a52874c fixed a typo 2013-06-29 03:11:38 -04:00
justauser
48c8e72008 Add some explanaiton in the example about the content_preview field 2013-06-28 10:50:30 -04:00
justauser
6763143835 Changed the implementation of HOOK_QUERY_HEADLINES to deal with issue Fox raised 2013-06-28 10:46:45 -04:00
Andrew Dolgov
776b19536d Merge pull request #243 from d7415/master
image.php: Remove possible leading line from images
2013-06-28 02:54:53 -07:00
Martin Stone
c26b93aba5 image.php: Flush headers and output buffer to prevent a leading empty line in some instances.
Signed-off-by: Martin Stone <martin@d7415.co.uk>
2013-06-28 09:47:20 +00:00
Andrew Dolgov
4f62f8f6dc add js hook for floating title 2013-06-28 08:30:35 +04:00
Andrew Dolgov
fac0964053 do not show lone dash in collapsed cdm when content preview is disabled 2013-06-27 21:05:10 +04:00
justauser
2e18843845 one more change to merge to origin 2013-06-27 12:21:14 -04:00
justauser
0708046b4f change for HOOK_QUERY_HEADLINES. See example for details. 2013-06-27 12:01:57 -04:00
justauser
7171f32dc5 Merge remote-tracking branch 'origin' into hookhead
Conflicts:
	classes/feeds.php

fix for merging up to the origin
2013-06-27 11:57:49 -04:00
justauser
891e36f57e Changes to add a new hook: HOOK_QUERY_HEADLINES. An example is provided. 2013-06-27 11:18:23 -04:00
Andrew Dolgov
ce920ec148 Merge pull request #239 from craywolf/fixversion
Fix version in preferences footer
2013-06-26 08:00:11 -07:00
craywolf
3cda9e2a40 Fix version in preferences footer 2013-06-26 09:20:03 -04:00
Andrew Dolgov
72f133bb06 add experimental counterNode text shadow 2013-06-26 16:52:24 +04:00
Andrew Dolgov
3cd5511b32 another counter node positioning hack 2013-06-26 16:48:53 +04:00
Andrew Dolgov
d97efc9967 floicon wrapper: fix short tag 2013-06-26 13:36:06 +04:00
Andrew Dolgov
ba2463069f replace floIcon with jimIcon from https://github.com/jimparis/jimIcon 2013-06-26 08:37:07 +04:00
Andrew Dolgov
afa1a260d0 fix inverse status not being set correctly for filters when creating
them
fix inverse rules not being saved/restored properly through opml
2013-06-26 02:17:49 +04:00
Andrew Dolgov
44727c79ad batch feed editor: remove title and feed url because batch editing those makes no sense whatsoever 2013-06-25 23:07:09 +04:00
Andrew Dolgov
a8572a7182 login page: remove version 2013-06-25 22:14:50 +04:00
Andrew Dolgov
b584460302 parser: remove atom <source> element 2013-06-25 14:43:59 +04:00
Andrew Dolgov
420940fa90 do not catchup newly subscribed feeds 2013-06-25 10:01:41 +04:00
Andrew Dolgov
f26347917f af_dilbert: fix typo 2013-06-25 09:36:33 +04:00
Andrew Dolgov
9f4d5afa33 add af_dilbert 2013-06-25 09:32:53 +04:00
Andrew Dolgov
9b89a846af Merge pull request #236 from levito/patch-5
only do article update operations once when scrolling
2013-06-24 22:18:11 -07:00
Veit Lehmann
d1754390cc only do article update operations once when scrolling
I discovered that DOM operations and function calls were done several times inside the 100px mirror when scrolling through articles. Especially painful on seamless scrolling systems like Mac OS, where dozens of updates would slow down this part dramatically. This change fixes it.
2013-06-25 06:08:44 +03:00
Andrew Dolgov
d1343b844d make floating title less cpu intensive 2013-06-25 01:35:07 +04:00
Andrew Dolgov
b627f574f8 fix 2week catchup parameter 2013-06-25 00:11:53 +04:00
Andrew Dolgov
1ed69dc5f5 Merge pull request #233 from lotrfan/dismiss
Remove content when dismissing
2013-06-23 04:30:12 -07:00
Jeffrey Tolar
3b2605a02e Add some checks to see if the content element exists
This *might* help dismissal not break when not using combined mode.
2013-06-21 23:49:35 -05:00
Jeffrey Tolar
055a37e083 Fix incorrect function name in exception handling 2013-06-21 23:31:59 -05:00
Jeffrey Tolar
abba5dd4d4 Remove content when an article is dismissed 2013-06-21 23:30:55 -05:00
Andrew Dolgov
638abcecea Merge pull request #230 from lotrfan/hotkey_fix
Add missing hotkey action
2013-06-21 00:43:13 -07:00
Jeffrey Tolar
3faad714e2 Add missing hotkey handler 2013-06-21 01:50:08 -05:00
Andrew Dolgov
bc3c887f4f better root element detection for atom content type xhtml (closes #720) 2013-06-20 21:16:06 +04:00