merge with master

agilescientific · Oct 27, 2015 · 885b3e0 · 885b3e0
2 parents 0685fdf + f7d2655
commit 885b3e0
Show file tree

Hide file tree

Showing 28 changed files with 5,303 additions and 2,112 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,7 +25,8 @@ develop-eggs
 lib
 lib64
 __pycache__
-
+node_modules/
+bower_components/
 # Installer logs
 pip-log.txt
 

diff --git a/fluidsub.py b/fluidsub.py
diff --git a/index.yaml b/index.yaml
@@ -56,6 +56,13 @@ indexes:
   - name: date
     direction: desc
 
+- kind: ImageModel
+  ancestor: yes
+  properties:
+  - name: group
+  - name: date
+    direction: desc
+
 - kind: Issue
   ancestor: yes
   properties:
@@ -114,11 +121,42 @@ indexes:
 # automatically uploaded to the admin console when you next deploy
 # your application using appcfg.py.
 
+- kind: EarthModel
+  properties:
+  - name: user
+  - name: date
+    direction: desc
+
+- kind: EarthModel
+  ancestor: yes
+  properties:
+  - name: group
+  - name: date
+    direction: desc
+
+- kind: Fluid
+  properties:
+  - name: user
+  - name: date
+    direction: desc
+
 - kind: Fluid
   properties:
   - name: user
   - name: name
 
+- kind: Fluid
+  properties:
+  - name: user
+  - name: user
+
+- kind: Fluid
+  ancestor: yes
+  properties:
+  - name: group
+  - name: date
+    direction: desc
+
 - kind: Fluid
   ancestor: yes
   properties:
@@ -130,3 +168,26 @@ indexes:
   - name: user
   - name: date
     direction: desc
+
+- kind: ImageModel
+  properties:
+  - name: user
+  - name: date
+    direction: desc
+
+- kind: ImageModel
+  properties:
+  - name: user
+  - name: user
+
+- kind: Rock
+  properties:
+  - name: user
+  - name: user
+
+- kind: Rock
+  ancestor: yes
+  properties:
+  - name: group
+  - name: date
+    direction: desc