Skip to content

Commit

Permalink
Merge pull request #131 from aboire/desktop
Browse files Browse the repository at this point in the history
update
  • Loading branch information
aboire authored Mar 24, 2017
2 parents 62e3ab8 + 2387e70 commit bde3b56
Show file tree
Hide file tree
Showing 12 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .desktop/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "CommunEvent",
"version": "0.0.28",
"version": "0.0.30",
"projectName": "communevent",
"devTools": true,
"devtron": true,
Expand Down
6 changes: 3 additions & 3 deletions .meteor/cordova-plugins
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
com-sarriaroman-photoviewer@1.1.5
cordova-custom-config@2.0.3
cordova-plugin-contacts@2.2.0
cordova-plugin-device@1.1.1
cordova-plugin-dialogs@1.3.0
cordova-plugin-contacts@2.2.1
cordova-plugin-device@1.1.4
cordova-plugin-dialogs@1.3.1
cordova-plugin-meteor-webapp@1.4.1
phonegap-plugin-barcodescanner@https://github.com/JrontEnd/phonegap-plugin-barcodescanner/tarball/3a4b4ea69c8bff86f9749f7af332fc5b58c88601
cordova-plugin-compat@1.0.0
14 changes: 7 additions & 7 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

meteor-base@1.0.4 # Packages every Meteor app needs to have
mobile-experience@1.0.4 # Packages for a great mobile UX
mongo@1.1.15 # The database Meteor supports right now
mongo@1.1.16 # 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
jquery@1.11.10 # Helpful client-side library
Expand All @@ -24,14 +24,14 @@ reload@1.1.11
random@1.0.10
ejson@1.0.13
spacebars@1.0.12
check@1.2.4
check@1.2.5
momentjs:moment@=2.15.1
mdg:reload-on-resume
copleykj:livestamp
meteorhacks:async
multiply:iron-router-progress
mrt:profile-online
http@1.2.11
http@1.2.12
outatime:geolib
meteoric:ionic
255kb:meteor-status
Expand All @@ -49,7 +49,7 @@ aldeed:autoform
djedi:sanitize-html
rzymek:moment-locale-fr
cfs:graphicsmagick
webapp@1.3.13
webapp@1.3.14
tap:i18n
tap:i18n-ui
gwendall:simple-schema-i18n
Expand All @@ -69,12 +69,12 @@ djabatav:geolocation-plus
tmeasday:publish-counts
reactive-var@1.0.11
crosswalk@1.7.1
standard-minifier-css@1.3.3
standard-minifier-js@1.2.2
standard-minifier-css@1.3.4
standard-minifier-js@1.2.3
force-ssl@1.0.13
froatsnook:request
froatsnook:valid-email
shell-server@0.2.2
shell-server@0.2.3
omega:meteor-desktop-watcher@=0.5.3
omega:meteor-desktop-bundler@=0.5.3
omega:meteor-desktop-localstorage
Expand Down
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.4.3.1
METEOR@1.4.3.2
44 changes: 22 additions & 22 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
255kb:meteor-status@1.5.0
aboire:camera-ui@0.0.2
accounts-base@1.2.14
accounts-base@1.2.15
accounts-ui@1.1.9
accounts-ui-unstyled@1.2.0
accounts-ui-unstyled@1.2.1
aldeed:autoform@5.8.1
aldeed:collection2@2.10.0
aldeed:collection2-core@1.2.0
Expand All @@ -16,12 +16,12 @@ babel-compiler@6.14.1
babel-runtime@1.0.1
base64@1.0.10
binary-heap@1.0.10
blaze@2.3.0
blaze-html-templates@1.1.0
blaze@2.3.2
blaze-html-templates@1.1.2
blaze-tools@1.0.10
boilerplate-generator@1.0.11
caching-compiler@1.1.9
caching-html-compiler@1.1.0
caching-html-compiler@1.1.2
callback-hook@1.0.10
cfs:access-point@0.1.49
cfs:base-package@0.0.30
Expand Down Expand Up @@ -51,7 +51,7 @@ dburles:collection-helpers@1.1.0
ddp@1.2.5
ddp-client@1.3.3
ddp-common@1.2.8
ddp-rate-limiter@1.0.6
ddp-rate-limiter@1.0.7
ddp-server@1.3.13
deps@1.0.12
diff-sequence@1.0.7
Expand All @@ -73,7 +73,7 @@ gwendall:simple-schema-i18n@0.2.3
hot-code-push@1.0.4
html-tools@1.0.11
htmljs@1.0.11
http@1.2.11
http@1.2.12
id-map@1.0.9
iron:controller@1.0.12
iron:core@1.0.11
Expand Down Expand Up @@ -101,20 +101,20 @@ meteoric:ionic@0.2.0
meteorspark:util@0.2.0
minifier-css@1.2.16
minifier-js@1.2.18
minimongo@1.0.20
minimongo@1.0.21
mobile-experience@1.0.4
mobile-status-bar@1.0.14
modules@0.7.9
modules-runtime@0.7.9
momentjs:moment@2.15.1
mongo@1.1.15
mongo@1.1.16
mongo-id@1.0.6
mongo-livedata@1.0.12
mrt:graphicsmagick@1.12.2
mrt:profile-online@0.1.9
multiply:iron-router-progress@1.0.2
npm-mongo@2.2.16_1
observe-sequence@1.0.15
npm-mongo@2.2.24
observe-sequence@1.0.16
omega:meteor-desktop-bundler@0.5.3
omega:meteor-desktop-localstorage@0.0.11
omega:meteor-desktop-watcher@0.5.3
Expand All @@ -127,34 +127,34 @@ raix:eventstate@0.0.4
raix:handlebar-helpers@0.2.5
raix:push@3.1.0-pre.1
random@1.0.10
rate-limit@1.0.6
rate-limit@1.0.7
reactive-dict@1.1.8
reactive-var@1.0.11
reload@1.1.11
retry@1.0.9
reywood:publish-composite@1.4.2
reywood:publish-composite@1.5.1
routepolicy@1.0.12
rzymek:moment-locale-fr@2.14.1
service-configuration@1.0.11
session@1.1.7
sha@1.0.9
shell-server@0.2.2
spacebars@1.0.13
spacebars-compiler@1.1.0
shell-server@0.2.3
spacebars@1.0.15
spacebars-compiler@1.1.2
standard-minifier-css@1.3.4
standard-minifier-js@1.2.3
tap:i18n@1.8.2
tap:i18n-bundler@0.3.0
tap:i18n-ui@0.8.0
templating@1.3.0
templating-compiler@1.3.0
templating-runtime@1.3.0
templating-tools@1.1.0
templating@1.3.2
templating-compiler@1.3.2
templating-runtime@1.3.2
templating-tools@1.1.2
tmeasday:publish-counts@0.8.0
tracker@1.1.2
ui@1.0.12
ui@1.0.13
underscore@1.0.10
url@1.1.0
webapp@1.3.13
webapp@1.3.14
webapp-hashing@1.0.9
webtempest:animate@0.1.9
2 changes: 1 addition & 1 deletion imports/ui/mapevent/mapevent.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ const initialize = ( element, zoom, features ) => {
let city = Session.get('city');
let geo = Location.getReactivePosition();
if(geo && geo.latitude){
L.mapbox.accessToken = 'pk.eyJ1IjoiY29tbXVuZWN0ZXIiLCJhIjoiY2lreWRkNzNrMDA0dXc3bTA1MHkwbXdscCJ9.NbvsJ14y2bMWWdGqucR_EQ';
L.mapbox.accessToken = Meteor.settings.public.mapbox;
map = L.mapbox.map(element,'mapbox.streets').setView(new L.LatLng(parseFloat(geo.latitude), parseFloat(geo.longitude)), zoom);
/*var stamenLayer = L.tileLayer('https://stamen-tiles-{s}.a.ssl.fastly.net/toner/{z}/{x}/{y}.png', {
attribution: 'Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>.'
Expand Down
4 changes: 2 additions & 2 deletions mobile-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ App.info({
description: 'communecter event',
author: 'thomas',
email: 'thomas.craipeau@gmail.com',
version: '0.0.29',
buildNumber: '325'
version: '0.0.30',
buildNumber: '326'
});

App.setPreference('android-targetSdkVersion', '23');
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "communevent",
"version": "0.0.28",
"version": "0.0.30",
"description": "communevent",
"private": true,
"scripts": {
Expand All @@ -23,6 +23,6 @@
},
"homepage": "https://github.com/aboire/communEvent#readme",
"devDependencies": {
"meteor-desktop": "^0.5.3"
"meteor-desktop": "^0.6.1"
}
}
}
2 changes: 1 addition & 1 deletion packages/aboire_camera-ui/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Package.describe({

Cordova.depends({
"cordova-plugin-actionsheet": "2.2.2",
"cordova-plugin-device": "1.1.1"
"cordova-plugin-device": "1.1.4"
});

Package.onUse(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/djabatav_geolocation-plus/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Package.describe({
});

Cordova.depends({
"cordova-plugin-geolocation": "2.3.0",
"cordova-plugin-geolocation": "2.4.1",
"org.flybuy.nativeutils": "https://github.com/pmwisdom/NativeUtils/tarball/64460ce4e28a346245beb2c5a7413bd67a6c148d"
});

Expand Down
2 changes: 1 addition & 1 deletion packages/meteoric_camera/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Package.describe({
});

Cordova.depends({
'cordova-plugin-camera':'2.3.0'
'cordova-plugin-camera':'2.3.1'
});

Package.onUse(function(api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/push-devel/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Npm.depends({

Cordova.depends({
'phonegap-plugin-push': '1.8.2', // previously 1.6.4
'cordova-plugin-device': '1.1.3', // previously 1.1.1
'cordova-plugin-device': '1.1.4', // previously 1.1.1
});

Package.registerBuildPlugin({
Expand Down

0 comments on commit bde3b56

Please sign in to comment.