Commit graph

4445 commits

Author SHA1 Message Date
Michael Vogel
ff27645c78 This commit is useless :) 2012-05-29 16:41:20 +02:00
Michael Vogel
1c955bff9b Merge remote branch 'upstream/master' 2012-05-29 16:41:05 +02:00
friendica
bd274adb11 more 2012-05-28 19:40:22 -07:00
friendica
1b49dda202 Merge https://github.com/friendica/friendica-addons into apull 2012-05-28 17:35:57 -07:00
friendica
5d45beab08 "morechoice" addon 2012-05-28 17:35:24 -07:00
Michael Vogel
0153b7f796 Merge branch 'master' of github.com:annando/friendica-addons 2012-05-26 12:00:54 +02:00
Michael
47abeb00ec Merge remote branch 'upstream/master' 2012-05-26 11:59:54 +02:00
Michael Vogel
54ece4f484 Merge remote branch 'upstream/master' 2012-05-25 16:19:32 +02:00
Thomas Willingham
6f37cb01a9 Merge branch 'master' of github.com:friendica/friendica-addons 2012-05-24 17:31:14 +01:00
Thomas Willingham
b31e68c556 Smiley_pack update tarball 2012-05-24 17:30:37 +01:00
Thomas Willingham
b701f1c8cd Smiley_pack - Fixed typo. 2012-05-24 17:29:32 +01:00
friendica
d6b3ddcd3d bug #431 2012-05-23 15:43:35 -07:00
friendica
e4b1489b14 normalise links before comparison (bug #431) 2012-05-22 22:33:08 -07:00
friendica
3926f5582d startpage addon 2012-05-22 18:05:39 -07:00
friendica
7a4674bc69 Merge https://github.com/friendica/friendica-addons into apull 2012-05-21 16:42:17 -07:00
friendica
94e6820e85 globaldir submission blocking 2012-05-21 16:41:44 -07:00
Thomas Willingham
d89927e304 Smiley pack update. 2012-05-20 01:25:43 +01:00
Keith Fernie
236a18cca8 Merge branch 'master' of https://github.com/friendica/friendica-addons 2012-05-19 19:45:53 +01:00
Keith Fernie
f78d717cc1 modified: public_server.tgz bug fixes
modified:   public_server/public_server.php bug fixes
2012-05-19 19:44:22 +01:00
Michael
dbaf0fd251 Merge branch 'master' of github.com:annando/friendica-addons 2012-05-19 16:55:43 +02:00
Michael Vogel
d87e6982f9 Merge remote branch 'upstream/master' 2012-05-19 14:04:40 +02:00
friendica
600dc9ba91 Merge pull request #55 from CatoTH/master
Privacy Image Cache: Prevent a notice
2012-05-19 04:21:29 -07:00
friendica
d2be106d13 make facebook contacts honour the default group selection 2012-05-18 19:04:58 -07:00
Keith Fernie
2031a7240c new file: public_server.tgz add public_server plugin
new file:   public_server/README.md add public_server plugin
	new file:   public_server/public_server.php add public_server plugin
	modified:   testdrive.tgz puts content in notification emails
	modified:   testdrive/testdrive.php puts content in notification emails
2012-05-18 09:12:02 +01:00
tony baldwin
6e280e7143 Merge remote branch 'upstream/master' 2012-05-17 00:56:19 -04:00
Tobias Hößl
e2f2f458cf Prevent notices 2012-05-16 20:16:07 +00:00
Michael Vogel
38caf9dd1d Merge remote branch 'upstream/master' 2012-05-16 08:25:08 +02:00
Michael
07806ead6f Merge branch 'master' of github.com:annando/friendica-addons 2012-05-16 08:15:49 +02:00
friendica
6cd9da4d5a Merge https://github.com/friendica/friendica-addons into apull 2012-05-15 04:32:09 -07:00
friendica
b84ee7f2cf default checked 2012-05-15 04:31:38 -07:00
Tobias Diekershoff
80f5c5bbe0 SN/T dont send linked @-names when we dont send linked #-tags 2012-05-15 11:23:39 +02:00
Tobias Diekershoff
c79102cdb5 SN updated tar archive as well 2012-05-15 10:56:35 +02:00
Tobias Diekershoff
d9089213fb SN apply debugging info to the log as for Twitter 2012-05-15 10:54:48 +02:00
friendica
6ac0556e10 There is no LOGGER_ERROR - log problems instead at default (LOGGER_NORMAL) 2012-05-14 20:14:09 -07:00
friendica
cb7d832237 Merge pull request #54 from mexon/upstream
Don't throw error messagesfrom Twitter in the bitbucket
2012-05-14 20:11:01 -07:00
Matthew Exon
63690167dd Don't throw error messagesfrom Twitter in the bitbucket 2012-05-15 09:30:31 +08:00
friendica
4618f2d23d wppost: add optional backlink to Friendica permalink 2012-05-14 16:30:18 -07:00
friendica
d6fd0c9717 balckout: fail silently if less than PHP 5.3 2012-05-11 03:39:29 -07:00
friendica
e533312985 make nsfw less sensitive to leading/trailing whitespace in list of terms 2012-05-10 21:35:48 -07:00
tony baldwin
50a75b0ac7 removed hangman
removed obsolete posterous-api.php
2012-05-10 00:29:38 -04:00
friendica
bdbc3a2625 removed hangman by request - not working 2012-05-09 21:04:52 -07:00
Michael Vogel
51432d9b31 Merge remote branch 'upstream/master' 2012-05-09 14:57:46 +02:00
Michael Vogel
a4c505489e Tumblr: Some changes 2012-05-09 14:53:02 +02:00
friendica
e1b25a1556 Merge https://github.com/tonybaldwin/friendica-addons into apull
Conflicts:
	posterous/posterous.php
2012-05-08 17:05:12 -07:00
tony baldwin
a0a9db70b6 IT WORKS! IT WORKS!
eliminated dusty, ancient api
updated posterous.php to work directly with api to post
2012-05-08 18:35:48 -04:00
friendica
10843ca8ac Merge https://github.com/friendica/friendica-addons into apull 2012-05-05 19:55:42 -07:00
friendica
0e778309db Ability to restrict Facebook fiend linking on a site. This is provided as a plugin so that it can be seen in a public site addon list. 2012-05-05 19:54:03 -07:00
Thomas Willingham
3047721496 Update the tarball 2012-05-05 23:51:24 +01:00
Thomas Willingham
aac30fc433 Merge branch 'master' of github.com:friendica/friendica-addons 2012-05-05 23:42:48 +01:00
Thomas Willingham
98dc0c512c Another regex problem with the smileys fixed. 2012-05-05 23:41:55 +01:00