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, 6 insertions, 4 deletions

diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb
index 0dd0b8e24..fd3923d40 100644
--- a/doc/to_do_code.bb
+++ b/doc/to_do_code.bb
@@ -5,27 +5,30 @@ We need much more than this, but here are areas where developers can help. Pleas
 [li]Documentation - see Red Documentation Project To-Do List[/li]

 [li]Include TOS link in registration/verification email[/li]

 [li]Create bug tracker module[/li]

+[li]translation plugins - moses or apertium[/li]

+[li]Infinite scroll improvements (i.e. embedded page links) see http://scrollsample.appspot.com/items 

 [li]Finish the anti-spam bayesian engine[/li]

 [li]implement an email permission denied bounce message from the sys channel[/li]

-[li]finish Wordpress connector - import wordpress comments back to redmatrix[/li]

 [li]provide a way for xchans with a certain network type to upgrade (unknown to rss, rss to statusnet, friendica-over-diaspora to friendica, for instance) based on new knowledge and/or redmatrix ability[/li]

 [li]If DAV folders exist, add an option to the Settings page to set a default folder for attachment uploads.[/li] 

 [li]Integrate the "open site" list with the register page[/li]

 [li]implement oembed provider interface[/li]

 [li]refactor the oembed client interface so that we can safely sandbox remote content[/li]

-[li]implement openid server interface[/li]

 [li]Write more webpage layouts[/li]

 [li]Write more webpage widgets[/li]

+[li]restricted access OAuth clients[/li]

 [li](Advanced) create a UI for building Comanche pages[/li]

+[li](less advanced) create a way to preview Comanche results on a preview page while editing on another page[/li]

 [li]Extend WebDAV to provide desktop access to photo albums[/li]

 [li]External post connectors - create standard interface[/li]

 [li]External post connectors, add popular services[/li]

 [li]service classes - provide a pluggable subscription payment gateway for premium accounts[/li]

 [li]service classes - account overview page showing resources consumed by channel. With special consideration this page can also be accessed at a meta level by the site admin to drill down on problematic accounts/channels.[/li]

 [li]Events module - fix permissions on events, and provide JS translation support for the calendar overview; integrate with calDAV[/li]

-[li]Events module - event followups and RSVP[/li]

 [li]Uploads - integrate #^[url=https://github.com/blueimp/jQuery-File-Upload]https://github.com/blueimp/jQuery-File-Upload[/url][/li]

 [li]Import/export - include events, things, etc.[/li]

+[li]API extensions, for Twitter API - search, friending, threading. For Red API, lots of stuff[/li]

+[li]OAuth permission extensions[/li]

 [li]Import channel from Diaspora/Friendica[/li]

 [li]MediaGoblin photo "crosspost" connector[/li]

 [li]Create management page/UI for extensible profile fields[/li]

@@ -35,7 +38,6 @@ We need much more than this, but here are areas where developers can help. Pleas
 [li]Customisable App collection pages[/li]

 [li]replace the tinymce visual editor and/or make the visual editor pluggable and responsive to different output formats. We probably want library/bbedit for bbcode. This needs a fair bit of work to catch up with our "enhanced bbcode", but start with images, links, bold and highlight and work from there.[/li]

 [li]Photos module - turn photos into normal conversations and fix tagging[/li]

-[li]Provide RSS feed support which look like channels (in matrix only - copyright issues)[/li]

 [li]Create mobile clients for the top platforms - which involves extending the API so that we can do stuff far beyond the current crop of Twitter/Statusnet clients. Ditto for mobile themes. We can probably use something like the Friendica Android app as a base to start from.[/li]

 [li]Implement owned and exchangeable "things".[/li]

 [li]Family Account creation - using service classes (an account holder can create a certain number of sub-accounts which are all tied to their subscription - if the subscription lapses they all go away).[/li]