Commit Graph

6671 Commits

Author SHA1 Message Date
Andrew Dolgov 0f9067450a Revert "do not unlink lockfiles (closes #703)"
This reverts commit 9ffe8907dd.
2013-06-07 09:27:52 +04:00
Andrew Dolgov 5a8d8a87e5 Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS 2013-06-06 23:37:03 +04:00
Andrew Dolgov f890372a14 experimentally disable unnecessary folder icons for feedTree 2013-06-06 23:36:05 +04:00
Andrew Dolgov 97b5ec8c25 Merge pull request #217 from ldidry/master
Fix automatic language detection for registered users
2013-06-06 12:00:33 -07:00
Luc Didry c4db796fc7 Fix automatic language detection for registered users
If you do not choose a language, the db pref record for your language is an empty string, but if you choose "automatic detection" and save your prefs, it's "auto".
"auto" in startup_gettext function prevents ttrss to choose the appropriate language.
2013-06-06 21:54:47 +03:00
Andrew Dolgov 15a829013c remove single-line excerpts in widescreen 3panel mode because it breaks layout 2013-06-06 10:15:17 +04:00
Andrew Dolgov 19b906b94b block automarking headlines on scroll in unexpanded cdm because it doesn't work so well 2013-06-06 10:09:02 +04:00
Andrew Dolgov 0e70e4a42e unify some cdm padding values with 3panel mode 2013-06-06 09:56:53 +04:00
Andrew Dolgov f8900c3171 unify excerpt font sizes for CDM and 3 panel mode, use single line headers in expandable mode 2013-06-05 22:58:28 +04:00
Andrew Dolgov 3e008206a6 move notify a bit to the left so it woulnd't obscure browser scrollbar 2013-06-05 22:54:53 +04:00
Andrew Dolgov ffc21d2b54 clamp content preview to single line in three panel mode 2013-06-05 22:49:38 +04:00
Andrew Dolgov e2bf55b64e use text-overflow in floatingTitle 2013-06-05 22:44:20 +04:00
Andrew Dolgov d1692b4cf7 limit floatingTitle width 2013-06-05 22:29:00 +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 838b374431 nsfw: fix wrong delimiter when expanding tag_cache 2013-06-05 10:27:53 +04:00
Andrew Dolgov be9d5df19b hide warning when checking for tt-rss tables if tables are not present 2013-06-04 18:25:37 +04:00
Andrew Dolgov 445d1c1044 fix nsfw plugin 2013-06-04 15:34:04 +04:00
Andrew Dolgov 53a49ff82a properly handle per-feed hide_images setting in three panel mode (closes #706) 2013-06-03 10:31:45 +04:00
Andrew Dolgov ee442dfec5 Merge pull request #216 from PerryWerneck/master
Changing mimetype reported by errors.php?mode=js to avoi proxy problems.
2013-06-01 00:02:16 -07:00
Andrew Dolgov 9ffe8907dd do not unlink lockfiles (closes #703) 2013-06-01 10:06:59 +04:00
Andrew Dolgov ce5d234d63 support dc:date elements in rss and atom feeds 2013-06-01 09:49:56 +04:00
Perry Werneck bcb6b0c126 Changing error.php?mode=js from text/plain to text/javascript
Changing the js mimetype to text/javascript to avoid problems with some proxy configurations.
2013-05-31 17:37:12 -03:00
Andrew Dolgov 67f4fe1780 format_tags_string: fix typo 2013-05-31 21:37:14 +04:00
Andrew Dolgov 37cc6df067 Merge pull request #214 from JB1tz/master
Fix mysqli connection error debugging
2013-05-31 08:48:06 -07:00
Andrew Dolgov 8605ad4df0 make uncombined read headlines list more readable 2013-05-31 13:01:43 +04:00
Andrew Dolgov 7c01db43ef sphinx: type cast port to integer 2013-05-31 09:52:43 +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
Andrew Dolgov 2457679aed switch AUTO_ASSIGN_LABELS to off by default (bump schema) 2013-05-30 18:26:56 +04:00
Andrew Dolgov 9f8e2ae135 Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS 2013-05-30 09:21:43 +04:00
Andrew Dolgov 80d8d2d026 update config checks for SMTP_SECURE 2013-05-30 08:39:53 +04:00
Andrew Dolgov a9358e1d4e Revert "added a personalized email template. if the file:"
This reverts commit f766373271.
2013-05-30 08:36:51 +04:00
Andrew Dolgov 1f5e9d9ab0 Merge branch 'master' of git://github.com/justauserx/Tiny-Tiny-RSS into justauserx-master 2013-05-30 08:36:42 +04:00
Andrew Dolgov a169cd6f47 Merge pull request #213 from badziew/patch-1
bugfix: DB_PORT was not used in one of db_connect calls
2013-05-29 21:35:05 -07:00
Krzysztof Sikorski 50d5645b9f bugfix: DB_PORT was not used in one of db_connect calls 2013-05-30 02:53:16 +03:00
justauser f766373271 added a personalized email template. if the file:
my_email_article_template.txt

exists it will be used, otherwise the default will be used
2013-05-29 16:23:04 -04:00
Andrew Dolgov 37f00f7fcc add af_whomp 2013-05-29 23:11:48 +04:00
Andrew Dolgov 102a36c233 Merge pull request #212 from hoelzro/master
Fix self-signed certificate issue (issue 698)
2013-05-29 12:02:54 -07:00
Rob Hoelz 40a35a628d Don't verify SSL peers in geturl 2013-05-29 20:55:22 +02:00
Rob Hoelz e2b4c0b70c Pass error code along if geturl fails 2013-05-29 20:50:27 +02:00
Andrew Dolgov 2505aea5f3 Merge pull request #211 from PerryWerneck/master
Updatings pt-BR translation
2013-05-29 10:42:12 -07:00
Andrew Dolgov 1ffd534f43 fix wrong article context menu item toggle marked (should be toggle starred) 2013-05-29 16:14:32 +04:00
justauser ed7dd4bf6c changed the preg_split to explode per fox. fixed the template to
have a block for note and only include if there is a note
2013-05-29 08:06:05 -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
Andrew Dolgov 642432fc39 daemon: add sigterm handler for master 2013-05-29 15:11:46 +04:00
Andrew Dolgov 8ff2a86cf3 fix file_is_locked 2013-05-29 07:46:14 +04:00
Perry Werneck 6e0c7c5b80 Updating translation. 2013-05-28 18:40:19 -03:00
Andrew Dolgov f638b40348 Merge pull request #207 from gitawego/patch-4
@FIXED dijit modules aren't cached even all the js files are compressed
2013-05-28 13:42:53 -07:00