Commit Graph

6647 Commits

Author SHA1 Message Date
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
gitawego 44bf49d414 @FIXED dijit modules aren't cached even all the js files are compressed
@CHANGED use require to load all the dependencies
@FIXED dojo.parser isn't loaded in cached mode, it has to be loaded via require.
2013-05-28 23:40:17 +03:00
Andrew Dolgov 4e46e90ef7 installer: use mysqli_error when using mysqli (closes #696) 2013-05-29 00:32:23 +04:00
Andrew Dolgov 4077f72ced Revert "@FIXED dijit modules aren't cached even all the js files are compressed"
This reverts commit 4f70f13f26.
2013-05-29 00:17:19 +04:00
Andrew Dolgov c4f628c277 Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS 2013-05-29 00:16:09 +04:00
Andrew Dolgov ec86f69519 Merge pull request #205 from gitawego/patch-3
@FIXED dijit modules aren't cached even all the js files are compressed
2013-05-28 13:14:31 -07:00
gitawego 4f70f13f26 @FIXED dijit modules aren't cached even all the js files are compressed 2013-05-28 22:59:27 +03:00
justauser 991418fa56 Merge branch 'master' into jremote
update working to master
2013-05-28 11:39:58 -04:00
Andrew Dolgov 5ddc750427 schema: fix reinitialization not working for older databases 2013-05-28 16:21:19 +04:00
Andrew Dolgov 1d76589693 file_is_locked: check if file exists before trying to flock it 2013-05-28 15:58:03 +04:00
Andrew Dolgov 2a7362596f moveToPost: check for current article element existing before getting its position info (closes #695) 2013-05-27 22:11:20 +04:00
justauser 2e937560df Added the note text to the body of the email sending articles 2013-05-27 12:07:56 -04:00
Andrew Dolgov 14c84904fe pluginhost: allow html tags in plugin storage 2013-05-27 14:03:14 +04:00
justauser 6dd01fcea2 Changes to support a new version of the phpmailer. Adds a new setting SMTP_SECURE,
which cna have a value of tls, ssl or be empty.  This is used for secure SMTP servers.
Also added the ability to have multiple email addresses in the to field.  Addresses are
separated by semicolons (;)
2013-05-26 11:27:42 -04:00
Andrew Dolgov df2655e015 better support for atom:link elements in rss feeds, support rel=standout (fuck you google and your nonstandard shit) 2013-05-26 10:21:54 +04:00
Andrew Dolgov 393c1ddc6d note: set inset shadow 2013-05-25 23:55:01 +04:00
Andrew Dolgov 33945d7517 Merge branch 'master' of git://github.com/EyesX/Tiny-Tiny-RSS into EyesX-master
Conflicts:
	locale/sv_SE/LC_MESSAGES/messages.mo
	locale/sv_SE/LC_MESSAGES/messages.po
2013-05-25 09:36:42 +04:00
Mattias Tengblad 9bc0a6006e Updated Swedish translation for 1.7.9 2013-05-24 19:42:22 +02:00
Andrew Dolgov f17c3ee29a parser: fix get_links() for RSS 2013-05-24 14:40:47 +04:00
Andrew Dolgov 5a6d7e7ace Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS 2013-05-24 12:26:42 +04:00
Andrew Dolgov 19baecc62e add some text-shadows 2013-05-24 12:26:30 +04:00
Andrew Dolgov 09328b460d Merge pull request #202 from RaphaelRochet/master
French translation update
2013-05-24 01:05:09 -07:00
Raphaël Rochet 196d8bf3b7 Frnench translation update (3 strings) 2013-05-24 09:51:20 +02:00
Andrew Dolgov d7b5a9e7f5 labels: add auxcounters 2013-05-24 10:57:47 +04:00
Andrew Dolgov 1874c8d6df feedparser: properly handle nodeValue of rss channel link element (closes #692) 2013-05-23 20:32:54 +04:00