Commit Graph

1016 Commits

Author SHA1 Message Date
Matthew Exon 4fcd882f02 Merge remote-tracking branch 'upstream/master' into retriever
Conflicts:
	retriever/view/help.tpl
2013-05-06 09:50:03 +08:00
Matthew Exon c7878a0f78 Clarify the language of the help text a little 2013-05-06 09:47:06 +08:00
Matthew Exon 6667c9da6b Reverse an earlier over-zealous check for a non-null value of the retriever. This prevented lots and lots of feed items coming through.
Conflicts:
	retriever/retriever.php
2013-05-06 08:43:42 +08:00
friendica 63764eccb9 package update 2013-04-28 21:52:02 -07:00
friendica 8188f05a58 superblock testing - couple of minor issues 2013-04-28 21:50:24 -07:00
friendica 4a400894aa oops - forgot the files 2013-04-28 21:22:45 -07:00
friendica 639cf3f613 add 'superblock' blocker, plus package updates 2013-04-28 21:05:32 -07:00
fabrixxm 0889688e71 Merge pull request #118 from fabrixxm/templateengine
update addons template dir layout
2013-04-23 06:51:33 -07:00
fabrixxm a85a080856 update addons template dir layout 2013-04-23 08:48:19 -04:00
tobiasd 6a55da34b9 Merge pull request #116 from tobiasd/master
char limit for Twitter needs to set lower because of t.co
2013-04-21 08:25:44 -07:00
Tobias Diekershoff fa51ac311c Twitter needs a lower character limit 2013-04-21 17:21:09 +02:00
tobiasd b178502bfe Merge pull request #115 from tobiasd/snt_newstyle_share
use simple share for SN and T
2013-04-12 09:41:07 -07:00
Tobias Diekershoff 17b3676883 use simple style for sharing on twitter 2013-04-12 09:13:33 +02:00
Tobias Diekershoff 4c6e650548 use simple style for sharing on SN 2013-04-12 09:12:05 +02:00
friendica 3864d115c8 Merge pull request #114 from mexon/retriever
Added retriever plugin
2013-04-03 17:37:32 -07:00
Matthew Exon 0b82f146b5 Added retriever plugin 2013-04-03 20:13:08 +08:00
tobiasd 50b7d0484b Merge pull request #113 from mexon/mailstream
Switch from "on"/"off" config style to "1"/<unset>
2013-04-01 05:17:52 -07:00
Matthew Exon 84744911c6 Switch from "on"/"off" config style to "1"/<unset> 2013-04-01 19:47:40 +08:00
tobiasd d235df3f48 Merge pull request #112 from tobiasd/master
add Michael as author of SN/T connectors
2013-04-01 00:17:25 -07:00
Tobias Diekershoff 5307549ef0 Merge branch 'master' of https://github.com/friendica/friendica-addons 2013-04-01 09:13:45 +02:00
Tobias Diekershoff 0c5bc6a0c1 added Michael as author of SN/T connector 2013-04-01 09:02:38 +02:00
tobiasd 61083eddb7 Merge pull request #111 from mexon/mailstream
* Fix typos in database schema
2013-03-31 20:54:41 -07:00
Matthew Exon 9fceabe1c3 * Fix typos in database schema
* Default to using user's main email address
* Refactoring
* Add missing files to .tgz
2013-04-01 08:32:06 +08:00
tobiasd 3ba1f2f9ce Merge pull request #110 from annando/master
twitter, statusnet, gpluspost
2013-03-30 01:47:52 -07:00
Michael Vogel e00cb3eaaf Statusnet/Twitter: When a message is less than 140 digits the post isn't modified in the auto shortening. 2013-03-29 11:19:57 +01:00
tobiasd e608f8ad3a Merge pull request #109 from mexon/mailstream
Add mailstream plugin
2013-03-24 00:39:00 -07:00
Matthew Exon fa35dfe69d Use new templating style
Add two templates that I forgot to checkin last time
Switch to utf8_bin collation
Separate "Local" and "Upstream" links
Translate "Submit" button
Fix some debug statements
2013-03-23 12:00:59 +08:00
Thomas Willingham 876edda97f Merge pull request #108 from unary/defaultfeaturesfix
default features - actually handle the security token in the addon code
2013-03-17 18:10:06 -07:00
Matthew Exon d32b43feb8 Add mailstream plugin 2013-03-15 17:20:25 +08:00
Michael Vogel b68cb696e6 gpluspost: Optimizations to the RSS feed. 2013-03-14 23:16:35 +01:00
Michael Johnston ef9a725295 default features - actually handle the security token in the addon code 2013-03-13 22:36:45 -04:00
tobiasd 950154d655 Merge pull request #107 from annando/master
gpluspost: Loop prevention
2013-03-05 22:07:52 -08:00
Michael Vogel 414c066b18 fromgplus, gpluspost: Some more loop prevention added. 2013-03-05 00:44:20 +01:00
Thomas Willingham 206d9bc8fd Merge pull request #106 from unary/archive-update
archive update
2013-03-03 21:25:02 -08:00
Michael Johnston fde3f7a15e archive update 2013-03-04 00:15:34 -05:00
friendica 53d2569833 Merge pull request #104 from annando/master
gpluspost: Wrong table used and some beautifying
2013-03-03 17:29:06 -08:00
friendica 24db1ccd08 Merge pull request #105 from unary/defaultfeatures
New addon: Default Features - allow admin to turn some Additional Featur...
2013-03-03 17:28:40 -08:00
Michael Johnston 98e4c7e26d New addon: Default Features - allow admin to turn some Additional Features on by default for new users. 2013-03-03 20:12:42 -05:00
Michael Vogel e0eaaf7b23 gpluspost: URL in title is removed when it points to the URL of the message 2013-03-04 00:58:54 +01:00
Michael Vogel 63404c06c9 gpluspost: Wrong table used. You should never mix "contact" with "user" :) 2013-03-04 00:51:55 +01:00
Michael Vogel 47fff67b5d Merge remote-tracking branch 'upstream/master' 2013-03-04 00:05:47 +01:00
Michael Vogel 30da149c90 gpluspost: Showing a "recycle" sign when displaying repeated items. 2013-03-03 23:43:35 +01:00
friendica 94f1e23071 Merge pull request #102 from fabrixxm/addonlangs
Per-plugins strings.php
2013-03-03 12:08:38 -08:00
friendica 33f67e95f6 Merge pull request #103 from annando/master
gpluspost: Posting to Google+
2013-03-03 12:08:21 -08:00
Michael Vogel e0ca117391 gpluspost: Posting couldn't be disabled - fixed 2013-03-03 17:55:46 +01:00
Michael Vogel 042e945eea Merge remote-tracking branch 'upstream/master' 2013-03-03 16:30:06 +01:00
Michael Vogel 065c1ac1e9 gpluspost: New option for loop prevention 2013-03-03 16:28:06 +01:00
Michael Vogel 543c456110 gpluspost: Atom-Feed is now working. Add-On is ready to use 2013-03-03 12:25:05 +01:00
Michael Vogel 0c5ff14d87 gpluspost: Posting to G+ is now working 2013-03-02 22:24:57 +01:00
Thomas Willingham 4f4df19bd2 Pledgie - adjust postion to prevent overlap when themes add random buttons to page end. 2013-03-02 16:14:03 +00:00