3 files changed, 9 insertions, 22 deletions

diff --git a/doc/roadmap.bb b/doc/roadmap.bb
index f57c76b74..9ef9f146a 100644
--- a/doc/roadmap.bb
+++ b/doc/roadmap.bb
@@ -8,18 +8,8 @@ Roadmap for $Projectname V3
 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. (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 (in progress Habeas Codice)
-
-Merge all uploads into common DAV interface
-	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)
+	Build enough into core(/addons) to generate income (or at least try and cover costs) out of the box 
 
 	Resolve the "every photo has an item" confusion, perhaps every file should also - but only if we can explain it and separate them conceptually.
 
diff --git a/doc/roadmapv4.bb b/doc/roadmapv4.bb
index 33a3384c5..419cd8d4c 100644
--- a/doc/roadmapv4.bb
+++ b/doc/roadmapv4.bb
@@ -9,20 +9,20 @@ Goals/Highlights:
 
 Focus on visual website design tools, widgets, and sharing mechanisms
 
-App organisation.
+[x] App organisation.
 
-Conversion of core application to a composer format living under the namespace "Zotlabs"
+[x] Conversion of core application to a composer format living under the namespace "Zotlabs"
 
-Conversion of Modules to a more general purpose Controllers layout with DB/memory based
+[x] Conversion of Modules to a more general purpose Controllers layout with DB/memory based
 controller routing as opposed to filesystem routing.
 
-Conversion of core Zot Protocol to a class library
+[x] (partial) Conversion of core Zot Protocol to a class library
  
-Abstraction of nomadic identity so that sending/receiving to/from singleton networks to/from any clone works flawlessly - [b]provided[/b] the clone physically connected to that singleton identity is up. 
+[x] Abstraction of nomadic identity so that sending/receiving to/from singleton networks to/from any clone works flawlessly - [b]provided[/b] the clone physically connected to that singleton identity is up. 
 
 [h3]Community Development[/h3]
 
-CalDAV/CardDAV
+[x] CalDAV/CardDAV
 
 E-Commerce
 
diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb
index 577d0e66f..b1c4923b1 100644
--- a/doc/to_do_code.bb
+++ b/doc/to_do_code.bb
@@ -6,6 +6,7 @@ We need much more than this, but here are areas where developers can help. Pleas
 [li]Include TOS link in registration/verification email[/li]

 [li]Auto preview posts/comments (configurable timer kicks in the preview if not 0)[/li]

 [li]SAML 2.0 and OpenID Connect provider functionality[/li]

+[li]relmeauth (aka indieauth) support[/li]

 [li]Create bug tracker module[/li]

 [li]Filing posts - provide a dropdown menu integrated with the 'post actions menu'[/li]

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

@@ -17,7 +18,6 @@ We need much more than this, but here are areas where developers can help. Pleas
 [li]Integrate the "open site" list with the register page[/li]

 [li]Support comments and member notes on documentation pages (to achieve an effect similar to php.net)[/li]

 [li]Support comments on webpages[/li]

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

 [li]Write more webpage layouts[/li]

 [li]Write more webpage widgets[/li]

 [li]restricted access OAuth clients[/li]

@@ -27,14 +27,11 @@ We need much more than this, but here are areas where developers can help. Pleas
 [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]implement CalDAV/CardDAV sync[/li]

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

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

 [li]Import channel from Diaspora/Friendica (Diaspora partially done)[/li]

 [li]MediaGoblin photo "crosspost" connector[/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]provide a visual editor[/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]