Merge remote-tracking branch 'upstream/master'

1 files changed, 0 insertions, 79 deletions

diff --git a/hubzilla_er/diagrams/channel.1degree.dot b/hubzilla_er/diagrams/channel.1degree.dot
deleted file mode 100644
index 65df644d9..000000000
--- a/hubzilla_er/diagrams/channel.1degree.dot
+++ /dev/null
@@ -1,79 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  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"
-  ];
-  "channel" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">channel</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">channel_id</TD><TD PORT="channel_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_account_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_account_id</TD><TD PORT="channel_account_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_primary" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_primary</TD><TD PORT="channel_primary.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="channel_name" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_name</TD><TD PORT="channel_name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_address" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_address</TD><TD PORT="channel_address.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_guid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_guid</TD><TD PORT="channel_guid.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_guid_sig" COLSPAN="2" ALIGN="LEFT">channel_guid_sig</TD><TD PORT="channel_guid_sig.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="channel_hash" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_hash</TD><TD PORT="channel_hash.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_timezone" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_timezone</TD><TD PORT="channel_timezone.type" ALIGN="LEFT">char[128]</TD></TR>
-      <TR><TD PORT="channel_location" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_location</TD><TD PORT="channel_location.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_theme" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_theme</TD><TD PORT="channel_theme.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_startpage" COLSPAN="2" ALIGN="LEFT">channel_startpage</TD><TD PORT="channel_startpage.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_pubkey" COLSPAN="2" ALIGN="LEFT">channel_pubkey</TD><TD PORT="channel_pubkey.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="channel_prvkey" COLSPAN="2" ALIGN="LEFT">channel_prvkey</TD><TD PORT="channel_prvkey.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="channel_notifyflags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_notifyflags</TD><TD PORT="channel_notifyflags.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_pageflags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_pageflags</TD><TD PORT="channel_pageflags.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_dirdate" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_dirdate</TD><TD PORT="channel_dirdate.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="channel_lastpost" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_lastpost</TD><TD PORT="channel_lastpost.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="channel_deleted" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_deleted</TD><TD PORT="channel_deleted.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="channel_max_anon_mail" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_anon_mail</TD><TD PORT="channel_max_anon_mail.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_max_friend_req" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_friend_req</TD><TD PORT="channel_max_friend_req.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_expire_days" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_expire_days</TD><TD PORT="channel_expire_days.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="channel_passwd_reset" COLSPAN="2" ALIGN="LEFT">channel_passwd_reset</TD><TD PORT="channel_passwd_reset.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_default_group" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_default_group</TD><TD PORT="channel_default_group.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_allow_cid" COLSPAN="2" ALIGN="LEFT">channel_allow_cid</TD><TD PORT="channel_allow_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="channel_allow_gid" COLSPAN="2" ALIGN="LEFT">channel_allow_gid</TD><TD PORT="channel_allow_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="channel_deny_cid" COLSPAN="2" ALIGN="LEFT">channel_deny_cid</TD><TD PORT="channel_deny_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="channel_deny_gid" COLSPAN="2" ALIGN="LEFT">channel_deny_gid</TD><TD PORT="channel_deny_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="channel_r_stream" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_stream</TD><TD PORT="channel_r_stream.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_profile" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_profile</TD><TD PORT="channel_r_profile.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_photos" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_photos</TD><TD PORT="channel_r_photos.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_abook" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_abook</TD><TD PORT="channel_r_abook.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_stream" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_stream</TD><TD PORT="channel_w_stream.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_wall" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_wall</TD><TD PORT="channel_w_wall.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_tagwall" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_tagwall</TD><TD PORT="channel_w_tagwall.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_comment" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_comment</TD><TD PORT="channel_w_comment.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_mail" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_mail</TD><TD PORT="channel_w_mail.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_photos" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_photos</TD><TD PORT="channel_w_photos.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_chat" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_chat</TD><TD PORT="channel_w_chat.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_a_delegate" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_delegate</TD><TD PORT="channel_a_delegate.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_storage" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_storage</TD><TD PORT="channel_r_storage.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_storage" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_storage</TD><TD PORT="channel_w_storage.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_pages" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_pages</TD><TD PORT="channel_r_pages.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_pages" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_pages</TD><TD PORT="channel_w_pages.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_a_republish" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_republish</TD><TD PORT="channel_a_republish.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_like" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_like</TD><TD PORT="channel_w_like.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_removed" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_removed</TD><TD PORT="channel_removed.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="channel_system" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_system</TD><TD PORT="channel_system.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="channel.html"
-    tooltip="channel"
-  ];
-}