blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
6787 commits 3 branches 0 tags 76 MiB
Commit graph

6787 commits

This branch
This branch
All branches
Author SHA1 Message Date
justauser
3b96b0ed7c Merge branch 'master' into hookhead 
Conflicts:
	include/functions.php

changes for conflicts with master
 2013-07-07 13:57:06 -04:00
justauser
e4e9ac1fc2 Merge branch 'master' of http://github.com/gothfox/Tiny-Tiny-RSS 
updating from github]
 2013-07-07 13:54:10 -04:00
justauser
47fecba235 changes to add hook_query_headlines 2013-07-07 13:53:23 -04:00
Andrew Dolgov
1016a4ef38 Merge pull request #252 from Djuuu/master 
Correct feed ID in public feeds
 2013-07-07 05:22:52 -07:00
Julien Tardot
39119f0216 Correct feed ID in feeds self URL. 2013-07-07 11:55:06 +02:00
Andrew Dolgov
c722c0be17 rewrite_relative_url: don't touch stuff which has sheme in it (closes #738) 2013-07-07 11:23:59 +04:00
Andrew Dolgov
62e7136b74 Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS 2013-07-07 01:03:53 +04:00
Andrew Dolgov
356e13b161 rename orig_guid to no_orig_guid 2013-07-07 01:03:45 +04:00
Andrew Dolgov
fcf6bfba32 syndicated feeds: add orig_guid to optionally alter item id to workaround duplicate checking for syndicated content; add <link> element to <source> 2013-07-07 00:59:23 +04:00
Andrew Dolgov
e4eec1d216 Merge pull request #251 from guillaume-uH57J9/master 
Log failed login attemps, related to Feature #432 (try 2)
 2013-07-06 06:44:58 -07:00
guillaume-uH57J9
c4cab4ecf4 Report failed login attemps using user_error 2013-07-06 15:34:42 +02:00
Andrew Dolgov
4b7ebe93a8 fix broken highlighting of high-scored rows 2013-07-06 12:34:58 +04:00
Andrew Dolgov
04a8c2065f better error reporting in session validation 2013-07-06 12:05:52 +04:00
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
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