Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	doc/to_do_code.bb

2 files changed, 21 insertions, 17 deletions

diff --git a/doc/roadmap.bb b/doc/roadmap.bb
index 4564f5fea..f57c76b74 100644
--- a/doc/roadmap.bb
+++ b/doc/roadmap.bb
@@ -2,26 +2,30 @@
 
 Roadmap for $Projectname V3
 
+*HZ = Hubzilla repository
+
+
 Crypto
 	Convert E2EE to dynamic loading (on demand) using jQuery.getScript() [or other methods] to only load encryption libs when you require them. This should also support multiple encryption libraries (e.g. SJCL, others) triggered from the choice of algorithm and remain pluggable.
 
 Diaspora
-	Convert core Diaspora federation code into a plugin. This presents a number of challenges since it touches and special cases a lot of core functionality.
+	Convert core Diaspora federation code into a plugin. This presents a number of challenges since it touches and special cases a lot of core functionality. (HZ - in progress)
 
 Subscriptions and business models
-	Build enough into core(/addons) to generate income (or at least try and cover costs) out of the box
+	Build enough into core(/addons) to generate income (or at least try and cover costs) out of the box (in progress Habeas Codice)
 
 Merge all uploads into common DAV interface
-	Separate photo albums from photos and turn them into file directories.
-	Upload everything direct to /store
-	If photo, generate thumbnails and image resources
-	Provide default upload folders with %y (and other?) macros for both photos and other file resources
-	Allow "media" (anything that we can generate a thumbnail for) in the Photos section (and show thumbnails in the Files section where possible) 
+	Separate photo albums from photos and turn them into file directories. (HZ - done)
+	Upload everything direct to /store (HZ - done)
+	If photo, generate thumbnails and image resources (HZ - done)
+	Provide default upload folders with %y (and other?) macros for both photos and other file resources (HZ - done)
+	Allow "media" (anything that we can generate a thumbnail for) in the Photos section (and show thumbnails in the Files section where possible) (HZ - done)
+
 	Resolve the "every photo has an item" confusion, perhaps every file should also - but only if we can explain it and separate them conceptually.
 
 Migration tools
 	Friendica importer
-	Diaspora importer
+	Diaspora importer (channel and connection import done, conversations and photos still in progress and waiting for support from Diaspora)
 
 Webpage design UI improvements
 	If practical, separate "conversation" sub-themes from overall themes so one can choose different conversation and content layouts within a base theme. 
diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb
index bfa249dd5..21b567c3f 100644
--- a/doc/to_do_code.bb
+++ b/doc/to_do_code.bb
@@ -10,8 +10,8 @@ We need much more than this, but here are areas where developers can help. Pleas
 [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]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 hubzilla ability[/li]

-[li]If DAV folders exist, add an option to the Settings page to set a default folder for attachment uploads.[/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](done - HZ) 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]

@@ -21,27 +21,27 @@ We need much more than this, but here are areas where developers can help. Pleas
 [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](done - HZ) 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](in progress Habeas Codice) service classes - provide a pluggable subscription payment gateway for premium accounts[/li]

+[li](in progress Habeas Codice) 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 (done); integrate with calDAV[/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]Import channel from Diaspora/Friendica (Diaspora partially done)[/li]

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

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

 [li]Create interface to include/exclude and re-order standard profile fields[/li]

-[li]Provide a mechanism to share page design elements in posts (just like apps)[/li]

+[li]Provide a mechanism to share page design elements in posts (just like apps) (done)[/li]

 [li]App taxonomy[/li]

 [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]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](in progress Habeas Codice) 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]

 [li]Put mod_admin under Comanche[/li]