Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ meteor-base@1.0.4 # Packages every Meteor app needs to have
mobile-experience@1.0.4 # Packages for a great mobile UX
blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views
es5-shim@4.6.15 # ECMAScript 5 compatibility for older browsers.
ecmascript@0.7.2 # Enable ECMAScript2015+ syntax in app code
ecmascript@0.7.3 # Enable ECMAScript2015+ syntax in app code
audit-argument-checks@1.0.7 # ensure meteor method argument validation
browser-policy@1.1.0 # security-related policies enforced by newer browsers
juliancwirko:postcss # CSS post-processing plugin (replaces standard-minifier-css)
abernix:standard-minifier-js # a minifier plugin used for Meteor apps by default
session@1.1.7 # ReactiveDict whose contents are preserved across Hot Code Push
tracker@1.1.2 # Meteor transparent reactive programming library
mongo@1.1.16
tracker@1.1.3 # Meteor transparent reactive programming library
mongo@1.1.17
random@1.0.10
reactive-var@1.0.11
reactive-dict@1.1.8
Expand All @@ -36,8 +36,8 @@ mdg:validated-method
shell-server@0.2.3

# Meteor Auth Packages
accounts-base@1.2.16
accounts-password@1.3.5
accounts-base@1.2.17
accounts-password@1.3.6
accounts-facebook@1.1.1
accounts-google@1.1.2
accounts-twitter@1.2.1
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.4.1
METEOR@1.4.4.2
24 changes: 12 additions & 12 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
abernix:minifier-js@1.3.19
abernix:standard-minifier-js@1.3.19
accounts-base@1.2.16
accounts-base@1.2.17
accounts-facebook@1.1.1
accounts-google@1.1.2
accounts-oauth@1.1.15
accounts-password@1.3.5
accounts-password@1.3.6
accounts-twitter@1.2.1
alanning:roles@1.2.16
aldeed:autoform@5.8.1
aldeed:browser-tests@0.1.0
aldeed:browser-tests@0.1.1
aldeed:collection2@2.10.0
aldeed:collection2-core@1.2.0
aldeed:schema-deny@1.1.0
Expand Down Expand Up @@ -56,7 +56,7 @@ cfs:upload-http@0.0.20
cfs:worker@0.1.4
check@1.2.5
chuangbo:cookie@1.1.0
coffeescript@1.11.1_4
coffeescript@1.12.3_1
dburles:factory@1.1.0
ddp@1.2.5
ddp-client@1.3.4
Expand All @@ -65,20 +65,20 @@ ddp-rate-limiter@1.0.7
ddp-server@1.3.14
deps@1.0.12
diff-sequence@1.0.7
dispatch:mocha@0.3.0
dispatch:mocha@0.4.1
dispatch:run-as-user@1.1.1
ecmascript@0.7.3
ecmascript-runtime@0.3.15
ejson@1.0.13
email@1.2.0
email@1.2.1
es5-shim@4.6.15
facebook-config-ui@1.0.0
facebook-oauth@1.3.0
fastclick@1.0.13
gadicc:blaze-react-component@1.4.0
geojson-utils@1.0.10
google-config-ui@1.0.0
google-oauth@1.2.3
google-oauth@1.2.4
hot-code-push@1.0.4
html-tools@1.0.11
htmljs@1.0.11
Expand Down Expand Up @@ -113,13 +113,13 @@ meteorhacks:picker@1.0.3
meteorhacks:ssr@2.2.0
meteorhacks:subs-manager@1.6.4
minifier-css@1.2.16
minimongo@1.0.21
minimongo@1.0.23
mobile-experience@1.0.4
mobile-status-bar@1.0.14
modules@0.8.2
modules-runtime@0.7.10
momentjs:moment@2.17.1
mongo@1.1.16
mongo@1.1.17
mongo-id@1.0.6
mongo-livedata@1.0.12
mrt:later@1.6.1
Expand All @@ -131,7 +131,7 @@ oauth-encryption@1.2.1
oauth1@1.1.11
oauth2@1.1.11
observe-sequence@1.0.16
ongoworks:security@2.0.1
ongoworks:security@2.1.0
ordered-dict@1.0.9
percolate:migrations@0.9.8
practicalmeteor:chai@2.1.0_1
Expand Down Expand Up @@ -162,12 +162,12 @@ templating-runtime@1.3.2
templating-tools@1.1.2
tmeasday:check-npm-versions@0.3.1
tmeasday:publish-counts@0.8.0
tracker@1.1.2
tracker@1.1.3
twitter-config-ui@1.0.0
twitter-oauth@1.2.0
ui@1.0.13
underscore@1.0.10
url@1.1.0
vsivsi:job-collection@1.4.0
vsivsi:job-collection@1.5.1
webapp@1.3.15
webapp-hashing@1.0.9
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM reactioncommerce/base:v1.3.0
FROM reactioncommerce/base:v1.3.1

# Default environment variables
ENV ROOT_URL "http://localhost"
Expand Down
3 changes: 1 addition & 2 deletions server/jobs/email.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import nodemailer from "nodemailer";
import { Job } from "meteor/vsivsi:job-collection";
import { Emails, Jobs } from "/lib/collections";
import { Reaction, Logger } from "/server/api";

Expand All @@ -10,7 +9,7 @@ export default function () {
* Example usage:
* new Job(Jobs, "sendEmail", { from, to, subject, html }).save();
*/
const sendEmail = Job.processJobs(Jobs, "sendEmail", {
const sendEmail = Jobs.processJobs("sendEmail", {
pollInterval: 5 * 60 * 1000, // poll every 5 mins as a backup - see the realtime observer below
workTimeout: 2 * 60 * 1000, // fail if it takes longer than 2mins
payload: 20
Expand Down