Commit Graph

689 Commits

Author SHA1 Message Date
Andrew Dolgov a290e9ea2e fix crash in filter preferences 2013-07-10 20:39:57 +04:00
Andrew Dolgov 6bd7913e20 Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS 2013-07-10 16:56:11 +04:00
Andrew Dolgov c052e25a8b remove unused cached_content 2013-07-10 16:55:55 +04:00
Andrew Dolgov 4ab1eb9c94 move reassigning content_preview after hook to a more sensible place 2013-07-10 16:52:03 +04:00
Andrew Dolgov 4f2a2ca945 api: fix typo 2013-07-10 16:44:36 +04:00
Andrew Dolgov f48d89fd58 Merge branch 'hookhead' of git://github.com/justauserx/Tiny-Tiny-RSS into justauserx-hookhead 2013-07-10 16:41:48 +04:00
Andrew Dolgov 6371963dbc use error image for feed errors in headlines toolbar 2013-07-10 14:18:24 +04:00
Andrew Dolgov 06a39024dd plugin list: fix system plugins image position 2013-07-10 13:11:40 +04:00
Andrew Dolgov 2f20dd58d2 integrate silk icons by Mark James 2013-07-10 13:09:12 +04:00
Andrew Dolgov 0156128702 catch warning when removing source element 2013-07-10 12:50:42 +04:00
justauser 425a6edc6b forgot one file 2013-07-10 04:24:29 -04:00
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
Julien Tardot 39119f0216 Correct feed ID in feeds self URL. 2013-07-07 11:55:06 +02: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
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 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
shibuya246 ab10707fac add <source><title> to feed rss output 2013-07-01 19:53:27 +09:00
justauser 575a52874c fixed a typo 2013-06-29 03:11:38 -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 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 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 b584460302 parser: remove atom <source> element 2013-06-25 14:43:59 +04:00
Andrew Dolgov bc3c887f4f better root element detection for atom content type xhtml (closes #720) 2013-06-20 21:16:06 +04:00
Andrew Dolgov a9000b0344 feedparser: check if initial xpath query for root element returns anything 2013-06-19 19:40:36 +04:00
Roland Angerer 0806d68bac bugfix: list correct profile IDs on login page 2013-06-13 11:24:51 +02:00
Andrew Dolgov da8d534ac1 minor user editor updates 2013-06-11 12:12:43 +04:00
Andrew Dolgov d9afd9b2b5 use dojo stuff for user details 2013-06-11 12:11:02 +04:00
Andrew Dolgov 808ef3d4fc pref-users: remove useless javascript: prefix 2013-06-11 12:05:45 +04:00
Andrew Dolgov 222a61c222 user editor: use dojo stuff 2013-06-11 12:04:29 +04:00
Andrew Dolgov d256f1fbd8 atom: support <published> 2013-06-10 13:25:34 +04:00
Andrew Dolgov 496195db4e fix calculation of feed counts in pref-feeds editor 2013-06-07 15:31:43 +04:00
Andrew Dolgov 08820be70b add experimental floating title when scrolling long articles in combined mode 2013-06-05 22:20:22 +04:00
Andrew Dolgov a1495542fc opml: fix filter parameters inverse and title not being properly imported from OPML 2013-06-05 13:09:47 +04:00
Andrew Dolgov 25051fb84b support custom order in generated feeds (closes #709) 2013-06-05 12:56:43 +04:00
Andrew Dolgov ce5d234d63 support dc:date elements in rss and atom feeds 2013-06-01 09:49:56 +04:00
Jonathan Bither fbe135fb36 mysqli: We are using procedural mysqli so use mysqli_connect_error() instead of mysqli_error() 2013-05-30 10:45:47 -04:00
justauser 7aab5617b6 Merge branch 'master' into jremote
latest master checkins
2013-05-29 07:52:20 -04:00
Andrew Dolgov 67e0cf9a37 add startup_gettext() calls to several endpoints for unregistered users so the output would be translated based on accept-language header 2013-05-29 15:41:19 +04:00
justauser 991418fa56 Merge branch 'master' into jremote
update working to master
2013-05-28 11:39:58 -04:00