Commit Graph

6994 Commits (84c53d0e1dba8633fe9fc8ba2d46bb3e3c096173)
 

Author SHA1 Message Date
syrnon f150f85a5e reverted changes 12 years ago
Andrew Dolgov cf1cd5a0e9 add some css hacks for feed tree 12 years ago
Andrew Dolgov 03304fda54 if multiple articles are selected, do not reset active article / selection on scroll if auto catchup is enabled 12 years ago
Andrew Dolgov 8cf72d075b Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS 12 years ago
Andrew Dolgov 9733f0029d update gitignore 12 years ago
justauser 3b96b0ed7c Merge branch 'master' into hookhead
Conflicts:
	include/functions.php

changes for conflicts with master
12 years ago
justauser e4e9ac1fc2 Merge branch 'master' of http://github.com/gothfox/Tiny-Tiny-RSS
updating from github]
12 years ago
justauser 47fecba235 changes to add hook_query_headlines 12 years ago
Andrew Dolgov 1016a4ef38 Merge pull request #252 from Djuuu/master
Correct feed ID in public feeds
12 years ago
Julien Tardot 39119f0216 Correct feed ID in feeds self URL. 12 years ago
Andrew Dolgov c722c0be17 rewrite_relative_url: don't touch stuff which has sheme in it (closes #738) 12 years ago
Andrew Dolgov 62e7136b74 Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS 12 years ago
Andrew Dolgov 356e13b161 rename orig_guid to no_orig_guid 12 years ago
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> 12 years ago
Andrew Dolgov e4eec1d216 Merge pull request #251 from guillaume-uH57J9/master
Log failed login attemps, related to Feature #432 (try 2)
12 years ago
guillaume-uH57J9 c4cab4ecf4 Report failed login attemps using user_error 12 years ago
Andrew Dolgov 4b7ebe93a8 fix broken highlighting of high-scored rows 12 years ago
Andrew Dolgov 04a8c2065f better error reporting in session validation 12 years ago
Andrew Dolgov bd207093ee Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS 12 years ago
Andrew Dolgov e9687f67e0 date_reverse view mode: take scoring into account 12 years ago
Andrew Dolgov d7a2741343 Merge pull request #245 from shibuya246/master
add <source><title> to feed rss output as is common in other rss feeds
12 years ago
Andrew Dolgov 28b474c3c2 Merge pull request #246 from KestL/master
Google Reader Import plugin - right datetime in last_marked
12 years ago
Andrew Dolgov cc89ff5be3 Merge pull request #247 from TheSpyder/hotkey_fixes
Hotkey fixes
12 years ago
Andrew Dolgov 80028907b5 Merge pull request #249 from qwerdy/master
Filter test from web interface now replicates behaviour from pull #167
12 years ago
Joakim 4cb2c55025 Filter test from web interface now replicates behaviour from pull #167 12 years ago
syrnon bfc24f3794 Update atom.php 12 years ago
syrnon deeeee76d2 Update feedparser.php 12 years ago
Andrew Herron c65bd1027a Added alt and meta key handling to hotkeys 12 years ago
Andrew Herron d999bc3eb2 prevent accidental ctrl_key global 12 years ago
Konstantin Ufimtsev af26179d15 getting last_marked value from starred.json 12 years ago
shibuya246 ab10707fac add <source><title> to feed rss output 12 years ago
shibuya246 29a963c14f add <source><title> to feed rss output 12 years ago
justauser ef3a8db1cc Merge remote-tracking branch 'origin' into hookhead
update to latest
12 years ago
justauser 575a52874c fixed a typo 12 years ago
justauser 48c8e72008 Add some explanaiton in the example about the content_preview field 12 years ago
justauser 6763143835 Changed the implementation of HOOK_QUERY_HEADLINES to deal with issue Fox raised 12 years ago
Andrew Dolgov 776b19536d Merge pull request #243 from d7415/master
image.php: Remove possible leading line from images
12 years ago
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>
12 years ago
Andrew Dolgov 4f62f8f6dc add js hook for floating title 12 years ago
Andrew Dolgov fac0964053 do not show lone dash in collapsed cdm when content preview is disabled 12 years ago
justauser 2e18843845 one more change to merge to origin 12 years ago
justauser 0708046b4f change for HOOK_QUERY_HEADLINES. See example for details. 12 years ago
justauser 7171f32dc5 Merge remote-tracking branch 'origin' into hookhead
Conflicts:
	classes/feeds.php

fix for merging up to the origin
12 years ago
justauser 891e36f57e Changes to add a new hook: HOOK_QUERY_HEADLINES. An example is provided. 12 years ago
Andrew Dolgov ce920ec148 Merge pull request #239 from craywolf/fixversion
Fix version in preferences footer
12 years ago
craywolf 3cda9e2a40 Fix version in preferences footer 12 years ago
Andrew Dolgov 72f133bb06 add experimental counterNode text shadow 12 years ago
Andrew Dolgov 3cd5511b32 another counter node positioning hack 12 years ago
Andrew Dolgov d97efc9967 floicon wrapper: fix short tag 12 years ago
Andrew Dolgov ba2463069f replace floIcon with jimIcon from https://github.com/jimparis/jimIcon 12 years ago