Merge remote-tracking branch 'upstream/master'

6 files changed, 29 insertions, 97 deletions

diff --git a/doc/To-Do-Code.md b/doc/To-Do-Code.md
deleted file mode 100644
index bdbbc6cdf..000000000
--- a/doc/To-Do-Code.md
+++ /dev/null
@@ -1,60 +0,0 @@
-Project Code To-Do List
-=======================
-
-We need much more than this, but here are areas where developers can help. Please edit this page when items are finished. Another place for developers to start is with the issues list.
-
-* Documentation - see [Red Documentation Project To-Do List](help/To-Do)
-
-* Finish the anti-spam bayesian engine
-
-* Integrate the "open site" list with the register page
-
-* implement oembed provider interface
-
-* implement openid server interface
-
-* Write more webpage layouts
-
-* Write more webpage widgets 
-
-* (Advanced) create a UI for building Comanche pages
-
-* External post connectors - create standard interface
-
-* External post connectors, add popular services
-
-* templatise and translate the Web interface to webDAV
-
-* Extend WebDAV to provide desktop access to photo albums
-
-* service classes - provide a pluggable subscription payment gateway for premium accounts
-
-* 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. 
-
-* Events module - fix permissions on events, and provide JS translation support for the calendar overview; integrate with calDAV
-
-* Events module - event followups and RSVP
-
-
-* Uploads - integrate https://github.com/blueimp/jQuery-File-Upload
-
-* App taxonomy
-
-* 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.
-
-* Photos module - turn photos into normal conversations and fix tagging
-
-* Provide RSS feed support which look like channels (in matrix only - copyright issues)
-
-* 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.  
- 
-* Implement owned and exchangeable "things".
-
-* 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).
-
-* Put mod_admin under Comanche
-
-In many cases some of the work has already been started and code exists so that you needn't start from scratch. Please contact one of the developer channels like Channel One (one@zothub.com) before embarking and we can tell you what we already have and provide some insights on how we envision these features fitting together. 
-
-
- 
\ No newline at end of file
diff --git a/doc/To-Do.md b/doc/To-Do.md
deleted file mode 100644
index 76b78b6ac..000000000
--- a/doc/To-Do.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Documentation we need to write
-==============================
-
-
-* Database schema detailed descriptions
-
-* Complete plugin hook documentation
-
-* API documentation
-
-* Function and code documentation (doxygen)
-
-* New Member guide
-
-* "Extra Feature" reference, description of each
-
-* Detailed Personal Settings Documentation
-
-* Administration Guide (post-install)
-
-* Administration Guide (pre-install)
-
-
diff --git a/doc/faq_users.bb b/doc/faq_users.bb
index 1a864f64a..aac4a114c 100644
--- a/doc/faq_users.bb
+++ b/doc/faq_users.bb
@@ -2,13 +2,16 @@
 
 [ul]
 [*][b]I am able to edit a post's text after I saved it, but is there a way to change the permissions?[/b]
-Short anser: No, there isn't. This has got some resons. You are able to change permissons to your files, photos and the likes, but not to posts after you have saved them. The reason is: Once you have saved a post it is being distributed either to the public channel and from there to other Red Matrix servers or to those you intended it to go. Just like you cannot reclaim a few after you have sold them off to some people, you cannot change permissions to Red Matrix posts. We would need to track everywhere your posting goes, keep track of everyone you allowed to see it and then keep track of from whom to delete it. 
-If a posting is public this is even harder, as the Red Matrix is a global network and there is no way to follow a post, let alone reclaim it reliably. 
-Once you have sent out an email there too is no way to take it back. So think wisely and keep alert when posting. :)
-[*][b]I downloaded my channel and uploaded it to another site but there is no content, no posts, no photos. What is wrong???[/b]
-To be honest: Nothing. That's the way it is right now. Technically it is surely possible to take at least your own posts and maybe even files with you, but this has simply put not implemented yet. When creating this feature we thought that keeping all your contacts was more important. Once we find someone willing to implement this, it will be done. :)
+Short anser: No, there isn't. There are reasons. You are able to change permissons to your files, photos and the likes, but not to posts after you have saved them. The main reason is: Once you have saved a post it is being distributed either to the public channel and from there to other Red Matrix servers or to those you intended it to go. Just like you cannot reclaim something you gave to another person, you cannot change permissions to Red Matrix posts. We would need to track everywhere your posting goes, keep track of everyone you allowed to see it and then keep track of from whom to delete it. 
+If a posting is public this is even harder, as the Red Matrix is a global network and there is no way to follow a post, let alone reclaim it reliably. Other networks that may receive your post have no reliable way to delete or reclaim the post. 
+[*][b]I downloaded my channel and imported it (cloned my identity) to another site but there is no content, no posts, no photos. What is wrong???[/b]
+To be honest: Nothing. That's the way it is right now. Technically it is surely possible to take at least your own posts and maybe even files with you, but this has simply put not implemented yet. When creating this feature we thought that keeping all your contacts was more important. Your friends have already seen your old content. Once we find someone willing to implement this, it will be done. :)
 [*][b]I can't see private resources[/b]
 You have probably disabled third party cookies.  You need to enable them for remote authentication to work.
+[*][b]There are a lot of foreign language posts. Let's auto-translate them.[/b]
+There are also a lot of [b]private[/b] foreign language posts and auto-translation services would require us to transmit these private messages to the translation service; and we don't know what they will do with them on their servers. Actually we do know thanks to Edward Snowden. Our best bet is a project called [b][i]Apertium[/i][/b] which is an open source translator we can install locally. It is currently missing German translations - which are the most requested translation in the matrix. Once again, this will be implemented when we find somebody who really wants to make it happen. 
 [/ul]
 
+
+
 Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb
index 2f498e6fb..b44095d3d 100644
--- a/doc/intro_for_developers.bb
+++ b/doc/intro_for_developers.bb
@@ -16,14 +16,10 @@
 

 [install] Installation and upgrade files and DB schema

 

-[js] core required javascript

-

 [library] Third party modules (must be license compatible)

 

 [mod] Controller modules based on URL pathname (e.g. #^[url=http://sitename/foo]http://sitename/foo[/url] loads mod/foo.php)

 

-[spec] protocol specifications

-

 [util] translation tools, main English string database and other miscellaneous utilities

 

 [version.inc] contains current version (auto-updated via cron for the master repository and distributed via git)

@@ -44,15 +40,14 @@
     [li]app - peronal app data[/li]

     [li]attach - file attachments[/li]

     [li]auth_codes - OAuth usage[/li]

-    [li]cache - TBD[/li]

-    [li]challenge - old DFRN structure, may re-use or may deprecate[/li]

+    [li]cache - OEmbed cache[/li]

     [li]channel - replaces Friendica 'user'[/li]

     [li]chat - chat room content[/li]

     [li]chatpresence - channel presence information for chat[/li]

     [li]chatroom - data for the actual chat room[/li]

     [li]clients - OAuth usage[/li]

     [li]config - main configuration storage[/li]

-    [li]conv - [/li]

+    [li]conv - Diaspora private messages[/li]

     [li]event - Events[/li]

     [li]fcontact - friend suggestion stuff[/li]

     [li]ffinder - friend suggestion stuff[/li]

@@ -62,7 +57,6 @@
     [li]group_member - privacy groups[/li]

     [li]hook - plugin hook registry[/li]

     [li]hubloc - Red location storage, ties a location to an xchan[/li]

-    [li]intro - DFRN introductions, may be obsolete[/li]

     [li]item - posts[/li]

     [li]item_id - other identifiers on other services for posts[/li]

     [li]likes - likes of 'things'[/li]

diff --git a/doc/permissions.bb b/doc/permissions.bb
index 8a071a3f5..c893ed84f 100644
--- a/doc/permissions.bb
+++ b/doc/permissions.bb
@@ -66,7 +66,7 @@ This permission determines who can write to your wall when clicking through to y
 

 [i]Can comment on my posts.[/i]

 

-This permission determines who can comment on posts you create. Normally, you would want this to match your "can view my public pages" permission

+This permission determines who can comment on posts you create. Normally, you would want this to match your "can view my public stream and posts" permission

 

 [i]Can send me private mail messages.[/i]

 

diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb
index 91997a284..fe213baf3 100644
--- a/doc/to_do_code.bb
+++ b/doc/to_do_code.bb
@@ -4,6 +4,8 @@ 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]Finish the anti-spam bayesian engine[/li]

 

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

@@ -12,6 +14,8 @@ We need much more than this, but here are areas where developers can help. Pleas
 

 [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]

@@ -38,8 +42,22 @@ We need much more than this, but here are areas where developers can help. Pleas
 

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

 

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

+

+[li]Import channel from Diaspora/Friendica[/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]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]