Merge remote-tracking branch 'upstream/master'

1 files changed, 0 insertions, 59 deletions

diff --git a/hubzilla_er/diagrams/photo.1degree.dot b/hubzilla_er/diagrams/photo.1degree.dot
deleted file mode 100644
index b648a58e6..000000000
--- a/hubzilla_er/diagrams/photo.1degree.dot
+++ /dev/null
@@ -1,59 +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"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD><TD PORT="aid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD><TD PORT="xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="resource_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">resource_id</TD><TD PORT="resource_id.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="2" ALIGN="LEFT">edited</TD><TD PORT="edited.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="title" COLSPAN="2" ALIGN="LEFT">title</TD><TD PORT="title.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT">description</TD><TD PORT="description.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="album" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">album</TD><TD PORT="album.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="filename" COLSPAN="2" ALIGN="LEFT">filename</TD><TD PORT="filename.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="type" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD><TD PORT="type.type" ALIGN="LEFT">char[128]</TD></TR>
-      <TR><TD PORT="height" COLSPAN="2" ALIGN="LEFT">height</TD><TD PORT="height.type" ALIGN="LEFT">smallint[5]</TD></TR>
-      <TR><TD PORT="width" COLSPAN="2" ALIGN="LEFT">width</TD><TD PORT="width.type" ALIGN="LEFT">smallint[5]</TD></TR>
-      <TR><TD PORT="size" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">size</TD><TD PORT="size.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="data" COLSPAN="2" ALIGN="LEFT">data</TD><TD PORT="data.type" ALIGN="LEFT">mediumblob[16777215]</TD></TR>
-      <TR><TD PORT="scale" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">scale</TD><TD PORT="scale.type" ALIGN="LEFT">tinyint[3]</TD></TR>
-      <TR><TD PORT="photo_usage" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">photo_usage</TD><TD PORT="photo_usage.type" ALIGN="LEFT">smallint[5]</TD></TR>
-      <TR><TD PORT="profile" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">profile</TD><TD PORT="profile.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="is_nsfw" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">is_nsfw</TD><TD PORT="is_nsfw.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="os_storage" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">os_storage</TD><TD PORT="os_storage.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="os_path" COLSPAN="2" ALIGN="LEFT">os_path</TD><TD PORT="os_path.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="display_path" COLSPAN="2" ALIGN="LEFT">display_path</TD><TD PORT="display_path.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="photo_flags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">photo_flags</TD><TD PORT="photo_flags.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="2" ALIGN="LEFT">allow_cid</TD><TD PORT="allow_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="2" ALIGN="LEFT">allow_gid</TD><TD PORT="allow_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="2" ALIGN="LEFT">deny_cid</TD><TD PORT="deny_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="2" ALIGN="LEFT">deny_gid</TD><TD PORT="deny_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-}