Unverified Commit a975e1f4 authored by thomas craipeau's avatar thomas craipeau Committed by GitHub

Merge pull request #40 from aboire/master

update
parents 8f1108da 17fcd6bd
Pipeline #3309 failed with stages
in 1 minute and 1 second
......@@ -23,4 +23,6 @@ Dockerfile
npm-debug.log
.docker/
.rancher/
package-lock.json
\ No newline at end of file
package-lock.json
/google-services.json
/GoogleService-Info.plist
\ No newline at end of file
......@@ -16,3 +16,4 @@ notices-for-facebook-graph-api-2
1.4.1-add-shell-server-package
1.4.3-split-account-service-packages
1.5-add-dynamic-import-package
1.7-split-underscore-from-meteor-base
com-sarriaroman-photoviewer@1.1.5
cordova-custom-config@2.0.3
cordova-plugin-android-permissions@https://github.com/NeoLSN/cordova-plugin-android-permissions/tarball/master
cordova-plugin-android-sensor-listeners@https://github.com/QuentinRoy/cordova-plugin-android-sensor-listeners/tarball/master
cordova-plugin-compat@https://github.com/apache/cordova-plugin-compat/tarball/master
cordova-plugin-contacts@2.3.1
cordova-plugin-device@1.1.6
cordova-custom-config@2.0.3
cordova-plugin-device@2.0.2
cordova-plugin-dialogs@1.3.3
cordova-plugin-geofence@file://./packages/cordova-plugin-geofence
cordova-plugin-media-capture@1.4.3
cordova-plugin-meteor-webapp@1.4.1
cordova-plugin-crosswalk-webview@2.3.0
cordova-plugin-inappbrowser@2.0.0
me.dispatch.crosswalk-permissions@file://./packages
phonegap-plugin-barcodescanner@https://github.com/JrontEnd/phonegap-plugin-barcodescanner/tarball/3a4b4ea69c8bff86f9749f7af332fc5b58c88601
cordova-plugin-statusbar@2.3.0
\ No newline at end of file
......@@ -4,35 +4,41 @@
# 'meteor add' and 'meteor remove' will edit this file for you,
# but you can also edit it by hand.
meteor-base@1.3.0 # Packages every Meteor app needs to have
meteor@1.9.2
webapp@1.7.3-beta181.15
ddp@1.4.0
livedata@1.0.18
es5-shim@4.8.0
hot-code-push@1.0.4
mobile-experience@1.0.5 # Packages for a great mobile UX
mongo@1.4.2 # The database Meteor supports right now
mongo@1.6.0 # The database Meteor supports right now
blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views
session@1.1.7 # Client-side reactive dictionary for your app
session@1.2.0-beta181.15 # Client-side reactive dictionary for your app
jquery@1.11.10 # Helpful client-side library
tracker@1.1.3 # Meteor's client-side reactive programming library
tracker@1.2.0 # Meteor's client-side reactive programming library
es5-shim@4.7.0 # ECMAScript 5 compatibility for older browsers.
ecmascript@0.10.0 # Enable ECMAScript2015+ syntax in app code
ecmascript@0.12.4 # Enable ECMAScript2015+ syntax in app code
#accounts-ui
communecter:account
iron:router
logging@1.1.19
reload@1.2.0
logging@1.1.20
reload@1.3.0-beta181.15
random@1.1.0
ejson@1.1.0
spacebars@1.0.12
check@1.3.0
check@1.3.1
momentjs:moment@2.15.1
mdg:reload-on-resume
#mdg:reload-on-resume
jamielob:reloader
copleykj:livestamp
meteorhacks:async
multiply:iron-router-progress
#mrt:profile-online
http@1.4.0
http@1.4.2
outatime:geolib
meteoric:ionic
255kb:meteor-status
......@@ -45,7 +51,6 @@ aldeed:autoform
mdg:validated-method
djedi:sanitize-html
rzymek:moment-locale-fr
webapp@1.5.0
tap:i18n
tap:i18n-ui
gwendall:simple-schema-i18n
......@@ -53,7 +58,7 @@ aboire:camera-ui
fourseven:scss
webtempest:animate
meteoric:autoform-ionic
reactive-dict@1.2.0
reactive-dict@1.3.0-beta181.15
meteorhacks:subs-manager
sha@1.0.9
#meteorhacks:kadira
......@@ -65,25 +70,25 @@ djabatav:geolocation-plus
tmeasday:publish-counts
reactive-var@1.0.11
#crosswalk@1.7.1
standard-minifier-css@1.4.0
standard-minifier-js@2.3.1
standard-minifier-css@1.5.2
standard-minifier-js@2.4.0
#force-ssl@1.0.14
froatsnook:request
froatsnook:valid-email
shell-server@0.3.1
omega:meteor-desktop-watcher@=0.12.0
omega:meteor-desktop-bundler@=0.12.0
omega:meteor-desktop-localstorage
shell-server@0.4.0
#omega:meteor-desktop-watcher@=2.0.0
#omega:meteor-desktop-bundler@=2.0.0
#omega:meteor-desktop-localstorage
tap:i18n-bundler
communecter:deep-link
markdown@1.0.12
jameslefrere:atjs
jameslefrere:caretjs
dynamic-import@0.3.0
dynamic-import@0.5.1
aldeed:template-extension
elmarti:video-chat
#elmarti:video-chat
jeremy:selectize
comerc:autoform-selectize
#mdg:meteor-apm-agent
natestrauser:publish-performant-counts
mizzao:user-status
underscore@1.0.10
METEOR@1.6.1
METEOR@1.8.1-beta.15
255kb:meteor-status@1.5.0
aboire:camera-ui@0.0.2
accounts-base@1.4.2
accounts-base@1.4.3
aldeed:autoform@5.8.1
aldeed:collection2@2.10.0
aldeed:collection2-core@1.2.0
aldeed:schema-deny@1.1.0
aldeed:schema-index@1.1.1
aldeed:simple-schema@1.5.3
aldeed:simple-schema@1.5.4
aldeed:template-extension@4.1.0
allow-deny@1.1.0
amplify@1.0.0
autoupdate@1.4.0
babel-compiler@7.0.5
babel-runtime@1.2.2
autoupdate@1.6.0-beta181.15
babel-compiler@7.2.4
babel-runtime@1.3.0
base64@1.0.11
binary-heap@1.0.10
blaze@2.3.2
binary-heap@1.0.11
blaze@2.3.3
blaze-html-templates@1.1.2
blaze-tools@1.0.10
boilerplate-generator@1.4.0
caching-compiler@1.1.11
caching-html-compiler@1.1.2
boilerplate-generator@1.6.0
caching-compiler@1.2.1
caching-html-compiler@1.1.3
callback-hook@1.1.0
cfs:http-methods@0.0.32
check@1.3.0
check@1.3.1
coffeescript@1.0.17
comerc:autoform-selectize@2.3.2
communecter:account@0.0.5
......@@ -32,35 +32,36 @@ communecter:mapbox@2.3.1
copleykj:livestamp@1.1.7
dburles:collection-helpers@1.1.0
ddp@1.4.0
ddp-client@2.3.1
ddp-client@2.3.3
ddp-common@1.4.0
ddp-rate-limiter@1.0.7
ddp-server@2.1.2
ddp-server@2.3.0-beta181.15
deps@1.0.12
diff-sequence@1.1.0
diff-sequence@1.1.1
djabatav:geolocation-plus@1.1.9
djedi:sanitize-html@1.11.3
dschulz:jquery-qrcode@1.0.2
dynamic-import@0.3.0
ecmascript@0.10.5
ecmascript-runtime@0.5.0
ecmascript-runtime-client@0.6.2
ecmascript-runtime-server@0.5.0
dynamic-import@0.5.1
ecmascript@0.12.4
ecmascript-runtime@0.7.0
ecmascript-runtime-client@0.8.0
ecmascript-runtime-server@0.7.1
ejson@1.1.0
elmarti:video-chat@2.2.1
es5-shim@4.7.3
es5-shim@4.8.0
fastclick@1.0.13
fetch@0.1.0
fourseven:scss@3.13.0
froatsnook:request@2.74.0
froatsnook:valid-email@1.0.0
geojson-utils@1.0.10
gwendall:autoform-i18n@0.1.9_1
gwendall:simple-schema-i18n@0.2.3
gwendall:simple-schema-i18n@0.3.1
hot-code-push@1.0.4
html-tools@1.0.11
htmljs@1.0.11
http@1.4.0
http@1.4.2
id-map@1.1.0
inter-process-messaging@0.1.0
iron:controller@1.0.12
iron:core@1.0.11
iron:dynamic-template@1.0.12
......@@ -71,73 +72,67 @@ iron:router@1.1.2
iron:url@1.1.0
jameslefrere:atjs@0.0.1
jameslefrere:caretjs@0.0.1
jamielob:reloader@1.3.0
jeremy:selectize@0.12.1_5
jquery@1.11.11
launch-screen@1.1.1
less@2.7.12
less@2.8.0
livedata@1.0.18
localstorage@1.2.0
logging@1.1.19
markdown@1.0.12
mdg:reload-on-resume@1.0.4
mdg:validated-method@1.1.0
logging@1.1.20
mdg:validated-method@1.2.0
mdg:validation-error@0.5.1
meteor@1.8.4
meteor-base@1.3.0
meteor@1.9.2
meteorhacks:async@1.0.0
meteorhacks:subs-manager@1.6.4
meteoric:autoform-ionic@0.1.6
meteoric:camera@1.0.3
meteoric:ionic@0.2.0
meteorspark:util@0.2.0
minifier-css@1.3.1
minifier-js@2.3.3
minimongo@1.4.3
minifier-css@1.4.1
minifier-js@2.4.0
minimongo@1.4.5
mizzao:timesync@0.5.0
mizzao:user-status@0.6.7
mizzao:user-status@0.6.8
mobile-experience@1.0.5
mobile-status-bar@1.0.14
modules@0.11.5
modules-runtime@0.9.2
momentjs:moment@2.20.1
mongo@1.4.5
modern-browsers@0.1.4-beta181.15
modules@0.13.0
modules-runtime@0.10.3
momentjs:moment@2.23.0
mongo@1.6.0
mongo-decimal@0.1.0
mongo-dev-server@1.1.0
mongo-id@1.0.6
mongo-id@1.0.7
multiply:iron-router-progress@1.0.2
natestrauser:publish-performant-counts@0.1.2
npm-mongo@2.2.34
npm-mongo@3.1.2-beta181.15
observe-sequence@1.0.16
omega:meteor-desktop-bundler@0.12.0
omega:meteor-desktop-localstorage@0.0.11
omega:meteor-desktop-watcher@0.12.0
ordered-dict@1.1.0
outatime:geolib@2.0.15
promise@0.10.2
promise@0.11.2
raix:eventemitter@0.1.3
raix:eventstate@0.0.4
raix:handlebar-helpers@0.2.5
raix:push@3.1.0-pre.1
random@1.1.0
rate-limit@1.0.9
reactive-dict@1.2.0
reactive-dict@1.3.0-beta181.15
reactive-var@1.0.11
reload@1.2.0
reload@1.3.0-beta181.15
retry@1.1.0
reywood:publish-composite@1.5.2
rocketchat:streamer@0.6.2
routepolicy@1.0.12
reywood:publish-composite@1.7.0
routepolicy@1.1.0
rzymek:moment-locale-fr@2.14.1
server-render@0.3.0
service-configuration@1.0.11
session@1.1.7
session@1.2.0
sha@1.0.9
shell-server@0.3.1
shim-common@0.1.0
socket-stream-client@0.1.0
shell-server@0.4.0
socket-stream-client@0.2.2
spacebars@1.0.15
spacebars-compiler@1.1.3
standard-minifier-css@1.4.1
standard-minifier-js@2.3.2
standard-minifier-css@1.5.2
standard-minifier-js@2.4.0
tap:i18n@1.8.2
tap:i18n-bundler@0.3.0
tap:i18n-ui@0.8.0
......@@ -146,10 +141,10 @@ templating-compiler@1.3.3
templating-runtime@1.3.2
templating-tools@1.1.2
tmeasday:publish-counts@0.8.0
tracker@1.1.3
tracker@1.2.0
ui@1.0.13
underscore@1.0.10
url@1.2.0
webapp@1.5.0
webapp@1.7.3-beta181.15
webapp-hashing@1.0.9
webtempest:animate@0.1.9
......@@ -10,9 +10,9 @@ import '../imports/ui/login/login.js';
import '../imports/ui/images/images.js';
import '../imports/ui/video/video.js';
//import '../imports/ui/video/video.js';
import '../imports/ui/sensors/sensors.js';
//import '../imports/ui/sensors/sensors.js';
import '../imports/ui/dashboard/dashboard.js';
......
/* Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
maven {
url "https://maven.google.com"
}
jcenter()
}
dependencies {
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.android.tools.build:gradle:3.0.1'
}
}
allprojects {
repositories {
maven {
url "https://maven.google.com"
}
jcenter()
}
//This replaces project.properties w.r.t. build settings
project.ext {
defaultBuildToolsVersion="27.0.1" //String
defaultMinSdkVersion=21 //Integer - Minimum requirement is Android 4.4
defaultTargetSdkVersion=27 //Integer - We ALWAYS target the latest by default
defaultCompileSdkVersion=27 //Integer - We ALWAYS compile with the latest by default
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}
......@@ -158,7 +158,8 @@
"activitystream":{
"verb":{
"share":"shared",
"create":"created"
"create":"created",
"publish": "publish"
},
"type":{
"organizations":"an organization",
......@@ -279,7 +280,13 @@
"in_a_news": "in a news",
"in_a_comment": "in a comment",
"with":"with",
"and": "and"
"and": "and",
"who_added_a_chat_on_where": "__who__ added a chat on __where__",
"who_react_on_your_news_what": "__who__ react on your news __what__",
"who_react_on_a_news_what_from_where": "__who__ react on your news __what__ from __where__",
"who_reacts_on_a_news_what_from_where": "__who__ reacts on your news __what__ from __where__",
"who_added_new_projects_on_where": "__who__ added new projects on __where__",
"who_commented_on_resolution_what_in_where": "__who__ commented on resolution __what__ in __where__"
}
},
"on the program of":"on the program of :",
......@@ -871,6 +878,9 @@
"endDate":{
"label": "end date"
},
"public":{
"label": "Make the project publicly visible"
},
"country":{
"label": "address country",
"placeholder": "Select one...",
......
......@@ -158,7 +158,8 @@
"activitystream":{
"verb":{
"share":"a partagé",
"create":"a créé"
"create":"a créé",
"publish": "a publié"
},
"type":{
"organizations":"une organisation",
......@@ -279,7 +280,13 @@
"in_a_news": "dans un post",
"in_a_comment": "dans un commentaire",
"with": "avec",
"and": "et"
"and": "et",
"who_added_a_chat_on_where": "__who__ a ajouté une conversation sur __where__",
"who_react_on_your_news_what": "__who__ ont réagi sur votre publication __what__",
"who_react_on_a_news_what_from_where": "__who__ ont réagi sur la publication __what__ de __where__",
"who_reacts_on_a_news_what_from_where": "__who__ a réagi sur la publication __what__ de __where__",
"who_added_new_projects_on_where": "__who__ vous invite à rejoindre __where__",
"who_commented_on_resolution_what_in_where": "__who__ a commenté la résolution __what__ dans __where__"
}
},
"on the program of":"au programme de:",
......@@ -868,6 +875,9 @@
"endDate":{
"label": "Date de fin"
},
"public": {
"label": "Rendre le projet visible publiquement"
},
"country":{
"label": "Pays",
"placeholder": "Sélectionnez un...",
......
......@@ -17,7 +17,7 @@ import { Classified } from './classified.js';
import { Organizations } from './organizations.js';
import { Documents } from './documents.js';
import { ActivityStream } from './activitystream.js';
import { arrayLinkProperNoObject, queryLink, queryOptions, queryLinkInter, nameToCollection } from './helpers.js';
import { queryOrPrivateScopeLinksIds, queryOrPrivateScopeLinks, arrayLinkProperNoObject, queryLink, queryOptions, queryLinkInter, nameToCollection } from './helpers.js';
// Person
export const Citoyens = new Mongo.Collection('citoyens', { idGeneration: 'MONGO' });
......@@ -399,7 +399,8 @@ Citoyens.helpers({
},
listMemberOf (search, selectorga) {
if (this.links && this.links.memberOf) {
const query = queryLink(this.links.memberOf, search, selectorga);
const queryStart = queryLink(this.links.memberOf, search, selectorga);
const query = queryOrPrivateScopeLinksIds(queryStart, 'members');
return Organizations.find(query, queryOptions);
}
return false;
......@@ -409,7 +410,8 @@ Citoyens.helpers({
},
listEvents (search) {
if (this.links && this.links.events) {
const query = queryLink(this.links.events, search);
const queryStart = queryLink(this.links.events, search);
const query = queryOrPrivateScopeLinksIds(queryStart, 'attendees');
return Events.find(query, queryOptions);
}
return false;
......@@ -420,7 +422,8 @@ Citoyens.helpers({
},
listProjects (search) {
if (this.links && this.links.projects) {
const query = queryLink(this.links.projects, search);
const queryStart = queryLink(this.links.projects, search);
const query = queryOrPrivateScopeLinksIds(queryStart, 'contributors');
return Projects.find(query, queryOptions);
}
return false;
......@@ -442,13 +445,7 @@ Citoyens.helpers({
return this.listCollections(type, collections, search) && this.listCollections(type, collections, search).count();
},
listProjectsCreator () {
const query = {};
// query['creator'] = this._id._str;
/* query[`links.contributors.${this._id._str}.isAdmin`] = true;
query[`links.contributors.${this._id._str}.toBeValidated`] = { $exists: false }; */
query[`links.contributors.${this._id._str}`] = { $exists: true };
query[`links.contributors.${this._id._str}.toBeValidated`] = { $exists: false };
query[`links.contributors.${this._id._str}.isInviting`] = { $exists: false };
const query = queryOrPrivateScopeLinks('contributors', this._id._str);
return Projects.find(query, queryOptions);
},
countProjectsCreator () {
......@@ -456,26 +453,19 @@ Citoyens.helpers({
},
listPoiCreator () {
const query = {};
query.parentId = this._id._str;
// query[`links.contributors.${this._id._str}.isAdmin`] = true;
// query[`links.contributors.${this._id._str}.toBeValidated`] = {$exists: false};
query[`parent.${this._id._str}`] = {
$exists: true,
};
return Poi.find(query);
},
countPoiCreator () {
return this.listPoiCreator() && this.listPoiCreator().count();
},
listEventsCreator () {
const query = {};
// query.organizerId = this._id._str;
// query[`links.organizer.${this._id._str}`] = {$exist:1};
queryOptions.fields.organizerId = 1;
queryOptions.fields.parentId = 1;
queryOptions.fields.startDate = 1;
queryOptions.fields.startDate = 1;
queryOptions.fields.geo = 1;
query[`links.attendees.${this._id._str}`] = { $exists: true };
query[`links.attendees.${this._id._str}.toBeValidated`] = { $exists: false };
query[`links.attendees.${this._id._str}.isInviting`] = { $exists: false };
const query = queryOrPrivateScopeLinks('attendees', this._id._str);
return Events.find(query, queryOptions);
},
countEventsCreator () {
......@@ -483,13 +473,7 @@ Citoyens.helpers({
return this.listEventsCreator() && this.listEventsCreator().count();
},
listOrganizationsCreator () {