Merge pull request #509 from DemocracyEarth/search

Multiple DAOs

.meteor/packages

@@ -12,7 +12,7 @@
 meteor-base@1.4.0             # Packages every Meteor app needs to have
 tracker@1.2.0                 # Meteor's client-side reactive programming library
 es5-shim@4.8.0                # ECMAScript 5 compatibility for older browsers.
-ecmascript@0.14.0             # Enable ECMAScript2015+ syntax in app code
+ecmascript@0.14.3             # Enable ECMAScript2015+ syntax in app code
 
 # standard libraries
 jquery@1.11.10                # Helpful client-side library
@@ -31,7 +31,7 @@ react-template-helper
 react-meteor-data
 
 # data
-mongo@1.8.0                   # The database Meteor supports right now
+mongo@1.10.0                   # The database Meteor supports right now
 aldeed:simple-schema
 aldeed:collection2
 dburles:collection-helpers
@@ -46,12 +46,12 @@ tap:i18n
 # accounts, users
 session@1.2.0                 # Client-side reactive dictionary for your app
 accounts-ui@1.3.1
-accounts-password@1.5.2
+accounts-password@1.6.0
 accounts-twitter@1.4.2
 accounts-facebook@1.3.2
 
 # mobile
-mobile-experience@1.0.5       # Packages for a great mobile UX
+mobile-experience@1.1.0       # Packages for a great mobile UX
 
 # production
 
@@ -79,13 +79,13 @@ edgee:slingshot
 http@1.4.2
 email@1.2.3
 service-configuration@1.0.11
-shell-server@0.4.0
+shell-server@0.5.0
 dispatch:mocha-phantomjs
 reactive-var@1.0.11
 reactive-dict@1.3.0
 facebook-config-ui@1.0.2
 twitter-config-ui@1.0.0
-dynamic-import@0.5.1
+dynamic-import@0.5.2
 mdg:meteor-apm-agent
 tmeasday:publish-counts
 konecty:nrr

.meteor/release

@@ -1 +1 @@
-METEOR@1.9
+METEOR@1.10.2

.meteor/versions

@@ -1,7 +1,7 @@
-accounts-base@1.5.0
+accounts-base@1.6.0
 accounts-facebook@1.3.2
-accounts-oauth@1.1.16
-accounts-password@1.5.3
+accounts-oauth@1.2.0
+accounts-password@1.6.0
 accounts-twitter@1.4.2
 accounts-ui@1.3.1
 accounts-ui-unstyled@1.4.2
@@ -12,15 +12,15 @@ aldeed:schema-index@1.1.1
 aldeed:simple-schema@1.5.4
 allow-deny@1.1.0
 autoupdate@1.6.0
-babel-compiler@7.5.1
+babel-compiler@7.5.3
 babel-runtime@1.5.0
 base64@1.0.12
 binary-heap@1.0.11
 blaze@2.3.4
 blaze-html-templates@1.1.2
 blaze-tools@1.0.10
-boilerplate-generator@1.6.0
-caching-compiler@1.2.1
+boilerplate-generator@1.7.0
+caching-compiler@1.2.2
 caching-html-compiler@1.1.3
 callback-hook@1.3.0
 cfs:http-methods@0.0.32
@@ -32,13 +32,13 @@ ddp@1.4.0
 ddp-client@2.3.3
 ddp-common@1.4.0
 ddp-rate-limiter@1.0.7
-ddp-server@2.3.0
+ddp-server@2.3.1
 deps@1.0.12
 diff-sequence@1.1.1
 dispatch:mocha-phantomjs@0.1.9
 dispatch:phantomjs-tests@0.0.7
-dynamic-import@0.5.1
-ecmascript@0.14.1
+dynamic-import@0.5.2
+ecmascript@0.14.3
 ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.10.0
 ecmascript-runtime-server@0.9.0
@@ -47,7 +47,7 @@ ejson@1.1.1
 email@1.2.3
 es5-shim@4.8.0
 facebook-config-ui@1.0.2
-facebook-oauth@1.6.0
+facebook-oauth@1.7.0
 fetch@0.1.1
 geojson-utils@1.0.10
 harrison:papa-parse@1.1.7
@@ -56,7 +56,7 @@ html-tools@1.0.11
 htmljs@1.0.11
 http@1.4.2
 id-map@1.1.0
-inter-process-messaging@0.1.0
+inter-process-messaging@0.1.1
 iron:controller@1.0.12
 iron:core@1.0.11
 iron:dynamic-template@1.0.12
@@ -68,7 +68,7 @@ iron:url@1.1.0
 jquery@1.11.11
 kadira:dochead@1.5.0
 konecty:nrr@2.0.2
-launch-screen@1.1.1
+launch-screen@1.2.0
 less@2.8.0
 lh84:medium-editor@5.4.0
 livedata@1.0.18
@@ -84,25 +84,25 @@ meteorhacks:search-source@1.4.2
 meteorhacks:ssr@2.2.0
 meteorspark:util@0.2.0
 minifier-css@1.5.0
-minimongo@1.4.5
+minimongo@1.6.0
 miro:preloader@1.2.4
-mobile-experience@1.0.5
-mobile-status-bar@1.0.14
+mobile-experience@1.1.0
+mobile-status-bar@1.1.0
 modern-browsers@0.1.5
 modules@0.15.0
 modules-runtime@0.12.0
-mongo@1.8.0
+mongo@1.10.0
 mongo-decimal@0.1.1
 mongo-dev-server@1.1.0
 mongo-id@1.0.7
 mongo-livedata@1.0.12
 mrt:jquery-ui@1.9.2
 mystor:device-detection@0.2.0
 npm-bcrypt@0.9.3
-npm-mongo@3.3.0
-oauth@1.2.8
-oauth1@1.2.2
-oauth2@1.2.1
+npm-mongo@3.7.1
+oauth@1.3.0
+oauth1@1.3.0
+oauth2@1.3.0
 observe-sequence@1.0.16
 ordered-dict@1.1.0
 practicalmeteor:chai@2.1.0_1
@@ -113,7 +113,7 @@ practicalmeteor:sinon@1.14.1_2
 promise@0.11.2
 raix:eventemitter@0.1.3
 rajit:bootstrap3-datepicker@1.7.1_1
-random@1.1.0
+random@1.2.0
 rate-limit@1.0.9
 react-meteor-data@0.2.16
 react-template-helper@0.2.11
@@ -126,11 +126,11 @@ server-render@0.3.1
 service-configuration@1.0.11
 session@1.2.0
 sha@1.0.9
-shell-server@0.4.0
-socket-stream-client@0.2.2
+shell-server@0.5.0
+socket-stream-client@0.3.0
 spacebars@1.0.15
 spacebars-compiler@1.1.3
-srp@1.0.12
+srp@1.1.0
 standard-minifier-css@1.6.0
 tap:i18n@1.8.2
 templating@1.3.2
@@ -145,9 +145,9 @@ twitter-config-ui@1.0.0
 twitter-oauth@1.2.0
 ui@1.0.13
 underscore@1.0.10
-url@1.2.0
+url@1.3.0
 velocityjs:velocityjs@1.2.1
-webapp@1.8.2
+webapp@1.9.1
 webapp-hashing@1.0.9
 xolvio:backdoor@0.2.1
-xolvio:cleaner@0.3.3
+xolvio:cleaner@0.4.0

README.md

@@ -25,7 +25,7 @@ Read our 📃 [white paper](https://github.com/DemocracyEarth/paper) and check o
 
 **Release:**
 
-* Currently [`version 0.7`](https://github.com/DemocracyEarth/sovereign/releases)
+* Currently [`version 0.8`](https://github.com/DemocracyEarth/sovereign/releases)
 * This [User Agreement](https://github.com/DemocracyEarth/sovereign/blob/master/UserAgreement.md) governs access to and use of the Democracy Earth platform.
 
 ## Setup
@@ -104,7 +104,7 @@ Read our 📃 [white paper](https://github.com/DemocracyEarth/paper) and check o
 
 ## Specifications
 
-* Built with [Meteor](https://github.com/meteor/meteor) version 1.9
+* Built with [Meteor](https://github.com/meteor/meteor) version 1.10
 * Check our [documentation](http://docs.democracy.earth) for further technical reference (work in progress).
 
 **Supported Browsers:**

i18n/en.i18n.json

@@ -216,12 +216,12 @@
   "vote-proposal": "<strong>Vote</strong> Proposal",
   "edit-draft": "<strong>Edit</strong> Draft",
   "posted": "Posted",
-  "years-ago" : "years ago.",
-  "months-ago" : "months ago.",
-  "days-ago" : "days ago.",
-  "hours-ago" : "hours ago.",
-  "minutes-ago" : "minutes ago.",
-  "seconds-ago" : "seconds ago.",
+  "years-ago" : "years ago",
+  "months-ago" : "months ago",
+  "days-ago" : "days ago",
+  "hours-ago" : "hours ago",
+  "minutes-ago" : "minutes ago",
+  "seconds-ago" : "seconds ago",
   "years-compressed" : "years",
   "months-compressed" : "months",
   "days-compressed" : "days",
@@ -524,8 +524,8 @@
   "email-farewell": "Be well and keep in touch,",
   "email-modified-vote": "a modified vote",
   "username-already-exists": "Username already exists.",
-  "profile-tag-title": "{{user}}'s profile on {{collective}}.",
-  "profile-tag-description": "Proposed ideas, delegations and votes by {{user}} on {{collective}}.",
+  "profile-tag-title": "{{user}} activity.",
+  "profile-tag-description": "Proposals by {{user}}.",
   "vote-tag-title": "Posted on {{collective}}.",
   "vote-tag-ballot-title": "Vote on {{collective}}.",
   "hashtag-tag-title": "{{hashtag}} posts on {{collective}}.",
@@ -716,15 +716,15 @@
   "duration": "Duration",
   "blockchain-time-closing-criteria": "Poll ends when <strong>{{blockchain}}</strong> reaches a cycle of <strong>{{height}}</strong> cycles estimated on <strong>{{date}}</strong>.",
   "blockchain-time-always-on": "This poll never ends and tallies an ongoing result.",
-  "countdown-expiration": "Poll ends in {{days}} {{hours}} (in {{blocks}})",
-  "countdown-queue": "Poll will begin in {{days}} {{hours}} (in {{blocks}})",
-  "countdown-grace": "Grace period ends in {{days}} {{hours}} (in {{blocks}})",
+  "countdown-expiration": "Poll ends in {{days}} {{hours}}.",
+  "countdown-queue": "Poll will begin in {{days}} {{hours}}.",
+  "countdown-grace": "Grace period ends in {{days}} {{hours}}.",
   "countdown-process": "Proposal is ready to be processed.",
   "periods-compressed": "cycles",
   "periods-singular": "cycle",
   "blocks-compressed": "blocks",
   "blocks-singular": "block",
-  "poll-closed-after-time": "Poll ended after {{days}} (at cycle {{height}})",
+  "poll-closed-after-time": "Poll ended after {{days}}.",
   "poll-never-ends": "This poll never ends (always on).",
   "height-compressed": "blocks",
   "height-singular": "block",
@@ -768,8 +768,10 @@
   "moloch-process": "Ready for processing",
   "moloch-period": "Period",
   "moloch-results": "Results",
-  "moloch-map-submit-proposal": "<root><description json='{{details}}'></description> <request quantity='{{sharesRequested}}' token='MOLOCH'></request> <user _id='{{applicantId}}' username='{{applicant}}'></user> <tribute quantity='{{ether tokenTribute}}' token='WETH'></tribute></root>",
-  "moloch-map-rage-quit": "<root><ragequit quantity='{{sharesToBurn}}' token='MOLOCH'></ragequit></root>",
+  "moloch-period-dao-specific": "Period of {{dao}}",
+  "moloch-results-dao-specific": "Results of {{dao}}",
+  "moloch-map-submit-proposal": "<root><description json='{{details}}'></description> <request quantity='{{sharesRequested}}' token='SHARES'></request> <user _id='{{applicantId}}' username='{{applicant}}'></user> <tribute quantity='{{ether tokenTribute}}' token='WETH'></tribute></root>",
+  "moloch-map-rage-quit": "<root><ragequit quantity='{{sharesToBurn}}' token='SHARES'></ragequit></root>",
   "moloch-yes": "Yes",
   "moloch-no": "No",
   "moloch-tribute": "Tribute to DAO",
@@ -789,7 +791,7 @@
   "moloch-period-rejected": "Rejected.",
   "moloch-period-aborted": "Aborted.",
   "syncing": "Syncing...",
-  "moloch-all": "All History",
+  "moloch-all": "History",
   "moloch-addresses": "Member addresses",
   "moloch-address": "Member address",
   "sign-out": "Sign Out",
@@ -810,6 +812,7 @@
   "moloch-alert-not-member": "The address being used to vote is not a valid member of this DAO.",
   "moloch-not-member": "Not a Member",
   "moloch-period-ragequit": "Ragequit",
+  "moloch-ragequit-short": "Quit",
   "moloch-ragequit": "Ragequit",
   "moloch-ragequit-shares-burn": "Burnt shares",
   "moloch-ragequit-funds-withdraw": "Withdrawn Funds",
@@ -837,5 +840,11 @@
   "replica-detail-unlikely-human": "🤖 Maybe robot.",
   "replica-detail-not-human": "👾 Definitely robot.",
   "replica-detail-unknown-human": "😔 Unknown score.",
-  "sign-out-prompt": "Sign out from current account?"
+  "sign-out-prompt": "Sign out from current account?",
+  "search-daos": "Search DAOs",
+  "collective-dao-title": "{{dao}} — Distributed Autonomous Organization.",
+  "collective-dao-description": "Proposals and votes from {{dao}}.",
+  "dao-proposals": "DAO Proposals.",
+  "dao-events": "DAO Events.",
+  "all-daos": "All DAOs"
 }

imports/api/contracts/Contracts.js

@@ -615,6 +615,10 @@ Schema.Contract = new SimpleSchema({
     type: String,
     optional: true,
   },
+  proposalIndex: {
+    type: Number,
+    optional: true,
+  },
   didPass: {
     type: Boolean,
     optional: true,