Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 68 insertions, 1 deletions

diff --git a/doc/addons.bb b/doc/addons.bb
index 726b437ed..cad662308 100644
--- a/doc/addons.bb
+++ b/doc/addons.bb
@@ -1,4 +1,71 @@
-* [zrl=[baseurl]/help/addons_gnusocial]Posting To Gnu Social[/zrl]
+[h3]Plugins/Addons[/h3]
+[list=1]
+[*] abcjsplugin - Create musical scores in your posts
+[*] bbmath - use complex math expressions in your posts
+[*] bookmarker - replace #^ with bookmark link in posts
+[*] buglink - provide a bug reporting icon in the lower-left corner of every page
+[*] calc - a scientific calculator
+[*] chords - generate fingering charts and alternatives for every known guitar chord
+[*] custom_home - set a custom page as the hub start page
+[*] diaspora - crosspost to a Diaspora account (different from the built-in Diaspora emulator)
+[*] dirstats - show some interesting statistics generated by the driectory server
+[*] donate - provides a project donation page
+[*] dwpost - crosspost to Dreamwidth
+[*] embedly - use the embedly (formerly ooehmbed) service to embed media from many providers
+[*] extcron - use an external cron service to run your hub's scheduled tasks
+[*] flattr - provides a "Flattr Us" button
+[*] flip - create upside down text
+[*] fortunate - displays random quote (fortune cookie). Requires setting up a fortune server.
+[*] frphotos - import photo albums from Friendica
+[*] hexit - headecimal conversion tool
+[*] ijpost - crosspost to Insanejournal
+[*] irc - connect to IRC chatrooms
+[*] jappixmini - XMPP chat
+[*] jsupload - (recommended) upload multiple photos to photo albums at once.
+[*] ldapauth - login via account on LDAP or Windows Active Directory domain 
+[*] libertree - crosspost to Libertree
+[*] likebanner - create a "like us on red#matrix" banner image
+[*] ljpost - crosspost to LiveJournal
+[*] mahjongg - Chinese puzzle game
+[*] mailhost - when using multiple channel clones, select one to receive email notifications
+[*] mayan_places - set location field to a random city in the Mayan world
+[*] morechoice - additional gender/sexual-preference choices for profiles (not safe for work)
+[*] moremoods - Additional mood options
+[*] morepokes - additional poke options (not safe for work)
+[*] nsabait - add random terrorism related hashtags to your posts
+[*] nsfw - Highly recommended plugin to collpase posts with inappropriate content
+[*] openclipatar - choose a profile photo from hundreds of royalty free images
+[*] openstreetmap - render locations and maps using OpenStreetMap
+[*] piwik - open source website analytics
+[*] planets - set location field to a random planet from Star Wars
+[*] pumpio - crosspost to Pump.io
+[*] qrator - generate QR code images
+[*] rainbowtag - display your tag and category clouds in colours
+[*] randpost - post/reply bot based on and requires fortunate
+[*] redred - Crosspost to another Redmatrix channel
+[*] rtof - Crosspost to Friendica
+[*] smiley_pack - extend the built-in smilie (emoticon) support
+[*] smileybutton - provides a smiley selector on the post window
+[*] startpage - set a personal preferred page to redirect after logging in.
+[*] statusnet - GNU-social and StatusNet crosspost [zrl=[baseurl]/help/addons_gnusocial]Posting To Gnu Social[/zrl]
+[*] superblock - Highly recommended - completely block an offensive channel from your stream
+[*] tictac - 3D tic-tac-toe
+[*] torch - flashlight app
+[*] tour - feature tour for new red#matrix members
+[*] twitter - crosspost to Twitter
+[*] upload_limits - discover what server setting (there are a few) may be causing large photo uploads to fail
+[*] visage - show visitors to your channel
+[*] webRTC - use an external server (mayfirst.org) to negotiate webRTC hookups
+[*] wppost - crosspost to WordPress (or other wordpress XMLRPC service)
+[/list]
+
+[h3]Addon Repositories[/h3]
+
+[url=https://github.com/redmatrix/redmatrix-addons]https://github.com/redmatrix/redmatrix-addons[/url] Main project addon repository
+
+[url=https://github.com/23n/red-addons]https://github.com/23n/red-addons[/url] Oliver's repository (mayan_places and flip)
+
+
 
 #include doc/macros/main_footer.bb;