Commit Graph

671 Commits (5fc6fb6e49785c1f56fe3d698da31a2f17551d20)

Author SHA1 Message Date
Michael Q Larson 37823e31c8 update challenges with jquery codecademy track 2014-11-29 16:01:37 -08:00
Michael Q Larson eb9a56e4a7 minor changes to jquery exercises 2014-11-29 15:48:20 -08:00
Michael Q Larson 79f060951a add jquery exercises 2014-11-29 15:16:47 -08:00
Michael Q Larson 803adb1628 change minutes of chatroom challenge 2014-11-28 18:14:56 -08:00
Michael Q Larson 13a66962ca update chatroom challenge and mildly reshuffle challenges 2014-11-28 17:33:05 -08:00
Michael Q Larson ffc4c31d25 fix oversight in side nav crossing off 2014-11-26 22:20:21 -08:00
Michael Q Larson 456c845967 reached a stopping point, trying to fix a production bug 2014-11-26 22:00:28 -08:00
Michael Q Larson 645f363fc3 got sidenav looking right again 2014-11-25 12:22:14 -08:00
Michael Q Larson d973619f4a writes completed challenges to database 2014-11-25 11:17:07 -08:00
Michael Q Larson 06fe5390ba seems to attempt to write timestamp 2014-11-24 18:07:03 -08:00
Michael Q Larson d9502856dc SEO improvements suggested by Mark 2014-11-23 15:08:46 -06:00
Michael Q Larson 842f973c8c Merge branch 'regex' 2014-11-21 20:51:20 -06:00
Michael Q Larson 3bf36160b1 finish updating challenges.jade 2014-11-21 20:51:14 -06:00
Michael Q Larson 399353ecbc update chatroom url 2014-11-21 19:06:01 -06:00
Michael Q Larson cc8cbfdf78 additional work on challenges partial 2014-11-21 19:05:10 -06:00
Michael Q Larson ebfac310fb finish updating the sidebar and resequencing courses 2014-11-21 13:36:43 -06:00
Michael Q Larson 50092fdd9b initial work on partial and length in sidenav 2014-11-20 08:32:34 -08:00
Michael Q Larson ee20ed6130 fix some typos on landing page and add footer links to subreddit and chat room 2014-11-18 22:48:11 -08:00
Michael Q Larson 81474e643a update meta info 2014-11-18 11:35:57 -08:00
Michael Ho 66669c1914 Changed YUI / Node tutorial URL, the previous link is broken 2014-11-13 07:10:42 -05:00
Michael Q Larson fdff7d1691 add learn-to-code 2014-11-11 17:52:03 -08:00
Michael Q Larson 6a0bb0452b add new videos and slightly reorder them 2014-11-11 14:53:26 -08:00
Michael Q Larson d8d2fe694d update h2 text on home page and possibly fix persistant challenge.js bug 2014-11-11 00:58:22 -08:00
Michael Q Larson a0be4387f0 update meta tags 2014-11-11 00:23:15 -08:00
Michael Q Larson 24d57f0eaf possibly prevent app from crashing 2014-11-10 10:29:16 -08:00
Sahat Yalkabov 6bd807b6db renamed styles.less to main.less 2014-11-08 20:42:22 -08:00
Michael Q Larson d542ccadff attempt to add favicon to node 2014-11-07 17:27:16 -08:00
Michael Q Larson 9fed29699f minor style improvements 2014-11-07 16:45:19 -08:00
Michael Q Larson 1f700a6cda Merge branch 'master' into design 2014-11-07 15:43:16 -08:00
Michael Q Larson d5397f5b43 everything looks better except the damn font 2014-11-07 15:43:10 -08:00
Michael Q Larson f6229ef94b make pages look better by putting them into panels 2014-11-07 14:46:17 -08:00
Michael Q Larson 8ecb3396b6 fix navbar link to curriculum 2014-11-07 13:48:46 -08:00
Michael Q Larson 09c89a904e start redesign with new logo 2014-11-07 13:25:08 -08:00
Michael Q Larson dbf95e1b9e fix minor bug 2014-11-07 10:17:05 -08:00
Michael Q Larson 41a2d6adf9 add number of completed challenges to navbar 2014-11-07 09:04:01 -08:00
Michael Q Larson 7edd9ef2ee strike through conditionally for completed exercises 2014-11-06 23:29:42 -08:00
Michael Q Larson ce07e9d188 conditionally striking through 2014-11-06 23:20:20 -08:00
Michael Q Larson e36a98cf2a ajax seems to work and we now seem to track completion of challenges 2014-11-06 22:47:35 -08:00
Michael Q Larson 86d433aaba closer to getting ajax to work 2014-11-06 17:38:47 -08:00
Michael Q Larson 944f4d6a1d purge old views and now using simple numeric system 2014-11-06 16:27:18 -08:00
Michael Q Larson 08ada3d4a0 add team viewer 2014-11-05 22:44:56 -08:00
Michael Q Larson 3164761702 update ga 2014-11-04 16:19:03 -08:00
Michael Q Larson 80fbe1dee4 fix nonprofit form and fix some mistakes in video links 2014-11-04 14:57:00 -08:00
Michael Q Larson 86129e3b6f make some minor QA changes 2014-11-03 13:44:48 -08:00
Michael Q Larson b3542862b0 finish initial coding and copy. doing a quick qa cycle 2014-11-03 13:24:30 -08:00
Michael Q Larson 97ddb9bc21 add a lot of content to challenges 2014-11-03 12:32:02 -08:00
Michael Q Larson 5a2de8c47b start grooming the challenges 2014-11-02 12:24:37 -08:00
Michael Q Larson de29af1e8a update views and add routes to app.js 2014-11-02 09:07:40 -08:00
Michael Q Larson e39dc056f9 add footer to challenge panel 2014-11-01 18:37:20 -07:00
Michael Q Larson ff5f12cda8 update views and remove additional cruft 2014-11-01 18:07:59 -07:00
Michael Q Larson 943350bdad update views and remove additional cruft 2014-11-01 18:07:21 -07:00
Michael Q Larson d07462c1d2 add the empty views 2014-11-01 17:51:29 -07:00
Michael Q Larson 6cad74866b continue work on moving things over 2014-11-01 16:37:17 -07:00
Michael Q Larson 683d2e75fd started work on challenge controller 2014-11-01 15:37:00 -07:00
Michael Q Larson e6f4aa9158 comment out facebook since it isn't working 2014-10-30 14:00:32 -07:00
Michael Q Larson ed6848cc14 fix floating column issue, add facebook auth back in, update nonprofit mailer title 2014-10-28 15:51:41 -07:00
Michael Q Larson 3bf94e308a fix a typo and remove github and facebook auth for now 2014-10-28 13:43:13 -07:00
Michael Q Larson 107b38e39d plan more challenges 2014-10-26 15:00:52 -07:00
Michael Q Larson 9c1f3eea9a speed up sidebar 2014-10-26 14:43:51 -07:00
Michael Q Larson 029daa816f rename non-profit to nonprofit 2014-10-26 09:32:57 -07:00
Michael Q Larson 2387e00ca8 update non-profit route 2014-10-26 09:22:53 -07:00
Michael Q Larson 28d1468267 add video and update meta data 2014-10-25 18:50:44 -07:00
Michael Q Larson 10ca4ebd01 style divs a little better 2014-10-25 10:27:09 -07:00
Michael Q Larson 121a9339e1 add lots of fun animations 2014-10-24 18:51:32 -07:00
Michael Q Larson 60c4e24495 create password cancellation confirmation page and minify animate.css 2014-10-24 16:41:09 -07:00
Michael Q Larson b68458cdb5 get email persisting but still need to pull it in on authentication 2014-10-24 15:22:09 -07:00
Michael Q Larson 64a792e831 fix style a little 2014-10-23 23:07:52 -07:00
Michael Q Larson e0c63eef31 update navbar height 2014-10-22 07:59:39 -07:00
Michael Q Larson ef874e2754 fix curriculum page 2014-10-22 07:42:37 -07:00
Michael Q Larson a3de81f88c responsive challenge videos 2014-10-21 21:36:47 -07:00
Michael Q Larson e05195e47a improve the style 2014-10-21 18:00:56 -07:00
Джон, просто Джон 37d0713d31 Update login.jade
Be consistent with [signup view](https://github.com/sahat/hackathon-starter/blob/master/views/account/signup.jade#L11).
2014-10-21 23:02:12 +03:00
Michael Q Larson 7b17b35399 add navbar link to curriculum and get rid of email fields on profile 2014-10-21 13:01:22 -07:00
Michael Q Larson 557cfa6952 update social media 2014-10-21 11:21:55 -07:00
Michael Q Larson 2dfb964231 remove troublesome footer completely 2014-10-21 11:09:47 -07:00
Michael Q Larson e9ec492f4e tweak footer and add vimeo links 2014-10-21 11:00:03 -07:00
Michael Q Larson 9de36b6f0b add curriculum copy 2014-10-21 10:35:14 -07:00
Michael Q Larson b78f7fe608 make more progress on improving look and content of app 2014-10-20 21:37:13 -07:00
Michael Q Larson 942b154f70 fix minor problems and use s3 2014-10-20 16:25:24 -07:00
Michael Q Larson fa76554a5b finish setting up layouts 2014-10-20 15:35:42 -07:00
Michael Q Larson 2ec2e5d19f add and customize course views 2014-10-20 13:46:56 -07:00
Michael Q Larson 972c52ca47 add named routes to courses 2014-10-20 13:28:23 -07:00
Michael Q Larson 8f3c7b44c5 start creating partials and views 2014-10-20 12:37:48 -07:00
Michael Q Larson a4343ca284 this SHOULD work but it isn't 2014-10-20 08:58:42 -07:00
Michael Q Larson 156f748fb0 fix ga 2014-10-19 18:23:05 -07:00
Michael Q Larson 38dc238e49 add ga 2014-10-19 17:50:48 -07:00
Sahat Yalkabov a170c660c5 Moved Stripe pkey and skey to secrets.js
Fixes #190
2014-10-18 15:44:55 -07:00
Michael Q Larson eb2de28f6a update landing page 2014-10-18 14:53:32 -07:00
Michael Q Larson 5dbbb935a5 thrashing on the routes a bit 2014-10-18 00:46:30 -07:00
Michael Q Larson 58761e7c2b start adding challenge routes and controllers 2014-10-18 00:01:26 -07:00
Michael Q Larson 0ec7a052d1 rip out chat component 2014-10-17 19:10:53 -07:00
Michael Q Larson 88bc8e14f8 got username in scope in variable 2014-10-16 18:04:32 -07:00
Michael Q Larson 093bc73375 views are wired up 2014-10-16 17:04:28 -07:00
Michael Q Larson 308461d4ec create bootstrap file 2014-10-16 16:18:26 -07:00
Michael Q Larson cd90333bca first attempt at expanding landing page 2014-10-16 13:17:03 -07:00
Michael Q Larson ac0ab1de37 start fixing chat 2014-10-16 09:07:06 -07:00
Michael Q Larson 4a36e58756 allow access to both production and development databases 2014-10-15 15:57:51 -07:00
Michael Q Larson dba05acb15 add api keys to secrets for authenticating 2014-10-15 14:11:11 -07:00
Michael Q Larson 8c15b4beee add oauth logins 2014-10-15 13:18:25 -07:00
Michael Q Larson 2106cbdbf2 twitter username now persisted 2014-10-13 21:38:10 -07:00
Michael Q Larson 254740c065 socket io is connecting 2014-10-13 18:00:37 -07:00
Michael Q Larson ad929be410 able to write to the db 2014-10-13 16:01:52 -07:00
Michael Q Larson a5985cd73d start building out views 2014-10-13 14:14:51 -07:00
Michael Q Larson d87db465ad fixed js errors but still not showing firechat or firepad 2014-10-12 18:04:38 -07:00
Michael Q Larson 05c31ba15d firechat and firepad installed but not fully working 2014-10-12 01:51:55 -07:00
Michael Ho 45b1a02ba9 Fixed link to Yahoo APIs 2014-08-12 14:59:27 -07:00
Sahat Yalkabov 2c2b6a1a59 Bumped to version 2.3.2 2014-07-28 02:20:18 -04:00
Sahat Yalkabov d2dcca609a Merge remote-tracking branch 'origin/master' 2014-07-02 01:22:51 -04:00
Sahat Yalkabov 4f7a999af2 use ionic icon instead of brand logo image 2014-07-02 00:58:21 -04:00
Sahat Yalkabov f8172c7a27 updated alert messages close icon 2014-07-02 00:43:20 -04:00
Sahat Yalkabov d02afc45ab changed update profile icon 2014-07-02 00:41:11 -04:00
Sahat Yalkabov 0fa2ee910c ionic icons on logout and my account links 2014-07-02 00:41:02 -04:00
Sahat Yalkabov 26a8982bfc updated footer
removed ::selection style
2014-07-02 00:33:29 -04:00
Sahat Yalkabov 7dae3f3f51 improved footer 2014-07-01 22:58:33 -04:00
Sahat Yalkabov 9c7f7ea3b8 updated header titles on login/signup
updated button icon on login page
2014-07-01 22:09:56 -04:00
Sahat Yalkabov 545202fc6f updated button icons on profile page 2014-07-01 19:57:33 -04:00
Sahat Yalkabov 6cfad2188d use ion-close icon for bootstrap alerts 2014-07-01 19:33:07 -04:00
Sahat Yalkabov 3664a817a6 added button icons 2014-07-01 18:26:49 -04:00
Sahat Yalkabov e308ef3f9a updated homepage to include a basic bootstrap grid 2014-07-01 16:20:02 -04:00
Sahat Yalkabov 5c58684798 Fixed cheerio screencast url 2014-06-29 00:14:33 -07:00
Sahat Yalkabov a742e01a65 removed font-awesome icons from buttons on signup, login, contact 2014-06-26 13:17:43 -04:00
Sahat Yalkabov 693443b629 Updated aviary and instagram background panels 2014-06-05 17:17:04 -04:00
Sahat Yalkabov 8197329970 Updated the API examples page 2014-06-05 14:18:51 -04:00
Sahat Yalkabov 6e364983e5 Updated last.fm api example 2014-06-05 12:56:06 -04:00
Sahat Yalkabov 9019711968 Updated steam api example 2014-06-05 12:15:52 -04:00
Sahat Yalkabov a23cb870bc Updated facebook api example 2014-06-05 12:11:43 -04:00
Sahat Yalkabov b494a0c252 Updated instagram api example 2014-06-05 11:58:01 -04:00
Sahat Yalkabov a183d8154e Updated icons 2014-06-03 00:40:20 -04:00
Sahat Yalkabov d58ba076af Updated twilio API example
- Added number to text field and message field
- Input validation
2014-06-02 14:47:35 -04:00
Sahat Yalkabov 8a17e39d72 Renamed navigation partial to navbar 2014-06-01 10:49:18 -04:00
Sahat Yalkabov 0f3eb15d72 Added "Compose New Tweet" form on Twitter API demo 2014-05-29 18:29:16 -04:00
Sahat Yalkabov dcff72cb82 Updated twitter api example.
- top 10 instead of top 50
- node.js term instead of hackathon
- using media-list instead of ul.list-unstyled
2014-05-29 16:44:13 -04:00
Sahat Yalkabov 87594ee009 Updated twitter image on API examples page 2014-05-27 00:40:13 -04:00
Sahat Yalkabov 6b7cc24db4 Updated zip code on yahoo api example 2014-05-15 07:27:47 -04:00
Sahat Yalkabov 754789e085 Added yahoo api example 2014-05-13 01:35:46 -04:00
Sahat Yalkabov 8f4213e846 Added Yahoo to the list of APIs (to be implemented) 2014-05-11 08:08:20 -04:00
Sahat Yalkabov 9363a2c8f7 CSS refactoring and cleanup; removed animate.css 2014-05-11 05:09:27 -04:00
Sahat Yalkabov 709675b5ff Removed #flash block in flash.jade 2014-05-11 04:19:03 -04:00
Sahat Yalkabov 68ca8a482f Simplified sticky footer css styles 2014-05-11 04:04:39 -04:00
Sahat Yalkabov 86374a5c39 Cleaned up code in layout.jade 2014-05-11 03:48:19 -04:00
Sahat Yalkabov eb3b045278 Added self_recent_media example to instagram api 2014-04-30 00:17:09 -04:00
Sahat Yalkabov 18d13b67e1 LinkedIn API: Display education only if user listed that on their linkedin profile.
Fixes #138
2014-04-25 13:51:10 -04:00
Sahat Yalkabov 7f3e395256 Fixed: default theme is now enabled by default.
Added: close button to alerts

Fixes #135
2014-04-24 12:05:36 -04:00
Sahat Yalkabov fc55e385e4 Added Instagram authentication 2014-04-22 15:00:27 -04:00
Sahat Yalkabov 8ca80c4a6d Updated instagram api template 2014-04-22 14:53:00 -04:00
Sahat Yalkabov 3a3a8e97ee Added Instagram API Example 2014-04-22 14:51:35 -04:00
Sahat Yalkabov 347b757782 Removed 404 error handler and 404 page 2014-04-21 16:41:26 -04:00
kaneschutzman 520f63bbca Update profile.jade
Changed value=token to value=_csrf, this fixed the issue I had with deleting accounts.
2014-04-17 23:05:00 -10:00
Sahat Yalkabov ce1762b8e6 Removed if.localAuth from navigation bar 2014-04-14 18:26:34 -04:00
Sahat Yalkabov 05f825d3c8 Removed PayPal API 2014-04-14 17:58:49 -04:00
Sahat Yalkabov 84a911da03 Switched to Stripe.js checkout for ease of use and better security 2014-04-14 17:34:51 -04:00
Sahat Yalkabov b9fee1cb35 Merge branch 'master' of https://github.com/tmcpro/hackathon-starter
# By Tyler McIntyre
# Via Tyler McIntyre
* 'master' of https://github.com/tmcpro/hackathon-starter:
  Added to Readme file
  Stripe API finished
  stripe API added

Conflicts:
	package.json
	views/api/index.jade
2014-04-14 16:15:46 -04:00
Sahat Yalkabov c20eff6503 Merge remote-tracking branch 'origin/generator'
* origin/generator: (23 commits)
  Instagram generator indentation and whitespace fixes
  Minor adjustments to instagram generator, changed log color of already active auth methods to grey. (from yellow)
  Instagram auth generator!
  Renamed minimizer.js to generator.js
  Added Local authentication generator
  Removed if-check for local auth on change password form
  Added LinkedIn authentication generator
  Added Twitter authentication generator
  Added GitHub authentication generator
  Prettified generator CLI with unicode icons and multi-line message.
  Added Google add/remove generator
  Generator code cleanup
  Generator code refactoring
  Updated comment style to make it easier to generate the code using multiline strings
  Facebook User model add/remove complete
  add/remove facebook from profile template complete
  Removed auth if-checks
  Added login.jade add/remove facebook auth
  Removed if-checks, all authentications enabled by default
  Added terminal colors, info messages + code refactoring.
  ...
2014-04-14 12:39:10 -04:00
Sahat Yalkabov 634d1769a0 Improved api examples grid; added logos. 2014-04-14 01:16:19 -04:00
Sahat Yalkabov 517e2e5d19 Switched to old footer like on demo site 2014-04-14 00:43:57 -04:00
Sahat Yalkabov 950ee8425f Updated aviary example 2014-04-14 00:43:04 -04:00
Sahat Yalkabov 4eef2b272d Display api examples as a grid instead of list. 2014-04-13 23:24:46 -04:00
Sahat Yalkabov 6b9e7e1517 Renamed API Browser to API Examples 2014-04-13 23:14:58 -04:00
Sahat Yalkabov 263af71d90 Removed if-check for local auth on change password form 2014-04-13 17:19:11 -04:00
Sahat Yalkabov 90de4eedba Removed auth if-checks 2014-04-12 23:55:23 -04:00
Sahat Yalkabov 0512ff93f3 Removed if-checks, all authentications enabled by default 2014-04-12 23:23:12 -04:00
Tyler McIntyre 5c51aab076 Stripe API finished 2014-03-31 17:14:15 -04:00
Tyler McIntyre dfc5a2c435 stripe API added 2014-03-31 16:00:51 -04:00
Brian Ridings 096e4d4d71 Merged view 2014-03-28 13:46:04 -04:00
Brian Ridings f88a09081f Changed Varable from token to _csrf 2014-03-28 13:40:55 -04:00
Brian Ridings 205318ea42 Change token to _csrf 2014-03-28 10:38:29 -04:00
Brian Ridings 9587150e7b Change token to _csrf 2014-03-28 10:38:04 -04:00
Brian Ridings eb0332609c CSRF token to headers for AJAX POST. Fix for #113
This is how you do a JS post with the CSRF Protection

```
$.ajax({
url: "http://test.com",
type:"post"
headers: {'X-CSRF-Token': $('meta[name="csrf-token"]').attr('content')}})
```
2014-03-27 14:09:13 -04:00
Sahat Yalkabov 783598398d Updated footer 2014-03-17 03:00:18 -04:00
Sahat Yalkabov 65ae9b18ad PayPal api example refactoring 2014-03-16 14:07:15 -04:00
Sahat Yalkabov b3a47677da Added Google Analytics script 2014-03-09 13:53:12 -04:00
Sahat Yalkabov e8365c7321 Removed .row from login form 2014-03-07 14:42:37 -05:00
Sahat Yalkabov d6020beebb Updated footer 2014-03-07 14:02:38 -05:00
Sahat Yalkabov 9396ff1b69 Removed login required text from Paypal api link (false) 2014-03-06 03:03:27 -05:00
Sahat Yalkabov c046c990b7 Updated button text to Change Password 2014-03-06 02:48:59 -05:00
Sahat Yalkabov aa1b9dbc26 Removed hacker news logo 2014-03-06 02:47:50 -05:00
Sahat Yalkabov 5fef9092ad Placed single sign-in buttons at the bottom of the login form 2014-03-05 16:41:42 -05:00
Sahat Yalkabov faa0781c06 Changed layout title to Hackathon Starter 2014-03-05 16:26:56 -05:00
Sahat Yalkabov e5cb5607db Consolidated clockwork updates 2014-02-27 19:42:07 -05:00
Sahat Yalkabov 007d561d88 Merge branch 'master' of https://github.com/mediaburst/hackathon-starter into mediaburst-master
* 'master' of https://github.com/mediaburst/hackathon-starter:
  Update README.md
  Using the newest clockwork npm package
  Removed commentted out lines from clockwork.jade
  Tweak to the clockwork view
  Adding clockwork SMS to the API mix

Conflicts:
	controllers/api.js
	package.json
2014-02-27 19:27:11 -05:00
Sahat Yalkabov 53f89c355f Code formatting update 2014-02-27 17:39:18 -05:00
Sahat Yalkabov 582cdf4e54 A bunch of improvements to Linkedin API 2014-02-27 17:29:16 -05:00
Sahat Yalkabov c3320f28f2 Added LinkedIn API example that displays connection and your profile information 2014-02-27 16:51:38 -05:00
Sahat Yalkabov af4a2a33f6 Add link/unlink LinkedIn to profile template 2014-02-27 13:10:50 -05:00
Sahat Yalkabov bf02667e9e Redesigned Login page (now includes Sign in with LinkedIn) 2014-02-27 12:39:51 -05:00
Matt Roberts 3f9d2f3d7d Removed commentted out lines from clockwork.jade 2014-02-27 16:19:55 +00:00
Matt Roberts c78085b73e Merge remote-tracking branch 'upstream/master'
Conflicts:
	package.json
2014-02-27 16:16:13 +00:00
Matt Roberts 675156629d Tweak to the clockwork view 2014-02-27 16:05:23 +00:00
Matt Roberts babcdd3afe Adding clockwork SMS to the API mix 2014-02-24 11:25:51 +00:00
Sahat Yalkabov b0daedd3a6 Updated login template 2014-02-18 03:49:31 -05:00
Sahat Yalkabov 85ab327432 Renamed forgot password link 2014-02-18 03:10:46 -05:00
Sahat Yalkabov 1a12c07810 Updated reset password template 2014-02-18 03:10:24 -05:00
Sahat Yalkabov ac61a33867 Cleaned up and refactored reset password template 2014-02-18 02:58:16 -05:00
Sahat Yalkabov 89a8b72181 Updated forgot password and login templates 2014-02-17 19:44:51 -05:00
Sahat Yalkabov fcd8773518 Updated login template 2014-02-17 19:36:06 -05:00
Dan Stroot 1faf279877 Added complete password reset function 2014-02-17 10:00:43 -08:00
Sahat Yalkabov d97e05434f Add Facebook profile photo to /me section 2014-02-12 15:06:22 -05:00
Sahat Yalkabov 2d8188c8df UI improvements to "My friends list" on Facebook API page 2014-02-12 14:59:51 -05:00
Sahat Yalkabov f967c5ca20 Added extra profile information on Facebook API page for "/me" 2014-02-12 14:24:31 -05:00
Sahat Yalkabov b6391fccf8 Merge branch 'add-mailgun' of https://github.com/leemunroe/hackathon-starter into leemunroe-add-mailgun
* 'add-mailgun' of https://github.com/leemunroe/hackathon-starter:
  Add Nodemailer and Mailgun option for contact form
2014-02-11 10:32:14 -05:00