Merge remote-tracking branch 'upstream/master'

1 files changed, 0 insertions, 102 deletions

diff --git a/hubzilla_er/diagrams/account.implied2degrees.dot b/hubzilla_er/diagrams/account.implied2degrees.dot
deleted file mode 100644
index f5c61fb84..000000000
--- a/hubzilla_er/diagrams/account.implied2degrees.dot
+++ /dev/null
@@ -1,102 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "mail":"account_id":w -> "account":"account_id.type":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "mail":"channel_id":w -> "channel":"elipses":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "mail":"id":w -> "verify":"elipses":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "account" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">account</TD></TR>
-      <TR><TD PORT="account_id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">account_id</TD><TD PORT="account_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="account_parent" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_parent</TD><TD PORT="account_parent.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="account_default_channel" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_default_channel</TD><TD PORT="account_default_channel.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="account_salt" COLSPAN="2" ALIGN="LEFT">account_salt</TD><TD PORT="account_salt.type" ALIGN="LEFT">char[32]</TD></TR>
-      <TR><TD PORT="account_password" COLSPAN="2" ALIGN="LEFT">account_password</TD><TD PORT="account_password.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="account_email" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_email</TD><TD PORT="account_email.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="account_external" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_external</TD><TD PORT="account_external.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="account_language" COLSPAN="2" ALIGN="LEFT">account_language</TD><TD PORT="account_language.type" ALIGN="LEFT">char[16]</TD></TR>
-      <TR><TD PORT="account_created" COLSPAN="2" ALIGN="LEFT">account_created</TD><TD PORT="account_created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="account_lastlog" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_lastlog</TD><TD PORT="account_lastlog.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="account_flags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_flags</TD><TD PORT="account_flags.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="account_roles" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_roles</TD><TD PORT="account_roles.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="account_reset" COLSPAN="2" ALIGN="LEFT">account_reset</TD><TD PORT="account_reset.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="account_expires" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_expires</TD><TD PORT="account_expires.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="account_expire_notified" COLSPAN="2" ALIGN="LEFT">account_expire_notified</TD><TD PORT="account_expire_notified.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="account_service_class" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_service_class</TD><TD PORT="account_service_class.type" ALIGN="LEFT">char[32]</TD></TR>
-      <TR><TD PORT="account_level" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_level</TD><TD PORT="account_level.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="account_password_changed" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_password_changed</TD><TD PORT="account_password_changed.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="account.html"
-    tooltip="account"
-  ];
-  "channel" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">channel</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 &gt;</TD></TR>
-    </TABLE>>
-    URL="channel.html"
-    tooltip="channel"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="convid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">convid</TD></TR>
-      <TR><TD PORT="mail_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_flags</TD></TR>
-      <TR><TD PORT="from_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">from_xchan</TD></TR>
-      <TR><TD PORT="to_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">to_xchan</TD></TR>
-      <TR><TD PORT="account_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="title" COLSPAN="3" ALIGN="LEFT">title</TD></TR>
-      <TR><TD PORT="body" COLSPAN="3" ALIGN="LEFT">body</TD></TR>
-      <TR><TD PORT="sig" COLSPAN="3" ALIGN="LEFT">sig</TD></TR>
-      <TR><TD PORT="attach" COLSPAN="3" ALIGN="LEFT">attach</TD></TR>
-      <TR><TD PORT="mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mid</TD></TR>
-      <TR><TD PORT="parent_mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent_mid</TD></TR>
-      <TR><TD PORT="mail_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_deleted</TD></TR>
-      <TR><TD PORT="mail_replied" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_replied</TD></TR>
-      <TR><TD PORT="mail_isreply" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_isreply</TD></TR>
-      <TR><TD PORT="mail_seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_seen</TD></TR>
-      <TR><TD PORT="mail_recalled" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_recalled</TD></TR>
-      <TR><TD PORT="mail_obscured" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_obscured</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-}