1
0
mirror of https://tt-rss.org/git/tt-rss.git synced 2024-07-02 12:50:52 +02:00
Commit Graph

313 Commits

Author SHA1 Message Date
Andrew Dolgov
02f3992a5a Revert "Revert "filters: support matching on multiple feeds/categories""
This reverts commit f5d174bda9.
2017-07-02 20:37:52 +03:00
Andrew Dolgov
f5d174bda9 Revert "filters: support matching on multiple feeds/categories"
This reverts commit 0bf7e007bb.
2017-07-02 20:37:01 +03:00
Andrew Dolgov
e0f51d786f Merge branch 'master' of git.fakecake.org:tt-rss 2017-07-02 20:27:31 +03:00
Andrew Dolgov
0bf7e007bb filters: support matching on multiple feeds/categories
opml: update filter export/import for new format
2017-07-02 20:27:21 +03:00
Andrew Dolgov
c053b97697 pref/feeds: start user category ordering from 1
api, getFeeds: send subcategory order_id
2017-06-26 16:29:57 +03:00
Andrew Dolgov
e130b283a7 db prefs: ignore cache when preference requested for specified UID (in case cached value of a different profile is stored)
prefs: show (and set) enabled plugins for default profile only
2017-06-24 14:29:07 +03:00
Andrew Dolgov
5b6ea1ef91 remove pubsubhubbub: dead 2017-05-16 10:41:20 +03:00
Andrew Dolgov
c114a2596f move add_feed_url() to pref_feeds 2017-05-11 09:07:49 +03:00
Andrew Dolgov
e6c886bf66 wrap rssfuncs into rssutils class 2017-05-05 18:10:07 +03:00
Andrew Dolgov
7c9b5a3fe4 move label stuff to Labels class
fix some unresolved functions
2017-05-04 15:57:40 +03:00
Andrew Dolgov
2ed0d6c433 move counter cache to a separate class
fix references to get_article_tags
2017-05-04 15:22:57 +03:00
Andrew Dolgov
a230bf88a9 move to Article:
+       static function purge_orphans($do_output = false) {

move to Feeds

+       static function getGlobalUnread($user_id = false) {
+       static function getCategoryTitle($cat_id) {
+       static function getLabelUnread($label_id, $owner_uid = false) {
2017-05-04 15:00:21 +03:00
Andrew Dolgov
86a8351ca2 move the following to Feeds:
+       static function catchup_feed($feed, $cat_view, $owner_uid = false, $mode = 'all', $search = false) {
+       static function getFeedArticles($feed, $is_cat = false, $unread_only = false,
+       static function subscribe_to_feed($url, $cat_id = 0,
+       static function getFeedIcon($id) {
+       static function getFeedTitle($id, $cat = false) {
+       static function getCategoryUnread($cat, $owner_uid = false) {
+       static function getCategoryChildrenUnread($cat, $owner_uid = false) {
2017-05-04 14:50:56 +03:00
Andrew Dolgov
ea79a0e033 remove some redundant php closing tags 2017-04-26 20:24:18 +03:00
Andrew Dolgov
7b55001eee fix various issues reported by static analysis
update gitlab-ci config
2017-04-26 15:29:22 +03:00
Andrew Dolgov
9c3c0ace6b rename cache images option label (rip translations) 2017-03-23 15:16:31 +03:00
Andrew Dolgov
1bfe1d7b31 simplify error handling
* less convoluted exception dialogs
* use window.onerror for the majority of exception catching/reporting
* remove most of now useless try/catch blocks
* report stacktrace instead of manually specified error locations
2017-03-04 14:34:44 +03:00
Jérémy DECOOL
ba2853caac Prevent target='_blank' vulnerability on dynamic link 2017-02-12 11:01:36 +01:00
Andrew Dolgov
328118d12e use print_hidden() for hidden dojo form fields 2017-02-10 14:36:21 +03:00
Andrew Dolgov
22387de225 preferences: set themes dropdown to default if selected theme is missing 2017-01-26 22:37:22 +03:00
Andrew Dolgov
e432b8fbe2 implement cache-busting for default theme.css
night theme: small fixes
2017-01-25 12:17:41 +03:00
Andrew Dolgov
967f0619c7 force ngettext() count argument type to string 2017-01-22 10:18:43 +03:00
Andrew Dolgov
84012df5cd prefs: auto expand feed tree 2017-01-21 22:33:23 +03:00
Andrew Dolgov
17a8e61d2a deprecate encrypted feed passwords because mcrypt is getting removed from php 7.1
1. transparent decryption for existing installs stays for the time being
2. new passwords are not going to be encrypted even if FEED_CRYPT_KEY is defined
3. added update.php --decrypt-feeds to bulk decrypt existing encrypted passwords
4. updated install to not auto-generate crypt key
5. added warning to config.php-dist
2017-01-07 14:25:46 +03:00
Andrew Dolgov
a84fb943b4 pre-users: disallow renaming admin user 2016-08-17 17:54:27 +03:00
Andrew Dolgov
ec21abb85d update autocomplete to "new-password" 2016-05-18 12:43:56 +03:00
Andrew Dolgov
fa0e0ef315 set feed editor password fields to autocomplete=off 2016-05-18 12:31:25 +03:00
Andrew Dolgov
4f100ece19 pref_filters: sort rules by reg_exp when displaying index 2016-02-19 18:52:54 +03:00
Andrew Dolgov
67f3e3f942 pref-labels: remove obsolete searching code 2016-01-30 13:03:00 +03:00
Andrew Dolgov
9def554082 pref-feeds: allow searching by feed_url 2016-01-30 13:02:15 +03:00
Andrew Dolgov
a5556c2471 fix item_id not being properly escaped in pref_feeds::process_category_order() (possible sql injection) 2016-01-29 17:24:59 +03:00
Andrew Dolgov
312742db6e updates: auto-disable CURL if open_basedir is enabled, notify possible issues w/ plugins 2016-01-13 18:12:31 +03:00
Andrew Dolgov
5bdcb8fd78 remove option ALLOW_DUPLICATE_POSTS as confusing/useless 2016-01-07 22:01:35 +03:00
Andrew Dolgov
b8619f8db0 store formatted backtrace to sql log 2015-12-04 15:58:20 +03:00
Andrew Dolgov
1bd552ee31 compat patches for php7 2015-12-04 09:29:58 +03:00
Andrew Dolgov
154f14d01b filters: do not strip_tags() on regexps 2015-12-03 10:17:32 +03:00
Andrew Dolgov
583f163f40 don't init plugins when loading everything to make a list, duh 2015-10-08 17:02:32 +03:00
Andrew Dolgov
77e8100669 add date suffixes to opml & import_export generated files 2015-09-21 12:45:25 +03:00
Andrew Dolgov
9a35ed6709 disable filter test result highlighting for the time being 2015-09-15 20:55:08 +03:00
Andrew Dolgov
dbeef0ca67 filter preview: remove unnecessary checkbox 2015-09-11 13:31:30 +03:00
Andrew Dolgov
f48f292d2b tweak filter preview layout a bit; allow previewing matched articles in a popup 2015-09-11 13:05:08 +03:00
Andrew Dolgov
261226a3a5 mostly implement async filter test dialog 2015-09-09 22:09:03 +03:00
Andrew Dolgov
a007c18dff wip: filter async testing 2015-09-09 16:56:04 +03:00
Andrew Dolgov
e17079dcef make disabled filter rules easier to discern
show if filter set match_any_rule on the overview
2015-08-17 12:33:07 +03:00
Andrew Dolgov
73dfda1da6 various minor style updates, add danger buttons 2015-08-13 13:06:03 +03:00
Andrew Dolgov
d98779972d tabbed feed editor 2015-08-12 20:35:53 +03:00
Andrew Dolgov
bf9cc9ad95 combine user edit & user details 2015-08-12 20:19:38 +03:00
Andrew Dolgov
f232aa5a34 remove num_articles from main pref_users query 2015-08-12 18:24:16 +03:00
Andrew Dolgov
f9c1f8b0d4 pref-feeds: check for inactive feeds asynchronously 2015-08-12 16:19:42 +03:00
Andrew Dolgov
1edff0d439 user manager: show stored feeds/articles 2015-08-12 16:01:47 +03:00
Andrew Dolgov
b028da0a2d display lack of filter plugin actions properly 2015-08-12 12:11:12 +03:00
Andrew Dolgov
b87744534a add plugin-based filter actions (see example plugin in attic)
bump schema
2015-08-11 23:28:42 +03:00
Andrew Dolgov
314956d440 filter test dialog fixes for filters w/ many rules 2015-08-11 19:13:08 +03:00
Andrew Dolgov
fb8a032a6b minor textarea fixes 2015-08-11 18:44:07 +03:00
Andrew Dolgov
e79e274fc8 add styles for several other dijit elements 2015-08-11 16:41:05 +03:00
Andrew Dolgov
91837f0a2a update site_url (and title if needed) when changing feed_url in feed editor 2015-08-10 15:14:38 +03:00
Andrew Dolgov
df659891ac implement per-feed stemming language setting 2015-08-04 13:32:52 +03:00
Andrew Dolgov
3ceb893f66 add one catchall function to make uniqids/keyhashes/etc used by tt-rss 2015-08-03 19:21:06 +03:00
Andrew Dolgov
9638ec51b6 minor filter test dialog fixes 2015-07-13 12:53:13 +03:00
Andrew Dolgov
077004e470 feed test layout updates 2015-07-13 12:49:02 +03:00
Andrew Dolgov
4f9a3c0e0f Merge branch 'master' of git.fakecake.org:tt-rss
Conflicts:
	classes/pref/filters.php
2015-07-13 12:46:05 +03:00
Andrew Dolgov
c939dfc396 rework filter preview to use native regexp implementation 2015-07-13 12:40:56 +03:00
Andrew Dolgov
f5a0fb8b64 queryFeedHeadlines: move to array-based arguments, optionally check if first element changed when paginating 2015-07-12 01:29:36 +03:00
Andrew Dolgov
5956f312b7 add a bit more visible separate infobox for password change results 2015-07-06 12:10:15 +03:00
Andrew Dolgov
415a3b50c9 fix some minor typos and stuff 2015-06-07 18:41:18 +03:00
Andrew Dolgov
b9634eb8b8 support loading themes from themes.local 2015-06-05 18:08:19 +03:00
Andrew Dolgov
e6c826fa2f remove AUTO_ASSIGN_LABELS (confusing, idiots keep enable it and complain of the results) 2015-02-21 13:08:50 +03:00
Andrew Dolgov
f6cbe9a5a0 require version information in all additional themes 2014-12-09 15:16:53 +03:00
Andrew Dolgov
4a1d122c87 edit feed: smaller buttons for icon upload; allow uploading larger favicons 2014-10-08 16:38:03 +04:00
Andrew Dolgov
0d703c73bd reinstate wrongfully renamed archived feed; properly fix prefs filtertree labels for all feeds (ff5cc7d7) 2014-08-01 13:16:26 +04:00
André Glüpker
d922b09c43 Skip nested Feed when calling getNextUnreadFeed()
This function is only called when using "Mark all as read".
So every time, this function gets called right now, all nested
categories get marked as read as well, so we don't want to jump to them.
Instead we want to the next category with same or higher tier.
2014-06-14 12:37:05 +02:00
Andrew Dolgov
78744d48d7 add FEEDS_SORT_BY_UNREAD to blacklist (removed) 2014-06-10 08:54:18 +04:00
Andrew Dolgov
34899cf9e8 add hidden tunable _DISABLE_INACTIVE_FEEDS 2014-05-22 08:10:24 +00:00
Andrew Dolgov
50e04efdc8 expand filtertree display to make filters easier to distinguish 2014-04-02 08:15:33 +00:00
Andrew Dolgov
b41c5741fe disable OTP on user password reset 2014-03-09 10:33:41 +04:00
Andrew Dolgov
4a80c57c50 remove some unused code reported by phpmd 2014-02-19 15:42:52 +04:00
Andrew Dolgov
ab85ad89b3 otp: use application name in provisioning uri 2014-01-19 00:29:42 +04:00
Andrew Dolgov
4c63934bac increase randomness of shared url keys a bit 2014-01-17 13:41:27 +04:00
Andrew Dolgov
76d78eb2e7 remove unnecessary wrapping from share uniqid() keys 2013-12-24 13:27:57 +04:00
Andrew Dolgov
bf5bcb8e27 queryFeedHeadlines: remove obsolete content_preview 2013-11-29 13:54:30 +04:00
Andrew Dolgov
e7a40490b8 filters: add a link to the wiki page to the rule create/edit dialog 2013-09-02 13:54:56 +04:00
Andrew Dolgov
74175e6ae3 fix filter content previews showing html content 2013-07-14 21:55:14 +04:00
Andrew Dolgov
1a545dcb44 mark feed with error in headlines toolbar, use error icon in feed editor 2013-07-12 12:38:50 +04:00
Andrew Dolgov
41a7a066ef share: move unsharing all articles into the plugin 2013-07-11 14:11:41 +04:00
Andrew Dolgov
a290e9ea2e fix crash in filter preferences 2013-07-10 20:39:57 +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
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
justauser
6763143835 Changed the implementation of HOOK_QUERY_HEADLINES to deal with issue Fox raised 2013-06-28 10:46:45 -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
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
496195db4e fix calculation of feed counts in pref-feeds editor 2013-06-07 15:31:43 +04:00
Andrew Dolgov
610fe11535 add HOOK_PREFS_TAB_SECTION to user manager toolbar 2013-05-22 12:02:43 +04:00
Andrew Dolgov
5bbc4bb4b0 move stylesheets to css/, reference default tt-rss stylesheets from
default.css to make custom themes easier
2013-05-19 21:22:01 +04:00