Merge pull request #2 from carlosbaraza/master

Bring branch to master HEAD and Fix CSS

Author: mcoenca

Diff for: .eslintignore

@@ -0,0 +1,2 @@
+example/.meteor
+node_modules

Diff for: .eslintrc

@@ -1,21 +1,5 @@
 {
-  "extends": "eslint:recommended",
-  "rules": {
-    "brace-style": [2, "1tbs", { "allowSingleLine": true }],
-    "strict": 0,
-    "quotes": [2, "single"],
-    "no-underscore-dangle": 0,
-    "curly": 0,
-    "no-unused-vars": 1,
-    "no-console": 0,
-    "no-var": 2
-  },
-
-  "env": {
-    "node": true,
-    "meteor": true,
-    "es6": true
-  },
+  "extends": "lookback/meteor",
 
   "globals": {
     "Mailer": true,
@@ -26,6 +10,7 @@
     "TemplateHelpers": true,
     "SSR": false,
     "Picker": false,
-    "Routing": true
+    "Routing": true,
+    "Templates": true
   }
 }

Diff for: .gitignore

@@ -1,3 +1,6 @@
 .DS_Store
 .sass-cache/
 .npm/
+example/settings.json
+npm-debug.log
+node_modules

Diff for: .versions

@@ -1,38 +1,66 @@
+[email protected]
 [email protected]_1
 [email protected]
 [email protected]
+[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
+[email protected]
+[email protected]
 [email protected]
 [email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
+[email protected]
 [email protected]
 [email protected]
+[email protected]
 [email protected]
 [email protected]
+local-test:lookback:[email protected]
 [email protected]
-lookback:[email protected].1
+lookback:[email protected].2
 [email protected]
 meteorhacks:[email protected]
 meteorhacks:[email protected]
+[email protected]
+[email protected]
+[email protected]
 [email protected]
+[email protected]_1
 [email protected]
+[email protected]
+practicalmeteor:[email protected]_1
+practicalmeteor:[email protected]_2
+practicalmeteor:[email protected]_7
+practicalmeteor:[email protected]
+practicalmeteor:[email protected]_2
 [email protected]
 [email protected]
+[email protected]
 [email protected]
+[email protected]
+[email protected]
 [email protected]
 sacha:[email protected]
+[email protected]
 [email protected]
 [email protected]
+[email protected]
+[email protected]
 [email protected]
 [email protected]
 [email protected]
+[email protected]
 [email protected]
 [email protected]

Diff for: README.md

@@ -110,6 +110,8 @@ Please inspect the provided sample code for details.
     template: 'templateName',               // Required.
     replyTo: 'Name <[email protected]>',      // Override global 'ReplyTo: ' option.
     from: 'Name <[email protected]>',         // Override global 'From: ' option.
+    cc: 'Name <[email protected]>',           // Optional.
+    bcc: 'Name <[email protected]>',          // Optional.
     data: {}                                // Optional. Render your email with a data object.
   }
     ```
@@ -470,6 +472,7 @@ Why not try [`meteor-logger`](https://github.com/lookback/meteor-logger)? :)
 
 ## Version history
 
+- `0.7.2` - Support `cc` and `bcc` options to `Mailer.send()`. Filed in [#52](https://github.com/lookback/meteor-emails/issues/52), fixed in [#54](https://github.com/lookback/meteor-emails/pull/54).
 - `0.7.1` - Check for existence of `Blaze` global before extending with registered Blaze helpers.
 - `0.7.0` - Replaced Iron Router dependency with `meteorhacks:picker`, which means you can now use this package with FlowRouter as well.
 
@@ -521,6 +524,22 @@ route: {
 
 PRs and help is welcomed.
 
+## Develop
+
+Clone repo, and run:
+
+```
+npm install
+```
+
+to install dev dev dependencies. We're using ESLint for linting.
+
+## Things to do
+
+- [ ] Tests.
+
+Also see [open issues](https://github.com/lookback/meteor-emails/issues).
+
 ***
 
 Made by [Lookback](http://github.com/lookback)