Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sachinm/helpful-web
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: asm-helpful/helpful-web
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Jun 18, 2014

  1. Copy the full SHA
    22a7e39 View commit details
  2. Add secondary inbox navbar

    vanstee committed Jun 18, 2014
    Copy the full SHA
    8b38547 View commit details
  3. Rework the participants area

    vanstee committed Jun 18, 2014
    Copy the full SHA
    fa033e8 View commit details
  4. Copy the full SHA
    9050e62 View commit details
  5. Copy the full SHA
    d418e56 View commit details
  6. Copy the full SHA
    fcb1437 View commit details
  7. Retina-ify avatars

    vanstee committed Jun 18, 2014
    Copy the full SHA
    bd5a82e View commit details
  8. Copy the full SHA
    614ec88 View commit details
  9. Copy the full SHA
    d1a5567 View commit details
  10. Copy the full SHA
    8b402a9 View commit details
  11. Stop subject from wrapping

    vanstee committed Jun 18, 2014
    Copy the full SHA
    36b30bd View commit details
  12. Copy the full SHA
    114a42f View commit details
  13. Copy the full SHA
    66d942c View commit details
  14. Copy the full SHA
    4c22cfb View commit details
  15. Copy the full SHA
    baadd4c View commit details

Commits on Jun 19, 2014

  1. Copy the full SHA
    da9b813 View commit details
  2. Copy the full SHA
    67df9fc View commit details
  3. Copy the full SHA
    bf06c3d View commit details
  4. Copy the full SHA
    0f8fcdf View commit details
  5. Copy the full SHA
    26d7cde View commit details
  6. Copy the full SHA
    f786a5f View commit details
  7. Copy the full SHA
    aad7c27 View commit details
  8. Copy the full SHA
    9f783cc View commit details
  9. Copy the full SHA
    212419d View commit details

Commits on Jun 20, 2014

  1. Copy the full SHA
    d23f356 View commit details
  2. Copy the full SHA
    43dd8fa View commit details
  3. Copy the full SHA
    f828727 View commit details
  4. Remove conversation gutter

    vanstee committed Jun 20, 2014
    Copy the full SHA
    65c8e32 View commit details
  5. Copy the full SHA
    8e3ea80 View commit details
  6. Copy the full SHA
    9e176e3 View commit details
  7. Copy the full SHA
    ecfbfbc View commit details
  8. Copy the full SHA
    e99b4bf View commit details
  9. Copy the full SHA
    7d9985f View commit details
  10. Copy the full SHA
    7931396 View commit details
  11. Copy the full SHA
    c56c8c2 View commit details

Commits on Jun 22, 2014

  1. Copy the full SHA
    32080fc View commit details

Commits on Jun 23, 2014

  1. Copy the full SHA
    73e65e5 View commit details
  2. Add widget help text to setup page

    wesleylancel authored and vanstee committed Jun 23, 2014
    Copy the full SHA
    029d06e View commit details
  3. Remove extra whitespace on homepage

    manishval authored and vanstee committed Jun 23, 2014
    Copy the full SHA
    eaebf46 View commit details
  4. wip-398

    david authored and vanstee committed Jun 23, 2014
    Copy the full SHA
    24a1edd View commit details
  5. Copy the full SHA
    3e00716 View commit details
  6. Copy the full SHA
    f4ee4cd View commit details
  7. Copy the full SHA
    9620e22 View commit details
  8. Copy the full SHA
    52aed14 View commit details
  9. Copy the full SHA
    75eeaad View commit details
  10. Copy the full SHA
    0dc6ed6 View commit details
  11. Copy the full SHA
    65ee069 View commit details
  12. Copy the full SHA
    73d6f24 View commit details
  13. Copy the full SHA
    8819a5c View commit details
  14. Add counts to inbox navbar

    vanstee committed Jun 23, 2014
    Copy the full SHA
    6352068 View commit details
Showing 338 changed files with 9,043 additions and 9,859 deletions.
17 changes: 9 additions & 8 deletions .env.example
Original file line number Diff line number Diff line change
@@ -23,14 +23,7 @@ SENDER_EMAIL_ADDRESS="email@example.com"
SENDER_EMAIL_PASSWORD="PassWord"

# If you're testing Segment.io integration, you'll want to set a secret for your Segment dev account
# SEGMENT_SECRET=XXXXXXXXXXXX

# Config info for Chargify.
# The 'helpful-dev' subdomain here is a test subdomain that allows for testing out signups in dev mode.
# You can sign up for your own free developer Chargify account and change these values in order to get more control.
CHARGIFY_SUBDOMAIN=helpful-dev
CHARGIFY_SHARED_SECRET=jFYbp5xUGPlJy5OWWWs
CHARGIFY_API_KEY=AlZNjLLe1fnnZtwBbd3
SEGMENT_WRITE_KEY=XXXXXXXXXXXX

STRIPE_SECRET_KEY=sk_test_WBw18p2zF145AUVplsHKuCN4
STRIPE_PUBLISHABLE_KEY=pk_test_SOb2FTkkThEVfZMVt9857fbS
@@ -46,6 +39,14 @@ DEVISE_PEPPER=insecure
AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
S3_BUCKET=
CLOUDFRONT_DISTRIBUTION=

# Pusher
PUSHER_URL=http://b54aa32017b12768550f:06b7aba832f1a1ed4b55@api.pusherapp.com/apps/68925

# CustomerIO
CUSTOMERIO_SITE_ID=
CUSTOMERIO_API_KEY=

# Assembly
ASSEMBLY_TOKEN=
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# From: https://help.github.com/articles/dealing-with-line-endings/#platform-windows
# Git will always convert line endings to LF on checkout. We need this setting to make sure the code is checkout out with unix style line endings
# This is because the vm has problems executing scripts with windows style line endings.
text eol=lf
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -47,3 +47,7 @@
*.sublime-*

config/vagrant/phantomjs-1.9.7-*

*.dump

/public/assets
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
language: ruby
bundler_args: "--without development production autotest"
rvm:
- 2.1.1
- 2.1.2
addons:
postgresql: "9.3"
before_install:
- gem install bundler -v '>= 1.5.1'
before_script:
63 changes: 36 additions & 27 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,29 +1,32 @@
source 'https://rubygems.org'
source 'https://rails-assets.org'
ruby '2.1.1'
ruby '2.1.2'

# Load environment variables first

gem 'dotenv-rails', groups: [:development, :test]

# Alphabetical list

gem 'active_model_serializers', github: 'rails-api/active_model_serializers'
gem 'analytics-ruby'
gem 'bootstrap-sass'
gem 'active_model_serializers', github: 'rails-api/active_model_serializers', branch: '0-8-stable'
gem 'analytics-ruby', '~> 2.0.0', require: 'segment/analytics'
gem 'awesome_print'
gem 'aws-sdk'
gem 'bootstrap-sass', github: 'twbs/bootstrap-sass'
gem 'bourbon'
gem 'bugsnag'
gem 'carrierwave'
gem 'carrierwave-aws'
gem 'confyio'
gem 'curb'
gem 'devise', '~> 3.1'
gem 'devise-i18n'
gem 'customerio'
gem 'devise_invitable', '~> 1.3'
gem 'devise-i18n'
gem 'devise', '~> 3.1'
gem 'doorkeeper'
gem 'elasticsearch-model'
gem 'faraday', '~> 0.9.0'
gem 'font-awesome-rails'
gem 'friendly_id', '~> 5.0'
gem 'httparty'
gem 'jquery-rails'
gem 'medium-editor-rails'
gem 'mini_magick'
@@ -33,52 +36,58 @@ gem 'pg'
gem 'premailer-rails'
gem 'puma'
gem 'pusher'
gem 'rails', '~> 4.1.1'
gem 'rails-assets-jquery-autosize'
gem 'rails-assets-handlebars'
gem 'rails-assets-moment'
gem 'rails-assets-showdown'
gem 'rails', '4.2.0'
gem 'react-rails', github: 'reactjs/react-rails'
gem 'redcarpet'
gem 'sass-rails', '~> 4.0.0'
gem 'sass-rails', '~> 5'
gem 'sequential', '>= 0.1'
gem 'sidekiq'
gem 'sinatra', require: nil
gem 'stringex'
gem 'stripe'
gem 'uglifier', '>= 1.3.0'
gem 'underscore-rails'
gem 'unf'
gem 'awesome_print'
gem 'pry-rails'
gem 'react-rails', github: 'reactjs/react-rails'

source 'https://rails-assets.org' do
gem 'rails-assets-animate.css', '~> 3.2'
gem 'rails-assets-jquery-autosize', '~> 1'
gem 'rails-assets-js-md5', '~> 1'
gem 'rails-assets-handlebars', '~> 3.0'
gem 'rails-assets-moment', '~> 2.9'
gem 'rails-assets-showdown', '~> 0.3'
end

group :development do
gem 'quiet_assets'
gem 'pry-rails'
gem 'rest-client', require: false
gem 'sinatra', require: false
gem 'slim', require: false
gem 'spring-commands-rspec'
end

group :development, :test do
gem 'jazz_hands'
gem 'database_cleaner'
gem 'factory_girl_rails', '~> 4.2.1'
gem 'ffaker', '~> 1.20'
gem 'rake'
gem 'rspec-rails', '~> 3.0.0.beta2'
gem 'pry'
gem 'timecop'
gem 'jasmine', github: 'pivotal/jasmine-gem'
gem 'vcr'
gem 'faraday', '~> 0.9.0'
gem 'pry-byebug'
gem 'json_spec', '~> 1.1'
gem 'psych', '~> 2.0.5'
gem 'database_cleaner'
gem 'rake'
gem 'rspec-rails', '~> 3'
gem 'timecop'
gem 'vcr', '~> 2.9'
end

group :test do
gem 'capybara'
gem 'webmock', '< 1.16'
gem 'codeclimate-test-reporter', require: nil
gem 'poltergeist'
gem 'webmock', '< 1.16'
end

group :development, :production do
gem 'rails_12factor'
gem 'font_assets'
end
Loading