Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / public / local_manifest.json

diff --git a/public/local_manifest.json b/public/local_manifest.json
index fa11db1..84a1125 100644 (file)
--- a/public/local_manifest.json
+++ b/public/local_manifest.json
@@ -322,6 +322,12 @@
         "by_speech_balloon": {\r
           "type": "filter"\r
         },\r
+        "by_speech_balloon_template": {\r
+          "type": "filter"\r
+        },\r
+        "by_writing_format": {\r
+          "type": "filter"\r
+        },\r
         "by_author": {\r
           "type": "foreign_filter",\r
           "args": {\r
@@ -340,6 +346,12 @@
         "by_speech_balloon": {\r
           "type": "filter"\r
         },\r
+        "by_speech_balloon_template": {\r
+          "type": "filter"\r
+        },\r
+        "by_system_picture": {\r
+          "type": "filter"\r
+        },\r
         "by_author": {\r
           "type": "foreign_filter",\r
           "args": {\r
@@ -403,6 +415,9 @@
       "lists": {\r
         "public": {\r
           "type": "public"\r
+        },\r
+        "by_artist": {\r
+          "type": "filter"\r
         }\r
       }\r
     },\r
@@ -759,7 +774,8 @@
       "associations": {\r
         "belongs_to": [\r
           "speech_balloon",\r
-          "writing_format"\r
+          "writing_format",\r
+          "speech_balloon_template"\r
         ]\r
       }\r
     },\r
@@ -784,7 +800,8 @@
       "associations": {\r
         "belongs_to": [\r
           "speech_balloon",\r
-          "system_picture"\r
+          "system_picture",\r
+          "speech_balloon_template"\r
         ]\r
       }\r
     },\r
@@ -917,7 +934,6 @@
       ],\r
       "associations": {\r
         "belongs_to": [\r
-          "original_picture",\r
           "license",\r
           "artist"\r
         ]\r