Commit Graph

650 Commits

Author SHA1 Message Date
Andrew Dolgov f81df37c36 wrap plugin list into border container, like prefs (2) 2018-12-04 15:33:20 +03:00
Andrew Dolgov 0880100f6a wrap plugin list into border container, like prefs 2018-12-04 15:31:21 +03:00
Andrew Dolgov 31e79317b3 normalize various font sizes and families between prefs & main UI
change some dialogs layout a bit to maybe become more readable
2018-12-04 15:22:22 +03:00
Andrew Dolgov 197e80add6 fix several issues related to profile being set to a non-numeric value 2018-12-04 10:47:01 +03:00
Andrew Dolgov 4d4034091a prefs: Prefs global -> Helpers 2018-12-03 12:46:00 +03:00
Andrew Dolgov b3bc638a9f refactor OPML export/import code to be less horrible 2018-12-03 12:26:49 +03:00
wn_ 6f9307aa9a Also fix the 'Create label' `onclick` 2018-12-02 16:15:31 -06:00
Andrew Dolgov 5ead558e43 move Utils to AppBase where it belongs 2018-12-02 22:08:18 +03:00
Andrew Dolgov eeb49d375c uploadIconHandler -> CommonDialogs 2018-12-02 20:57:51 +03:00
Andrew Dolgov 526389b2d3 update notify_* calls to use Notify 2018-12-02 20:56:30 +03:00
Andrew Dolgov d9c5c93cef move some more stuff out of common.js
rework client-side cookie functions a bit
limit dojo cachebust based on server scripts modification time
remove param_escape()
2018-12-02 20:07:57 +03:00
Andrew Dolgov 3a6dae9203 prefs: more of the same, really 2018-12-02 16:29:00 +03:00
Andrew Dolgov b9869dbc01 prefs: remove some more stuff from global context (user management, etc) 2018-12-02 16:17:36 +03:00
Andrew Dolgov 58e54282d3 prefs: move more global functions into matching classes 2018-12-02 15:30:07 +03:00
Andrew Dolgov f26d404890 prefs: move other tree-related functions to respective trees 2018-12-02 12:03:28 +03:00
Andrew Dolgov 60cd467694 embed some pref-feed helper functions into the tree 2018-12-02 11:50:53 +03:00
Andrew Dolgov 2e985d1733 move some label helper functions to prefLabelTree 2018-12-02 11:34:57 +03:00
Andrew Dolgov e23b6e397d prefs: store active tab for reload, remove most old table row functions 2018-12-02 11:25:32 +03:00
Andrew Dolgov 874560db54 remove obsolete row selection functions
move getUrlParam() to Utils
2018-12-02 10:33:58 +03:00
Andrew Dolgov 2f85b50e36 remove toggleSelectListRow2() 2018-12-02 10:16:25 +03:00
Andrew Dolgov 0a18d0b1ed Feeds: shorten some method names
finally rename "view as rss"
2018-12-02 08:57:22 +03:00
Andrew Dolgov 1e2d4410d3 move some more shared stuff to CommonDialogs, Filters, and Utils 2018-12-01 22:39:29 +03:00
Andrew Dolgov 4bed9be57d js-ification: start on some common dialogs 2018-12-01 18:25:32 +03:00
Andrew Dolgov 049a37aa0e WIP reshuffling of JS global context into separate logical objects 2018-12-01 17:05:35 +03:00
Andrew Dolgov 195180b64d minor refactoring: normalize some function names; cleanup; etc 2018-12-01 11:18:35 +03:00
Andrew Dolgov a2ef54cd92 toggleMark, togglePub: refactor implementation
shorten marked/published img CSS classes
2018-12-01 08:20:09 +03:00
Andrew Dolgov 9563e3bcd6 remove expandable CDM headlines 2018-11-30 13:51:54 +03:00
Andrew Dolgov ef129fed2a some more xhrPost refactoring (batchEditSave WIP) 2018-11-30 10:48:50 +03:00
Andrew Dolgov fc0a3050eb use xhrPost is even more places! 2018-11-30 09:23:51 +03:00
Andrew Dolgov c10a43069e debug logging system rework:
* support various logging levels per-message
 * remove hacks like debug_suppress, DAEMON_EXTENDED_DEBUG, etc
 * _debug() is kept as a compatibility shim for plugins
2018-11-30 08:34:29 +03:00
Andrew Dolgov 55bf4bc1d3 mailer: split to/from name/addresses 2018-11-22 16:36:10 +03:00
Andrew Dolgov 57932e1837 remove PHPMailer and related directives from config.php-dist; add pluggable Mailer class 2018-11-22 14:45:14 +03:00
Andrew Dolgov 3a0292303e php: remove trailing whitespaces 2018-11-03 15:08:43 +03:00
Andrew Dolgov d4fef36237 rewrite per-feed/global strip images to strip media 2018-09-07 10:24:46 +03:00
Andrew Dolgov 069aea5989 remove FEED_CRYPT_KEY and everything related to it
always assume auth_pass_encrypted is false
2018-08-13 15:59:24 +03:00
Andrew Dolgov 310c18e6bb move OTPHP to vendor/; additionally move Base32 class to OTPHP namespace 2018-06-20 18:27:34 +03:00
Andrew Dolgov 4fa64e8446 filter dialog: remove placeholder 2018-03-21 14:02:06 +03:00
Andrew Dolgov e794e434da filter dialog: add tooltip re: filter syntax 2018-03-21 13:38:36 +03:00
tsia 551f3c2c85 fixed "reset to defaults" in preferences 2018-03-15 16:26:50 +00:00
Andrew Dolgov 0a8cdd4b9c remove firefox feed subscribe integration code (obsolete) 2018-03-14 18:15:21 +03:00
Andrew Dolgov c9a5e5aa28 feed editor: expose site_url for editing 2018-03-01 15:43:40 +03:00
Andrew Dolgov f1415df47c prefs: expand feed tree if displaying search results 2018-02-26 11:58:53 +03:00
Andrew Dolgov f6269d1bc4 add special class for feeds with disabled updates 2018-02-08 13:54:06 +03:00
Andrew Dolgov a340b29ba9 pref-feeds: disable tree autoexpand 2018-02-04 09:36:56 +03:00
Andrew Dolgov 67bf38afda savefeedorder, savefilterorder: do not use clean() on json payload 2018-02-04 09:33:28 +03:00
Francesco Turco 1a7277570b fix two-factor authenticaton 2017-12-22 12:29:25 +01:00
Andrew Dolgov d0cce0c7a4 isdefaultpassword: use method_exists() to check for check_password 2017-12-15 12:15:15 +03:00
simonp 5f19596651 Fix typo from previous pull request 2017-12-14 18:43:42 +01:00
Benjamin Collet 44c6a04b61 Check if the auth module supports check_password() method before using it 2017-12-14 18:02:37 +01:00
Andrew Dolgov 9390ddeae2 fix single user mode login failing because of isdefaultpassword() 2017-12-14 19:27:55 +03:00
Andrew Dolgov 1bf468ba1a pref-prefs: set button classes 2017-12-11 18:50:00 +03:00
Andrew Dolgov 121ac0481f filter rule/action dialogs: set default action 2017-12-11 18:46:27 +03:00
Andrew Dolgov 05e81655c3 user editor: add primary action 2017-12-11 18:41:32 +03:00
Andrew Dolgov 6fb5ce5e35 add some primary dialog actions; update css 2017-12-11 18:36:36 +03:00
Andrew Dolgov 5f7be9957f filter,label dlg: use default action 2017-12-11 18:23:30 +03:00
Andrew Dolgov f70d456a5b Merge branch 'master' of git.tt-rss.org:git/tt-rss into pdo-experimental 2017-12-11 12:54:30 +03:00
dim0x69 e58a14de72 Check return value from Plugins 2017-12-11 09:41:45 +00:00
Andrew Dolgov e6532439d6 force strip_tags() on all user input unless explicitly allowed 2017-12-03 23:35:38 +03:00
Andrew Dolgov 7c6f7bb0aa fix some minor issues found by code analyzer 2017-12-03 23:08:04 +03:00
Andrew Dolgov 5f5b0de423 style feed icon and opml file upload controls 2017-12-03 22:35:12 +03:00
Andrew Dolgov 7c0eb1b621 add defaultPasswordWarning nag dialog 2017-12-03 20:46:27 +03:00
Andrew Dolgov 2cf93c046c pref-users: fix sorting the table 2017-12-03 13:54:31 +03:00
Andrew Dolgov 187abfe732 main classes: remove sql_bool_to_bool() kludge 2017-12-03 09:35:59 +03:00
Andrew Dolgov 8ff3cbb32e filters: remove sql_bool_to_bool()
checkbox_to_sql_bool: return ints (???)
2017-12-03 09:26:11 +03:00
Andrew Dolgov e4291ba12f otpenable: use pdo prepare() 2017-12-03 09:10:14 +03:00
Andrew Dolgov bfccff11c4 filter rule saving fix 2017-12-02 22:47:47 +03:00
Andrew Dolgov bf6db17b8f feeds: use PDO 2017-12-02 16:07:03 +03:00
Andrew Dolgov 2e52e4fd7a feeds: more PDo stuff 2017-12-02 15:53:32 +03:00
Andrew Dolgov 7a1872c1e0 feeds: more PDO stuff 2017-12-02 15:36:32 +03:00
Andrew Dolgov b5bf9a0ff3 remove long forgotten stuff related to feed debugging actionbar 2017-12-02 15:12:39 +03:00
Andrew Dolgov 91d679667e feeds: PDO progress 2017-12-02 15:04:11 +03:00
Andrew Dolgov da9ea57d1c checkbox to sql bool related changes, some more boolean fixes 2017-12-02 14:07:48 +03:00
Andrew Dolgov 248c62a1cc filters: fix limit/offset for test dialog 2017-12-02 13:54:18 +03:00
Andrew Dolgov bf4a79eaa9 prefs: start PDO switchover 2017-12-02 13:49:35 +03:00
Andrew Dolgov f594717d18 filters: use PDO 2017-12-02 13:28:13 +03:00
Andrew Dolgov 21295a52aa labels: PDO 2017-12-02 12:45:33 +03:00
Andrew Dolgov c2418a559b pref-users: PDO 2017-12-02 12:23:41 +03:00
Andrew Dolgov 93ca6c95b8 pref-system: PDO 2017-12-02 12:03:39 +03:00
Andrew Dolgov 7039370368 pref-prefs: PDO 2017-12-02 12:01:56 +03:00
dim0x69 5395526444 add HOOK_UNSUBSCRIBE_FEED 2017-11-27 11:46:46 +01:00
fox b1d1bc901f Merge branch 'checkbox-feed' of dxbi/tt-rss into master 2017-10-06 06:47:54 +00:00
Felix Eckhofer cc50affb62
Add checkbox for authentication in edit feed dialog
This makes the UI more consistent with the "add feed" dialog and
prevents overzealous password-managers from leaking the login password.
2017-10-06 08:37:37 +02:00
Andrew Dolgov 51b521c326 fix batch feed editor using wrong SQL syntax when saving feed password
remove uses of auth_pass_encrypted in several other places
2017-10-06 09:22:04 +03:00
Andrew Dolgov edefcec19d filters/edit: properly parse feed-specific legacy format filter rules 2017-08-14 22:29:50 +03:00
Andrew Dolgov be61f1c45c filters dialog: do not break markup on long feed names 2017-07-09 16:39:25 +03:00
Andrew Dolgov 667d32fd26 remove obsolete forum plugin links
mention how to enable system plugins in the UI
2017-07-04 16:28:45 +03:00
Andrew Dolgov 7b994e4bec filters: when adding rule select all feeds by default 2017-07-02 22:55:36 +03:00
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
Andrew Dolgov 8429af52be adjust previous patch phrasing a bit 2013-05-19 11:27:17 +04:00
Mike Frysinger 5bac322258 document the date format string
I assumed the format string was related to strftime except all of the
fields looked really weird.  After digging in the code, this string is
actually used with php's date().  Add a note for this so other people
can jump quickly to the relevant documentation (which is useful for
non-php peeps who have no idea what this is).
2013-05-19 03:19:55 -04:00
Andrew Dolgov c594eca0de implement additional counter mode for virtual feeds when there's 0 unread articles 2013-05-16 01:08:04 +04:00
Andrew Dolgov 11334fdf6c make appearance of some preference panes more similar 2013-05-12 12:36:25 +04:00
Andrew Dolgov d29357fa02 fix more hphp detected issues 2013-05-07 15:18:37 +04:00
Rasmus Lerdorf 6f7798b643 Fixing bugs found by static analysis 2013-05-07 00:35:10 -07:00
Andrew Dolgov e5e6cde06a remove support for hiding empty categories in prefs editor because people are dumb 2013-05-06 12:50:52 +04:00
Andrew Dolgov 0e72dbd79e Merge pull request #179 from nottwo/$link-cleanup
Remove obsolete $link parameter for password reset
2013-05-05 21:06:43 -07:00
Andrew Dolgov 8d090a910b use css nth-child instead of old even/odd class hacks for normal mode 2013-05-04 12:01:53 +04:00
Trannie Carter 233b74ad22 Remove obsolete $link parameter for password reset 2013-05-03 20:44:24 -04:00
Andrew Dolgov 52e7b5a096 add clear sql log button 2013-04-29 23:12:54 +04:00
Andrew Dolgov 258068b379 do not calculate favicon color on manual icon replace 2013-04-29 16:09:03 +04:00
Andrew Dolgov bd02d29e1b prefs: update some descriptions to be more consistent 2013-04-29 15:58:15 +04:00
Andrew Dolgov 7b149552cb remove language selector from the login form, store language in the database per-user 2013-04-29 15:54:23 +04:00
Andrew Dolgov e57a1507ae do not use session cookie lifetime for additional cookies 2013-04-29 13:03:28 +04:00
Andrew Dolgov a845a3d5e5 otp: display notice if GD is missing 2013-04-29 09:20:30 +04:00
Andrew Dolgov 8cefe38a0a add HOOK_PREFS_SAVE_FEED 2013-04-26 14:23:18 +04:00
Andrew Dolgov 057177eb2c add HOOK_PREFS_EDIT_FEED 2013-04-26 14:21:08 +04:00
Andrew Dolgov b367c951b9 make logging configurable; add logging to syslog 2013-04-19 09:45:43 +04:00
Andrew Dolgov 48ed517e8d pref_prefs: remove second argument from the constructor 2013-04-19 08:40:19 +04:00
Andrew Dolgov 1ffe3391f9 make pluginhost a singleton 2013-04-18 12:27:34 +04:00
Andrew Dolgov 52d88392da move db-prefs to OO 2013-04-18 12:00:01 +04:00
Andrew Dolgov d9c85e0f11 classes: use OO DB interface 2013-04-17 20:12:14 +04:00
Andrew Dolgov 01568557b5 log viewer: add refresh button 2013-04-17 19:00:15 +04:00
Andrew Dolgov a42c55f02b fix blank character after opening bracket in function calls 2013-04-17 18:34:18 +04:00
Andrew Dolgov 72ff013729 fix pluginhost created without dbh 2013-04-17 18:30:22 +04:00
Andrew Dolgov 6322ac79a0 remove $link 2013-04-17 16:48:41 +04:00
Andrew Dolgov 2cbdc95bb0 add a separate tab for the logger 2013-04-17 08:42:39 +04:00
Andrew Dolgov 9deca86d96 require entering current one time code to enable otp 2013-04-16 21:07:26 +04:00
Andrew Dolgov a5680acbe8 replace split with explode 2013-04-16 20:40:23 +04:00
Andrew Dolgov 4e53956add implement error log viewer 2013-04-16 20:16:15 +04:00
Andrew Dolgov bc7a144dd5 properly remove and replace favicon color when favicon gets manually removed/uploaded 2013-04-15 18:22:48 +04:00
Andrew Dolgov 41694a956d fix double-escaping possible with encrypted passwords 2013-04-13 18:58:09 +04:00
Andrew Dolgov 044cff2d74 implement basic feed authentication parameter encryption in the database (FEED_CRYPT_KEY) 2013-04-13 18:24:41 +04:00
Andrew Dolgov 3306daecf4 implement upload-related support for open_basedir 2013-04-11 19:12:00 +04:00
Andrew Dolgov 723bcdb213 update description of DEFAULT_UPDATE_INTERVAL (2) 2013-04-09 22:28:06 +04:00
Andrew Dolgov 3ddbefabef update description of DEFAULT_UPDATE_INTERVAL 2013-04-09 22:18:59 +04:00
Andrew Dolgov b1df14d0ec do not rely on feed_id when adding archived feed while unsubscribing 2013-04-08 13:58:48 +04:00
Andrew Dolgov 2714d5caa3 fix batch subscribe eating CRs (closes #667) 2013-04-05 09:08:28 +04:00
Andrew Dolgov bf87833884 fix prefs reset not working properly 2013-04-05 07:52:50 +04:00
Andrew Dolgov 29c8fa080e add language dropdown to prefs 2013-04-04 18:15:37 +04:00
Andrew Dolgov 122e9d788e add a dropdown button action to save and exit prefs (closes #660) 2013-04-04 14:53:36 +04:00
Andrew Dolgov 8ef9645da0 pref-prefs: add help for USER_CSS_THEME 2013-04-02 21:41:30 +04:00
Andrew Dolgov 9db8e60784 update pref descriptions 2013-04-02 16:46:08 +04:00
Andrew Dolgov 5f462963a0 remove blank string gettext invocations 2013-04-02 16:38:12 +04:00
Andrew Dolgov dfad9d7a36 pref-prefs: don't use schema-defined help/desc/section names 2013-04-02 16:20:43 +04:00
Andrew Dolgov f17cac6b26 retire DEFAULT_ARTICLE_LIMIT, infinite scrolling is fast enough to make it superfluous 2013-04-02 15:32:47 +04:00
Andrew Dolgov 195187c490 rpc: move several feed-related calls to pref-feeds 2013-04-02 14:47:43 +04:00
Andrew Dolgov 96e3ae8cce move batchAddFeeds to pref-feeds 2013-04-02 14:32:10 +04:00
Andrew Dolgov 0671359f28 make show empty cats menu item more visible, move unsubscribe to feeds dropdown 2013-04-02 08:55:35 +04:00
Andrew Dolgov 977580a41c remove obsolete xml stuff in pref-users infoboxes 2013-04-01 18:28:47 +04:00
Andrew Dolgov 1a293f10ab improve filter overview display; replace ngettext with php gettext 2013-04-01 16:06:04 +04:00
Andrew Dolgov 201bb1ca54 move batchSubscribe to pref-feeds 2013-04-01 12:36:57 +04:00
Andrew Dolgov 9d76e75451 move editPrefProfiles to pref-prefs 2013-04-01 12:34:49 +04:00
Andrew Dolgov 00e347410e move customizeCSS to pref-prefs 2013-04-01 12:30:34 +04:00
Andrew Dolgov fb54e3b188 remove xml stuff from backend/dlg 2013-04-01 10:47:41 +04:00
Andrew Dolgov f041932021 pref-filters: fix overview load order 2013-04-01 08:56:46 +04:00
Andrew Dolgov b895510f5c mark filters with no caption in overview 2013-04-01 08:54:20 +04:00
Andrew Dolgov 442bca2752 filters: make caption required (fix) 2013-04-01 08:49:00 +04:00
Andrew Dolgov 4aa1e31e4e filters: make caption required 2013-04-01 08:46:01 +04:00
Andrew Dolgov a86ba0a67a implement filter drag and drop sorting 2013-03-31 17:15:23 +04:00
Andrew Dolgov da46d21e88 simplify filter overview 2013-03-31 16:52:33 +04:00
Andrew Dolgov 18ad09af01 implement filter titles 2013-03-31 16:40:24 +04:00
Andrew Dolgov aa5ac2cd3a do not create duplicate archived feeds on unsubscribe, file entries into already existing archive entry 2013-03-30 21:45:24 +04:00
Andrew Dolgov 5d40efc9b0 add ability to select CSS files in themes/ 2013-03-28 21:04:29 +04:00
Andrew Dolgov 8aa01d7989 disable SORT_HEADLINES_BY_FEED_DATE; replace with a toolbar newest first order 2013-03-28 20:51:06 +04:00
Andrew Dolgov b9a06a0e39 retire frankly ridiculous sorting by score/title/date/default
keep defaul and oldest first instead of REVERSE_HEADLINES
2013-03-28 20:44:43 +04:00
Andrew Dolgov 66ca7c3097 api: add include_empty to getCategories/getFeedTree 2013-03-28 15:28:37 +04:00
Andrew Dolgov fcef9eeae0 remove dialogNotice; tweak dialog appearance a bit 2013-03-28 14:01:25 +04:00
Andrew Dolgov 483f15d538 update utility.css related stuff some more 2013-03-28 13:19:28 +04:00
Andrew Dolgov 0bb5833beb api: add getFeedTree 2013-03-28 11:04:27 +04:00
Andrew Dolgov 6deafe90db modify notify/warn/error boxes css 2013-03-27 22:03:55 +04:00
Andrew Dolgov bb5e1a328d enable 4th field in plugin->about() to serve as a more info link 2013-03-27 18:16:30 +04:00
Andrew Dolgov 65f85248ce pref-prefs: mention tt-rss forums as a plugin source 2013-03-27 16:24:43 +04:00
Andrew Dolgov a413f53ebf add experimental base for plugin vfeeds (3 pane mode not yet
implemented)
2013-03-27 16:15:25 +04:00
Andrew Dolgov c72069b098 pref_users: do not escape password to prevent special character
mishandling; remove inconsistent trimming of passwords
2013-03-27 13:47:35 +04:00
Andrew Dolgov 33b3db3372 for consistency, show hotkey-toggleable options relating to headlines list in preferences 2013-03-27 12:42:01 +04:00
Andrew Dolgov 744a1b0080 disable show additional preferences checkbox as repeatedly confusing 2013-03-27 12:29:51 +04:00
Andrew Dolgov f822a8e56c experimentally rebase labels; make base index configurable 2013-03-27 09:40:07 +04:00
Andrew Dolgov ec1f8a3d8a fix inverse rule to only mean negative regexp matching except for whole rule (refs #631) 2013-03-25 20:09:37 +04:00
Andrew Dolgov bcd4d24086 getFilterName: only show inverse rules as actually inverse 2013-03-25 19:58:37 +04:00
Andrew Dolgov a3a896a127 let us rejoice on being able to create double negative filters (refs #631) 2013-03-25 19:46:43 +04:00
Tomas Chvatal 9a73994c5e Allow translation of notices in prefs. 2013-03-24 21:24:24 +04:00
Andrew Dolgov 8850646ff3 Merge pull request #77 from scarabeusiv/master
Fix pluralized forms and whitespace in translations and fix the l10n tools
2013-03-24 09:00:55 -07:00
Tomas Chvatal 1844694351 gettext whitespace fix 2013-03-24 13:37:40 +01:00
Tomas Chvatal f5c1fef9cd Fix plural forms on feed count. 2013-03-24 12:55:53 +01:00
Andrew Dolgov efc6553da4 api: implement subscribeToFeed/unsubscribeFeed (closes #623) 2013-03-24 14:28:43 +04:00
Andrew Dolgov 68fb3c955a update reset user password to use ttrssMailer 2013-03-23 09:20:16 +04:00
Andrew Dolgov f43e9e97a5 add basic password recovery thing 2013-03-22 14:50:02 +04:00
Andrew Dolgov 3972bf5981 db_escape_string: specify link parameter for consistency; sessions: do not force-close db connection in _close() 2013-03-22 09:14:55 +04:00
Joschasa ca5d9be49f Remove deprecated $match_on 2013-03-21 00:36:30 +01:00
Andrew Dolgov 451ff72289 rework pref-prefs to use checkboxes 2013-03-19 23:14:23 +04:00
Andrew Dolgov bfd61d3f85 rework STRIP_IMAGES to remove embedding; add per-feed control over embedded images (bump schema) 2013-03-19 22:41:10 +04:00
Andrew Dolgov e9f42579a3 fix boolean wrapped as a string literal passed when saving user (closes #568) 2013-03-18 17:53:53 +04:00
Andrew Dolgov f01c8ec4f1 prevent absolutely useless 'exploit' (not really) while editing filters (closes #572) 2013-03-17 14:55:55 +04:00
Andrew Dolgov 8349a32e75 remove cache_content remnants 2013-03-16 16:11:58 +04:00
Stephen Hill 9bb6811d2a Input didn't have a type.
This pasword input didn't have type="input". Now it does.
2013-03-15 14:54:39 +00:00
Andrew Dolgov 350e3944d4 fix uploadicon() returning wrong content-type (closes #543) 2013-02-28 09:17:17 +04:00
Andrew Dolgov f4c02a157a fix warning when saving plugins with 0 plugins enabled (closes #542) 2013-02-28 09:13:00 +04:00
Andrew Dolgov 88918ca637 remove server-side feedtree collapse implementation 2013-02-27 15:34:13 +04:00
Andrew Dolgov 5321e775f9 remove update on checksum change (updated status has been removed); rtl stuff (unused) 2013-02-26 19:20:58 +04:00
Andrew Dolgov 81c54e3d8d only allow clearing data of active plugins 2013-02-23 21:27:50 +04:00
Andrew Dolgov 0a3fd79b0e fix image caching not working on plugin-rewritten content; remove content cache stuff 2013-02-04 13:00:50 +04:00
Andrew Dolgov 96f0a3e79d remove themes/ 2013-01-23 15:36:32 +04:00
Andrew Dolgov a6a9b81264 split remove_feed_* stuff to pref/feeds 2013-01-22 22:38:18 +04:00
Andrew Dolgov 87d7e8507a split some more functions from functions.php 2013-01-22 22:32:17 +04:00
Andrew Dolgov 5cb1730648 pref-filters: mention native-regexp difficulties in testing window 2013-01-22 13:34:02 +04:00
Andrew Dolgov 1b03e1deb6 feed editor: hide cache content option 2013-01-22 12:16:17 +04:00
Andrew Dolgov 2ec1e00e2d add bookmarklets plugin 2012-12-30 23:44:53 +04:00
Andrew Dolgov 715a8239ac fix feedEditor not saving 2012-12-27 21:50:56 +04:00
Andrew Dolgov 5d9abb1e11 add plugin storage table to schema; add ability to clear plugin data 2012-12-27 19:20:36 +04:00
Andrew Dolgov 0f28f81f89 move authentication modules to plugins/ 2012-12-27 15:14:44 +04:00
Andrew Dolgov 699daf5856 add several HOOK_PREFS_TAB_SECTION hook points 2012-12-27 01:13:18 +04:00
Andrew Dolgov 84391d6948 update user editor a bit 2012-12-25 18:20:33 +04:00
Andrew Dolgov 65d1e2501b plugins web list style tweaks 2012-12-25 12:31:07 +04:00
Andrew Dolgov 23be0bd3fb hide example plugins from the admin page 2012-12-25 10:08:49 +04:00
Andrew Dolgov d2a421e3cb more work on user-selectable plugins; properly process system and user plugins 2012-12-25 10:02:08 +04:00
Andrew Dolgov de612e7a38 experimental support for per-user plugins (bump schema) 2012-12-25 00:45:10 +04:00
Andrew Dolgov 6c2637d973 move data import/export to a separate plugin 2012-12-24 15:03:19 +04:00
Andrew Dolgov 19b3992b78 remove magpie, fix article filter plugins 2012-12-24 13:45:34 +04:00
Andrew Dolgov 6cbe53c9f5 add instances plugin 2012-12-23 23:36:07 +04:00
Andrew Dolgov 5cedb389d2 split self-updater gui to updater/ plugin 2012-12-23 18:07:41 +04:00
Andrew Dolgov 6065f3ad63 add support for plugins in prefs 2012-12-23 16:15:34 +04:00
Andrew Dolgov 87764a50cf implement ttrss_feeds.cache_content 2012-11-23 13:22:34 +04:00
Andrew Dolgov 7b28a98697 several translation fixes, update translations 2012-11-22 16:07:40 +04:00
Andrew Dolgov 49b2401e0d savefeedorder: properly process Uncategorized 2012-11-06 15:48:47 +04:00
Andrew Dolgov 32532f1c0f improve status reporting for linked feeds 2012-10-31 16:15:29 +04:00
Andrew Dolgov 1b4d1a6b44 sharepopup: implement assigning labels while sharing 2012-10-31 12:55:24 +04:00
Andrew Dolgov 92c14e9d53 move article filter functions to rssfuncs.php 2012-10-30 12:11:46 +04:00
Andrew Dolgov 56b2a4095b filter dialog: sort rules by reg_exp 2012-10-25 12:24:24 +04:00
Andrew Dolgov c719943aa9 fix testing of author filter type 2012-10-19 12:53:24 +04:00
Andrew Dolgov d1e31c7a74 Revert "only enable OTPHP on php version 5.3+"
This reverts commit 1835f145a8.
2012-09-15 17:17:44 +04:00
Andrew Dolgov 6e0ee8336f do not use prefs_feed_search when displaying main UI feedtree 2012-09-15 16:24:00 +04:00
Andrew Dolgov bc6fa2364b move inactiveFeeds and feedsWithErrors to pref-feeds; fix element id collisions 2012-09-14 12:30:04 +04:00
Andrew Dolgov 1835f145a8 only enable OTPHP on php version 5.3+ 2012-09-14 02:52:49 +04:00
Andrew Dolgov f393dc6fb2 pref-feeds: disable show empty cats when searching 2012-09-13 12:54:11 +04:00
Andrew Dolgov 17c755f048 fix pref-feeds search 2012-09-13 12:47:09 +04:00
Andrew Dolgov 97acbaf190 login system fixes
remove old-style session checking from backend.php
move outside subscription endpoint to public.php, change subscription
bookmarklet
2012-09-10 19:01:06 +04:00
Andrew Dolgov 8361e72478 implement sharing of arbitrary stuff using bookmarklet and API call, bump API version 2012-09-09 16:05:59 +04:00
Andrew Dolgov b8386ad3d1 disable OTP when saving user 2012-09-09 12:39:04 +04:00
Andrew Dolgov 304aadb907 remove twitter-specific code 2012-09-07 10:23:46 +04:00
Andrew Dolgov 3ca8af7fd8 require entering password before enabling/disabling otp 2012-09-04 12:39:33 +04:00
Andrew Dolgov 973392b9f5 pref-prefs/otpqrcode: do not show image if otp is enabled 2012-09-03 18:42:17 +04:00
Andrew Dolgov fb70f26ed9 implement one time passwords using TOTP 2012-09-03 18:33:46 +04:00
Andrew Dolgov fd26d5bfdf implement removing selected categories 2012-09-03 16:06:24 +04:00
Andrew Dolgov 4e02f58294 implement filter testing 2012-09-03 15:05:43 +04:00
Andrew Dolgov ff34bac2bf fix filter newrule reg_exp length 2012-08-31 17:45:07 +04:00
Andrew Dolgov ab564aef7b filterEditDlg: automatically open new rule dialog when active feed or article title present 2012-08-31 17:33:22 +04:00
Andrew Dolgov 84d9750edc show label color indicators in pref-filters 2012-08-31 15:40:19 +04:00
Andrew Dolgov 04e41840fe use dijit.form.CheckBox in filter edit dialog 2012-08-31 15:26:11 +04:00
Andrew Dolgov 69c6e94d35 implement basic filter search 2012-08-31 15:14:12 +04:00
Andrew Dolgov e8b703878d fix preffiltertree layout being wrong 2012-08-31 13:00:23 +04:00
Andrew Dolgov 37f78940d8 block type 5 filters (date) 2012-08-31 12:54:37 +04:00
Andrew Dolgov c2ee5846fa fix getfiltertree enabled on psql 2012-08-31 12:27:50 +04:00
Andrew Dolgov 5451903ce3 fix cat_filter parsed wrong on psql 2012-08-31 12:24:13 +04:00
Andrew Dolgov 6aff784575 implement multiple rule/action filters 2012-08-31 12:13:47 +04:00
Andrew Dolgov f9ebb32ca0 hide more obscure preferences under "show more" checkbox in pref-prefs,
bump schema
2012-08-30 13:10:28 +04:00
Andrew Dolgov 5417fbd77e implement recently read vfeed (-6) 2012-08-27 10:08:11 +04:00
Andrew Dolgov 4c9d0490c6 rework filter dialog to make feed/category selection easier 2012-08-26 12:36:08 +04:00
Andrew Dolgov 808dd053c6 implement web-based self updater (closes #395) 2012-08-23 22:56:04 +04:00
Andrew Dolgov 1280612515 self-update: update up to date prompt 2012-08-23 22:02:29 +04:00
Andrew Dolgov 27211afe92 implement experimental web-based updater 2012-08-23 20:23:19 +04:00
Andrew Dolgov 369dbc19d6 rework class system to use subdirectories
add placeholder plugin/hook system
2012-08-17 14:22:33 +04:00