Sunny Negi / Meteor-projects

Download as
Browse Code ยป

Commit d316665ad65fef2a386b8a9a391ee64b3353b583

Authored by Ryan Glover
2 parents d664e8d76c 46f1d4b3a0
Exists in master

Merge branch 'bug/fix_environment_vars_#91' 

Closes #91
Closes #93
Showing 5 changed files   Show diff stats
1   -METEOR@1.2.0.2
  1 +METEOR@1.2.1
... ...
1   -accounts-base@1.2.1
2   -accounts-password@1.1.3
  1 +accounts-base@1.2.2
  2 +accounts-password@1.1.4
3 3 aldeed:collection2@2.5.0
4 4 aldeed:simple-schema@1.3.3
5 5 audit-argument-checks@1.0.4
6   -autoupdate@1.2.3
  6 +autoupdate@1.2.4
7 7 babel-compiler@5.8.24_1
8 8 babel-runtime@0.1.4
9 9 base64@1.0.4
... ... @@ -18,24 +18,24 @@ browser-policy-framing@1.0.6
18 18 caching-compiler@1.0.0
19 19 caching-html-compiler@1.0.2
20 20 callback-hook@1.0.4
21   -check@1.0.6
  21 +check@1.1.0
22 22 chuangbo:cookie@1.1.0
23   -coffeescript@1.0.10
  23 +coffeescript@1.0.11
24 24 cosmos:browserify@0.5.1
25 25 ddp@1.2.2
26 26 ddp-client@1.2.1
27   -ddp-common@1.2.1
  27 +ddp-common@1.2.2
28 28 ddp-rate-limiter@1.0.0
29   -ddp-server@1.2.1
  29 +ddp-server@1.2.2
30 30 deps@1.0.9
31 31 diff-sequence@1.0.1
32 32 digilord:faker@1.0.7
33   -ecmascript@0.1.5
34   -ecmascript-collections@0.1.6
  33 +ecmascript@0.1.6
  34 +ecmascript-runtime@0.2.6
35 35 ejson@1.0.7
36   -email@1.0.7
  36 +email@1.0.8
37 37 fortawesome:fontawesome@4.4.0
38   -fourseven:scss@3.3.3_3
  38 +fourseven:scss@3.4.1
39 39 geojson-utils@1.0.4
40 40 hot-code-push@1.0.0
41 41 html-tools@1.0.5
... ... @@ -43,32 +43,32 @@ htmljs@1.0.5
43 43 http@1.1.1
44 44 id-map@1.0.4
45 45 jquery@1.11.4
46   -kadira:blaze-layout@2.1.0
47   -kadira:flow-router@2.6.2
  46 +kadira:blaze-layout@2.2.0
  47 +kadira:flow-router@2.7.0
48 48 livedata@1.0.15
49 49 localstorage@1.0.5
50 50 logging@1.0.8
51   -meteor@1.1.9
  51 +meteor@1.1.10
52 52 meteor-base@1.0.1
53 53 meteorhacks:async@1.0.0
54 54 meteorhacks:fast-render@2.10.0
55 55 meteorhacks:inject-data@1.4.1
56 56 meteorhacks:npm@1.5.0
57 57 meteorhacks:picker@1.0.3
58   -meteorhacks:ssr@2.1.2
  58 +meteorhacks:ssr@2.2.0
59 59 minifiers@1.1.7
60 60 minimongo@1.0.10
61   -mongo@1.1.2
  61 +mongo@1.1.3
62 62 mongo-id@1.0.1
63 63 npm-bcrypt@0.7.8_2
64 64 npm-container@1.2.0
65 65 npm-mongo@1.4.39_1
66 66 observe-sequence@1.0.7
67 67 ordered-dict@1.0.4
68   -promise@0.5.0
69   -random@1.0.4
  68 +promise@0.5.1
  69 +random@1.0.5
70 70 rate-limit@1.0.0
71   -reactive-dict@1.1.2
  71 +reactive-dict@1.1.3
72 72 reactive-var@1.0.6
73 73 reload@1.1.4
74 74 retry@1.0.4
... ... @@ -79,9 +79,9 @@ sha@1.0.4
79 79 spacebars@1.0.7
80 80 spacebars-compiler@1.0.7
81 81 srp@1.0.4
82   -standard-minifiers@1.0.1
  82 +standard-minifiers@1.0.2
83 83 stevezhu:lodash@3.10.1
84   -templating@1.1.4
  84 +templating@1.1.5
85 85 templating-tools@1.0.0
86 86 themeteorchef:bert@2.1.0
87 87 themeteorchef:jquery-validation@1.14.0
... ... @@ -90,5 +90,5 @@ twbs:bootstrap@3.3.5
90 90 ui@1.0.8
91 91 underscore@1.0.4
92 92 url@1.0.5
93   -webapp@1.2.2
  93 +webapp@1.2.3
94 94 webapp-hashing@1.0.5
... ...
... ... @@ -5,11 +5,11 @@ A starting point for Meteor apps.
5 5 <tbody>
6 6 <tr>
7 7 <th>Base Version</th>
8   - <td>v3.2.0</td>
  8 + <td>v3.3.0</td>
9 9 </tr>
10 10 <tr>
11 11 <th>Meteor Version</th>
12   - <td>v1.2.0.2</td>
  12 + <td>v1.2.1</td>
13 13 </tr>
14 14 </tbody>
15 15 </table>
... ...
client/templates/authenticated/index.html
Diff comments   View file @d316665
... ... @@ -3,6 +3,6 @@
3 3 <h2>Base</h2>
4 4 <p>A starting point for Meteor applications.</p>
5 5 <p><a class="btn btn-success" href="http://themeteorchef.com/base" role="button">Read the Documentation</a></p>
6   - <p style="font-size: 16px; color: #aaa;">Currently at v3.2.0</p>
  6 + <p style="font-size: 16px; color: #aaa;">Currently at v3.3.0</p>
7 7 </div>
8 8 </template>
... ...
server/modules/set-environment-variables.js
Diff comments   View file @d316665
1 1 let setEnvironmentVariables = () => {
2   - process.env.MAIL_URL = Meteor.settings.private.MAIL_URL;
  2 + if ( Meteor.settings.private ) {
  3 + process.env.MAIL_URL = Meteor.settings.private.MAIL_URL;
  4 + }
3 5 };
4 6  
5 7 Modules.server.setEnvironmentVariables = setEnvironmentVariables;
... ...