SilentLittleCat 7 vuotta sitten
vanhempi
commit
8c19394162
100 muutettua tiedostoa jossa 41 lisäystä ja 16 poistoa
  1. 1 1
      .gitignore
  2. 40 15
      .idea/workspace.xml
  3. 0 0
      data/attachment/album/index.htm
  4. BIN
      data/attachment/block/00/00f231102f3b855a5e518355cb620b41.jpg
  5. 0 0
      data/attachment/block/00/index.html
  6. BIN
      data/attachment/block/03/03d5072f5232561b9c0f44488afb3c17.jpg
  7. 0 0
      data/attachment/block/03/index.html
  8. BIN
      data/attachment/block/15/155282fd9a8d0cbf64e78d2f9e91c953.jpg
  9. 0 0
      data/attachment/block/15/index.html
  10. BIN
      data/attachment/block/18/186418823641f2a4b216a4f9fc6d391d.jpg
  11. 0 0
      data/attachment/block/18/index.html
  12. 0 0
      data/attachment/block/19/index.html
  13. 0 0
      data/attachment/block/22/index.html
  14. BIN
      data/attachment/block/23/236aad35faaa352f17e3cdcd765c487b.jpg
  15. 0 0
      data/attachment/block/23/index.html
  16. 0 0
      data/attachment/block/3c/index.html
  17. 0 0
      data/attachment/block/3d/index.html
  18. BIN
      data/attachment/block/3e/3e32fabfe55e4f307675624a26bf63a0.jpg
  19. 0 0
      data/attachment/block/3e/index.html
  20. 0 0
      data/attachment/block/40/index.html
  21. BIN
      data/attachment/block/43/43579b9b7c6eff141d29f00d0114dd66.jpg
  22. 0 0
      data/attachment/block/43/index.html
  23. BIN
      data/attachment/block/44/448ebb8f9102091273c7acc695809989.jpg
  24. 0 0
      data/attachment/block/44/index.html
  25. 0 0
      data/attachment/block/46/index.html
  26. BIN
      data/attachment/block/4b/4b5c049d40e0c67ec0cc6eeec060ff00.jpg
  27. 0 0
      data/attachment/block/4b/index.html
  28. BIN
      data/attachment/block/50/5070ee4732b20592e418beaa83950695.jpg
  29. 0 0
      data/attachment/block/50/index.html
  30. BIN
      data/attachment/block/59/594153466da5ebef5c29d533b5635fd6.jpg
  31. 0 0
      data/attachment/block/59/index.html
  32. BIN
      data/attachment/block/5d/5d938cc273b8500227ee3e9052615af6.jpg
  33. 0 0
      data/attachment/block/5d/index.html
  34. BIN
      data/attachment/block/69/699495b94a5e4b003a767ecff158235f.jpg
  35. 0 0
      data/attachment/block/69/index.html
  36. BIN
      data/attachment/block/6c/6cb7e163a85f789a9e076a92d563a25d.jpg
  37. 0 0
      data/attachment/block/6c/index.html
  38. BIN
      data/attachment/block/6e/6eb9d9fe9a532133a3df3fea2be10e66.jpg
  39. 0 0
      data/attachment/block/6e/index.html
  40. BIN
      data/attachment/block/72/7236949d7bd947771f40f8ac5017a0ec.jpg
  41. 0 0
      data/attachment/block/72/index.html
  42. 0 0
      data/attachment/block/73/index.html
  43. BIN
      data/attachment/block/77/77d35751c56b95f21124f5f6b9390d1d.jpg
  44. 0 0
      data/attachment/block/77/index.html
  45. BIN
      data/attachment/block/78/78637432b61e4e2131ccf3a31bfef3b4.jpg
  46. 0 0
      data/attachment/block/78/index.html
  47. 0 0
      data/attachment/block/79/index.html
  48. BIN
      data/attachment/block/7a/7af3c7f4157d1a4b2beaa9083264065f.jpg
  49. 0 0
      data/attachment/block/7a/index.html
  50. 0 0
      data/attachment/block/7c/index.html
  51. BIN
      data/attachment/block/82/82c24de6c25096ebddf33f9f61a8d4f0.jpg
  52. 0 0
      data/attachment/block/82/index.html
  53. 0 0
      data/attachment/block/84/index.html
  54. BIN
      data/attachment/block/8a/8acffb72dbfb8e1236a355ec27ac775a.jpg
  55. 0 0
      data/attachment/block/8a/index.html
  56. BIN
      data/attachment/block/8d/8d8c4d62c1b2dd15876cba5641a9df9d.jpg
  57. 0 0
      data/attachment/block/8d/index.html
  58. BIN
      data/attachment/block/8f/8fcfda56614f891f9b137379fce0d5d7.jpg
  59. 0 0
      data/attachment/block/8f/index.html
  60. BIN
      data/attachment/block/94/94320af713f21dd9d12f632d911645cb.jpg
  61. 0 0
      data/attachment/block/94/index.html
  62. BIN
      data/attachment/block/95/956bcd82dce74743b05c7f6aafa26ba7.jpg
  63. 0 0
      data/attachment/block/95/index.html
  64. BIN
      data/attachment/block/9a/9ac52b558f4c69a967ed33cd38f47d45.jpg
  65. 0 0
      data/attachment/block/9a/index.html
  66. BIN
      data/attachment/block/a0/a0409ec388bde8801c616fbef06e2c32.jpg
  67. 0 0
      data/attachment/block/a0/index.html
  68. BIN
      data/attachment/block/a3/a372edf2b3bdc7ecb354aab4f3e486c1.jpg
  69. 0 0
      data/attachment/block/a3/index.html
  70. 0 0
      data/attachment/block/af/index.html
  71. BIN
      data/attachment/block/b5/b526ce05e7246eef1dbcd8e144430de2.jpg
  72. 0 0
      data/attachment/block/b5/index.html
  73. BIN
      data/attachment/block/b9/b98d589d0bf1bdcfdc56bb2adc824ff9.jpg
  74. 0 0
      data/attachment/block/b9/index.html
  75. BIN
      data/attachment/block/bb/bb5218a1ba21de4b697b2fa4fe180d85.jpg
  76. 0 0
      data/attachment/block/bb/index.html
  77. BIN
      data/attachment/block/bd/bdea1efbe8c0fc7537939d5b8ff7b4ce.jpg
  78. 0 0
      data/attachment/block/bd/index.html
  79. BIN
      data/attachment/block/be/be6127c38d0e92c531f2f2bb9f79f22f.jpg
  80. 0 0
      data/attachment/block/be/index.html
  81. 0 0
      data/attachment/block/c1/index.html
  82. 0 0
      data/attachment/block/c4/index.html
  83. 0 0
      data/attachment/block/c7/index.html
  84. BIN
      data/attachment/block/c9/c97a226706f7759bd8c676ff8e36c4a3.jpg
  85. 0 0
      data/attachment/block/c9/index.html
  86. 0 0
      data/attachment/block/cb/index.html
  87. BIN
      data/attachment/block/cd/cda74c57d608df5aebe906a97d2bb776.jpg
  88. 0 0
      data/attachment/block/cd/index.html
  89. BIN
      data/attachment/block/cf/cf3b3f1cb00aafa6e97656afbaf85213.jpg
  90. BIN
      data/attachment/block/cf/cfc86c7ae548cb5b906ad8d5b476ed2f.jpg
  91. 0 0
      data/attachment/block/cf/index.html
  92. BIN
      data/attachment/block/d5/d56f2c53cab63ae57996f22d6af0cfc8.jpg
  93. 0 0
      data/attachment/block/d5/index.html
  94. BIN
      data/attachment/block/dd/dd12eb275e66cf4187bd3f42b3968ae8.jpg
  95. 0 0
      data/attachment/block/dd/index.html
  96. BIN
      data/attachment/block/e2/e2c2e66aec9c2c8242fab9c08c156597.jpg
  97. 0 0
      data/attachment/block/e2/index.html
  98. BIN
      data/attachment/block/f1/f19686f8abb9710d5d534d310cf9804a.jpg
  99. 0 0
      data/attachment/block/f1/index.html
  100. 0 0
      data/attachment/block/f2/index.html

+ 1 - 1
.gitignore

xqd
@@ -1 +1 @@
-
+data/attachment/*

+ 40 - 15
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="" />
+    <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -21,10 +24,10 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="3_diy_group_group_sg.tpl.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="3_diy_group_group_sg.tpl.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group_sg.tpl.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1669">
+            <state relative-caret-position="-1762">
               <caret line="1056" column="42" lean-forward="true" selection-start-line="1056" selection-start-column="42" selection-end-line="1056" selection-end-column="42" />
               <folding>
                 <element signature="e#5295#5318#0#HTML" expanded="true" />
@@ -35,6 +38,16 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/.gitignore">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="31">
+              <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
@@ -93,7 +106,6 @@
         <option value="$PROJECT_DIR$/source/function/function_member.php" />
         <option value="$PROJECT_DIR$/config/config_global_default.php" />
         <option value="$PROJECT_DIR$/source/class/discuz/discuz_admincp.php" />
-        <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/portal.php" />
         <option value="$PROJECT_DIR$/forum.php" />
         <option value="$PROJECT_DIR$/home.php" />
@@ -113,6 +125,7 @@
         <option value="$PROJECT_DIR$/source/function/function_forum.php" />
         <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_group_sg.tpl.php" />
+        <option value="$PROJECT_DIR$/.gitignore" />
       </list>
     </option>
   </component>
@@ -160,6 +173,17 @@
               <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
               <item name="config" type="2a2b976b:PhpTreeStructureProvider$1" />
             </path>
+            <path>
+              <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
+              <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="data" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
+              <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="data" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="attachment" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -212,18 +236,18 @@
       <workItem from="1525658293907" duration="23514000" />
       <workItem from="1525701498505" duration="7843000" />
       <workItem from="1525738524458" duration="1328000" />
-      <workItem from="1525788960861" duration="5122000" />
+      <workItem from="1525788960861" duration="5432000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="63681000" />
+    <option name="totallyTimeSpent" value="63991000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1796875" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1796875" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -255,13 +279,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/discuz_style_wfdsoft_jiaohu.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/data/template/index.htm">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -657,7 +674,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group_sg.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1669">
+        <state relative-caret-position="-1762">
           <caret line="1056" column="42" lean-forward="true" selection-start-line="1056" selection-start-column="42" selection-end-line="1056" selection-end-column="42" />
           <folding>
             <element signature="e#5295#5318#0#HTML" expanded="true" />
@@ -667,5 +684,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="31">
+          <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

+ 0 - 0
data/attachment/album/index.htm


BIN
data/attachment/block/00/00f231102f3b855a5e518355cb620b41.jpg


+ 0 - 0
data/attachment/block/00/index.html


BIN
data/attachment/block/03/03d5072f5232561b9c0f44488afb3c17.jpg


+ 0 - 0
data/attachment/block/03/index.html


BIN
data/attachment/block/15/155282fd9a8d0cbf64e78d2f9e91c953.jpg


+ 0 - 0
data/attachment/block/15/index.html


BIN
data/attachment/block/18/186418823641f2a4b216a4f9fc6d391d.jpg


+ 0 - 0
data/attachment/block/18/index.html


+ 0 - 0
data/attachment/block/19/index.html


+ 0 - 0
data/attachment/block/22/index.html


BIN
data/attachment/block/23/236aad35faaa352f17e3cdcd765c487b.jpg


+ 0 - 0
data/attachment/block/23/index.html


+ 0 - 0
data/attachment/block/3c/index.html


+ 0 - 0
data/attachment/block/3d/index.html


BIN
data/attachment/block/3e/3e32fabfe55e4f307675624a26bf63a0.jpg


+ 0 - 0
data/attachment/block/3e/index.html


+ 0 - 0
data/attachment/block/40/index.html


BIN
data/attachment/block/43/43579b9b7c6eff141d29f00d0114dd66.jpg


+ 0 - 0
data/attachment/block/43/index.html


BIN
data/attachment/block/44/448ebb8f9102091273c7acc695809989.jpg


+ 0 - 0
data/attachment/block/44/index.html


+ 0 - 0
data/attachment/block/46/index.html


BIN
data/attachment/block/4b/4b5c049d40e0c67ec0cc6eeec060ff00.jpg


+ 0 - 0
data/attachment/block/4b/index.html


BIN
data/attachment/block/50/5070ee4732b20592e418beaa83950695.jpg


+ 0 - 0
data/attachment/block/50/index.html


BIN
data/attachment/block/59/594153466da5ebef5c29d533b5635fd6.jpg


+ 0 - 0
data/attachment/block/59/index.html


BIN
data/attachment/block/5d/5d938cc273b8500227ee3e9052615af6.jpg


+ 0 - 0
data/attachment/block/5d/index.html


BIN
data/attachment/block/69/699495b94a5e4b003a767ecff158235f.jpg


+ 0 - 0
data/attachment/block/69/index.html


BIN
data/attachment/block/6c/6cb7e163a85f789a9e076a92d563a25d.jpg


+ 0 - 0
data/attachment/block/6c/index.html


BIN
data/attachment/block/6e/6eb9d9fe9a532133a3df3fea2be10e66.jpg


+ 0 - 0
data/attachment/block/6e/index.html


BIN
data/attachment/block/72/7236949d7bd947771f40f8ac5017a0ec.jpg


+ 0 - 0
data/attachment/block/72/index.html


+ 0 - 0
data/attachment/block/73/index.html


BIN
data/attachment/block/77/77d35751c56b95f21124f5f6b9390d1d.jpg


+ 0 - 0
data/attachment/block/77/index.html


BIN
data/attachment/block/78/78637432b61e4e2131ccf3a31bfef3b4.jpg


+ 0 - 0
data/attachment/block/78/index.html


+ 0 - 0
data/attachment/block/79/index.html


BIN
data/attachment/block/7a/7af3c7f4157d1a4b2beaa9083264065f.jpg


+ 0 - 0
data/attachment/block/7a/index.html


+ 0 - 0
data/attachment/block/7c/index.html


BIN
data/attachment/block/82/82c24de6c25096ebddf33f9f61a8d4f0.jpg


+ 0 - 0
data/attachment/block/82/index.html


+ 0 - 0
data/attachment/block/84/index.html


BIN
data/attachment/block/8a/8acffb72dbfb8e1236a355ec27ac775a.jpg


+ 0 - 0
data/attachment/block/8a/index.html


BIN
data/attachment/block/8d/8d8c4d62c1b2dd15876cba5641a9df9d.jpg


+ 0 - 0
data/attachment/block/8d/index.html


BIN
data/attachment/block/8f/8fcfda56614f891f9b137379fce0d5d7.jpg


+ 0 - 0
data/attachment/block/8f/index.html


BIN
data/attachment/block/94/94320af713f21dd9d12f632d911645cb.jpg


+ 0 - 0
data/attachment/block/94/index.html


BIN
data/attachment/block/95/956bcd82dce74743b05c7f6aafa26ba7.jpg


+ 0 - 0
data/attachment/block/95/index.html


BIN
data/attachment/block/9a/9ac52b558f4c69a967ed33cd38f47d45.jpg


+ 0 - 0
data/attachment/block/9a/index.html


BIN
data/attachment/block/a0/a0409ec388bde8801c616fbef06e2c32.jpg


+ 0 - 0
data/attachment/block/a0/index.html


BIN
data/attachment/block/a3/a372edf2b3bdc7ecb354aab4f3e486c1.jpg


+ 0 - 0
data/attachment/block/a3/index.html


+ 0 - 0
data/attachment/block/af/index.html


BIN
data/attachment/block/b5/b526ce05e7246eef1dbcd8e144430de2.jpg


+ 0 - 0
data/attachment/block/b5/index.html


BIN
data/attachment/block/b9/b98d589d0bf1bdcfdc56bb2adc824ff9.jpg


+ 0 - 0
data/attachment/block/b9/index.html


BIN
data/attachment/block/bb/bb5218a1ba21de4b697b2fa4fe180d85.jpg


+ 0 - 0
data/attachment/block/bb/index.html


BIN
data/attachment/block/bd/bdea1efbe8c0fc7537939d5b8ff7b4ce.jpg


+ 0 - 0
data/attachment/block/bd/index.html


BIN
data/attachment/block/be/be6127c38d0e92c531f2f2bb9f79f22f.jpg


+ 0 - 0
data/attachment/block/be/index.html


+ 0 - 0
data/attachment/block/c1/index.html


+ 0 - 0
data/attachment/block/c4/index.html


+ 0 - 0
data/attachment/block/c7/index.html


BIN
data/attachment/block/c9/c97a226706f7759bd8c676ff8e36c4a3.jpg


+ 0 - 0
data/attachment/block/c9/index.html


+ 0 - 0
data/attachment/block/cb/index.html


BIN
data/attachment/block/cd/cda74c57d608df5aebe906a97d2bb776.jpg


+ 0 - 0
data/attachment/block/cd/index.html


BIN
data/attachment/block/cf/cf3b3f1cb00aafa6e97656afbaf85213.jpg


BIN
data/attachment/block/cf/cfc86c7ae548cb5b906ad8d5b476ed2f.jpg


+ 0 - 0
data/attachment/block/cf/index.html


BIN
data/attachment/block/d5/d56f2c53cab63ae57996f22d6af0cfc8.jpg


+ 0 - 0
data/attachment/block/d5/index.html


BIN
data/attachment/block/dd/dd12eb275e66cf4187bd3f42b3968ae8.jpg


+ 0 - 0
data/attachment/block/dd/index.html


BIN
data/attachment/block/e2/e2c2e66aec9c2c8242fab9c08c156597.jpg


+ 0 - 0
data/attachment/block/e2/index.html


BIN
data/attachment/block/f1/f19686f8abb9710d5d534d310cf9804a.jpg


+ 0 - 0
data/attachment/block/f1/index.html


+ 0 - 0
data/attachment/block/f2/index.html


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä