Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Send users a confirmation link instead of a random password upon sign up - v2 #280

Closed
wants to merge 852 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
852 commits
Select commit Hold shift + click to select a range
d263c2a
Merge pull request #208 from TeaWithStrangers/admin-overview-improvem…
Sep 17, 2014
1527fe9
Merge pull request #209 from TeaWithStrangers/new-404
Sep 17, 2014
4bed3da
adjust display for attendees list
ankitshah811 Sep 17, 2014
95385b7
Add null user to Attendance relation
Sep 20, 2014
66ab17d
Test and changed name for User nil_user method
Sep 20, 2014
12f8260
Integration test for history page
Sep 20, 2014
68a0dc2
Fix variable naming bug in TT controller (unrelated)
Sep 20, 2014
4b0bb51
Fix 500 page teacup image
Sep 20, 2014
3bff4c5
Merge pull request #210 from TeaWithStrangers/fix-deleted-user-refere…
Sep 20, 2014
f9eff04
Add to_s method to Tea Time
Sep 20, 2014
6c5b0d2
Mobile users will no longer encounter modals
Sep 20, 2014
776415d
Host tea times on host pages
Sep 20, 2014
130169b
Only display 'Upcoming Tea times' for a city if there are any
Sep 20, 2014
3a22b71
Hosts can now reassign the host of a tea time
Sep 21, 2014
fe28dfd
Tests for host changing tea time
Sep 21, 2014
1a21b2d
note about how to add post-schedule note for host pages
ankitshah811 Sep 22, 2014
4dbdd33
Merge pull request #211 from TeaWithStrangers/no-mobile-modals
Sep 22, 2014
539a258
copy changes for registration and ethos emails
ankitshah811 Sep 22, 2014
d1922d8
Add host info to scheduling partial. TODO: Undo
Sep 22, 2014
b412f9b
Don't show cancelled tea times on /profile. Closes #149
Jul 23, 2014
4b4e662
added cancelled tea time styles
ankitshah811 Aug 18, 2014
9aa465b
fix
Sep 22, 2014
57c8450
Merge branch 'cancelled-view'
Sep 22, 2014
0f1167d
Merge branch 'host-tts-on-host-page'
Sep 22, 2014
dbc56b6
Merge branch 'reassign-tt-host'
Sep 22, 2014
b1a052d
Waitlists for tea time
darkmirage Aug 31, 2014
2353d19
Simple integration test for waitlisting
Sep 20, 2014
2baa24a
Mock and test waitlist notifications when flaking
Sep 20, 2014
ec2f978
Simplify TT controller logic
Sep 20, 2014
a55d8a5
Rename and test waitlisted?/attending? methods
Sep 20, 2014
d5bd2ef
Remove commented test code
Sep 20, 2014
c3f2180
waitlist email edits, change scheduling page when no tea times, add s…
ankitshah811 Sep 22, 2014
027fd39
waitlist to wait list, adjust waiting list modal
ankitshah811 Sep 22, 2014
0180c2f
Use enums in favour of custom scopes where appropriate
Sep 22, 2014
a828603
Refactor all waitlist mailers to reside in AttendanceMailer
Sep 22, 2014
6d18710
Fix Ankit's changes to Waitlist mailers
Sep 22, 2014
4440959
Display spots button on waitlisted tea time
Sep 22, 2014
4a2978a
Change waitlist button text when waitlisted
Sep 22, 2014
3ba1d13
Fix erroneous acceptance of merge conflict
Sep 22, 2014
0ee85e2
Merge branch 'waitlist'
Sep 22, 2014
e484efe
remove now unnecessary prompt in waitlist partial
Sep 22, 2014
54c02d9
add utm tracking to all emails
ankitshah811 Sep 22, 2014
017c7d8
Turn string literal into interpolated string
Sep 22, 2014
550b1d7
change padding for cancelled label
ankitshah811 Sep 22, 2014
45bde39
adjust future to only be 2 weeks
ankitshah811 Sep 22, 2014
9cf3c52
change host change email copy
ankitshah811 Sep 23, 2014
eb33d8b
Merge branch 'email-copy' of https://github.com/TeaWithStrangers/tws-…
ankitshah811 Sep 23, 2014
3509f17
add create tea time link under host tt list
ankitshah811 Sep 23, 2014
9bdb7d1
fix subject variable for tt confirmation
ankitshah811 Sep 23, 2014
63c1661
fix merge
ankitshah811 Sep 23, 2014
aed9cc4
Merge pull request #224 from TeaWithStrangers/cancel-tweak
Sep 23, 2014
11e9e0a
Update flake.markerb
Sep 23, 2014
cb95092
Update host_changed.markerb
Sep 23, 2014
fd6546f
Use idiomatic Ruby for times
Sep 23, 2014
4844f97
Merge branch 'tt-2wks'
Sep 23, 2014
79dcd3c
Merge pull request #227 from TeaWithStrangers/host-admin
Sep 23, 2014
d4159bc
Fix 5th attendee of TT being waitlisted
Sep 24, 2014
231afb8
Merge branch 'wl-fix'
Sep 24, 2014
57a0e8e
Update update_tea_time.rb
Sep 25, 2014
98e36a9
Merge branch 'master' of github.com:TeaWithStrangers/tws-on-rails
Sep 26, 2014
fdc61e9
Fixes #231: Host change notifications
Sep 26, 2014
93f44d8
really fix #231
Sep 27, 2014
f8c5a6c
Create NilUser class to replace placeholder Users
Sep 27, 2014
af531f8
Flake future tea times when a user is deleted
Sep 27, 2014
ce4fe2e
Fix indendation in TT controller
Sep 27, 2014
c286c36
Abort Attendance creation if User is nil
Sep 27, 2014
da4447c
Add paranoia gem and migrations
Aug 4, 2014
d70c39e
Activate paranoia gem on TTs and Attendances
Aug 4, 2014
b834ff4
Don't display host drop down at Create Time
Sep 27, 2014
1fa85c7
Fix #235
Sep 27, 2014
7c3a603
correct some utm sources, spacing, parameters
ankitshah811 Sep 28, 2014
48fb307
redo follow up email to attendees
ankitshah811 Sep 28, 2014
64ce88e
quick change
ankitshah811 Sep 28, 2014
259938e
Merge pull request #240 from TeaWithStrangers/no-host-picker-at-creat…
Sep 28, 2014
7d06281
Merge pull request #239 from TeaWithStrangers/deleted-items-fixes
Sep 28, 2014
39a07dc
Merge pull request #244 from TeaWithStrangers/host-changed-email-fix
Sep 28, 2014
170095b
Fixes #237
Sep 28, 2014
595337e
Merge pull request #245 from TeaWithStrangers/cancellation-status-change
Sep 28, 2014
d9e8252
Email All button for each group of statuses. Fixes #234
Sep 28, 2014
952e508
Update all mail calls to send both formats. Closes #214
mehulkar Sep 29, 2014
d7c7f86
Merge pull request #249 from TeaWithStrangers/host-mail-buttons
Sep 30, 2014
44cb84d
Merge remote-tracking branch 'origin/mail-format' into email-copy-tests
Oct 1, 2014
2772520
Add test for registration mailer
Oct 1, 2014
0472a9b
Minimal Attendance Mailer specs+some bugfixes
Oct 1, 2014
445522b
I did just say we were testing rendering...
Oct 1, 2014
f538c80
Fix attendance mailer
Oct 1, 2014
6c73e1b
User Mailer spec and fixes
Oct 1, 2014
ae295cb
Update Sendgrid Category for every mail
Oct 1, 2014
54d0a2c
Merge branch 'email-copy-tests'
Oct 1, 2014
d1aff74
new openhouse info and links
ankitshah811 Oct 2, 2014
5449a3c
utm link tilt link
ankitshah811 Oct 2, 2014
b4dfd60
Merge pull request #254 from TeaWithStrangers/openhouse
ankitshah811 Oct 2, 2014
d75ee61
change flake lang in messages
ankitshah811 Oct 8, 2014
5aa1134
change last tea in host overview to date. changing next tea is confus…
ankitshah811 Oct 8, 2014
362c1ff
Merge pull request #256 from TeaWithStrangers/host-overview
ankitshah811 Oct 8, 2014
c8c0fc9
Merge pull request #257 from TeaWithStrangers/change-flake-lang
ankitshah811 Oct 8, 2014
6e2e4a2
Revert "change last tea in host overview to date. changing next tea i…
ankitshah811 Oct 8, 2014
8c27127
Here.
Oct 8, 2014
1496435
Merge pull request #259 from TeaWithStrangers/bug/233-not-really-a-bug
ankitshah811 Oct 8, 2014
74d3c13
robots instead of fam, spacing issues on emails
ankitshah811 Oct 8, 2014
1822eb4
change some date/time formatting, email copy changes, host/admin disp…
ankitshah811 Oct 8, 2014
e1527da
bold where and when in emails
ankitshah811 Oct 8, 2014
03e8633
remove teatimefriendlytime test
ankitshah811 Oct 8, 2014
453dd54
Merge pull request #262 from TeaWithStrangers/email-copy
ankitshah811 Oct 8, 2014
2f2d75d
Hacky warning RE: holiday TT availability
Dec 17, 2014
e212b62
Fixes #253
Dec 21, 2014
da41fa0
Attendance update route can now take a reason from params. Updates #78
mehulkar Sep 29, 2014
bd5a095
Basic spec for flake
Sep 30, 2014
eeb2999
Update user spec for new flake flow
Oct 1, 2014
998c17a
Users can now supply a reason for flaking w. a modal
Oct 1, 2014
0aa8427
Add flake reason to admin overview
Oct 1, 2014
029ce7e
flake modal styles and copy adjusted for desktop and mobile
ankitshah811 Dec 21, 2014
893c359
Fix user behaviours spec
Dec 21, 2014
6e58fd3
Require users be authorised to flake
Dec 21, 2014
19a8db2
Merge pull request #248 from TeaWithStrangers/flake-reason
Dec 21, 2014
d4719fe
Merge pull request #266 from TeaWithStrangers/host-change-email-edit
Dec 21, 2014
bfc9edb
Ethos mail was erroring. Need to beef up mailer tests
Nov 11, 2014
1573d58
Some preliminary tests. Hacky. Temporary
Dec 21, 2014
c5fafc1
Merge pull request #267 from TeaWithStrangers/ethos-mail-fix
Dec 21, 2014
0682871
Attendance reminder queueing, fixes #263
Dec 22, 2014
876b3ff
Merge pull request #269 from TeaWithStrangers/attendance-email-queuei…
Dec 22, 2014
034cbcd
Update iCalendar gem to one with AS Support
Dec 23, 2014
0e3e034
Fix Calendar TZs and organizers
Dec 23, 2014
e8ae507
Merge pull request #270 from TeaWithStrangers/ical-timezone-support
Dec 23, 2014
59039a7
Merge branch 'scrollmagic'; holiday warning
Dec 24, 2014
f0fc5c8
Testing out bitmasks
Jan 4, 2015
ab3bb3e
Simplify Role code by using a gem for bitmasks
Jan 4, 2015
2a748d8
Fix failing tests
Jan 5, 2015
e728b6f
Add dev Procfile and update README
Jan 9, 2015
778d412
Attendance reminder queueing, fixes #263
Dec 22, 2014
2962bb7
Attendance update route can now take a reason from params. Updates #78
mehulkar Sep 29, 2014
32b95e8
Attendance beginnings
Oct 2, 2014
c098e62
Post-tea time tasks page. Marking attendance works. No specs
Oct 3, 2014
bab42e8
Remove code depending on TT n/a status
Oct 3, 2014
0f851c4
Hosts can see tea times that have been marked
Oct 8, 2014
5eedcb2
Validate there are no pending attendances before saving TT
Oct 8, 2014
80b92c7
ugh
Oct 10, 2014
ef62f00
Fix botched rebase that broke flaking reasons
Dec 21, 2014
7210b8a
Make attendance marking validation less strict
Dec 21, 2014
da3790c
Update Factories with new traits to simplify test setup
Dec 21, 2014
d4fb31a
Rewrite Followup Mailer to work with custom job
Dec 21, 2014
9cf29a5
Custom processor for tea time followup
Dec 21, 2014
f63cc71
Only send Ethos mail when user hasn't been to a TT
Dec 21, 2014
5d9d144
Marking works across the board
Dec 21, 2014
00b2a1d
Send followup emails once attendance has been marked
Dec 21, 2014
5a421ed
Nit fix
Dec 21, 2014
4392d5c
Hosts can mark an attendee as a potential host
Dec 22, 2014
6c9dd34
Remove now completely invalid routes.md
Dec 22, 2014
2eb5b36
Code review updates. Thanks @mehulkar
Dec 22, 2014
e70af72
Host Marking attendance spec
Dec 22, 2014
ed07ea4
Fix bugs integration tests caught
Dec 22, 2014
ff97cd4
Mark Attendance Reminder
Dec 22, 2014
ebfd116
Add stub template for Ankit to fill in
Dec 22, 2014
457fc80
attendance follow up email copy, requires path syntax
ankitshah811 Dec 23, 2014
1cade80
copy changes for follow up emails
ankitshah811 Dec 24, 2014
ce1b15d
prelim changes to host tasks
ankitshah811 Dec 24, 2014
7222297
Add subject lines for attendances
Dec 24, 2014
6fd5174
Hosts can now edit attendance after marking
Dec 24, 2014
18c08e5
Organise tasks by TT rather than status
Jan 2, 2015
4584fd4
style post-tea interface
ankitshah811 Jan 7, 2015
11e78f9
revise post-tea styles
ankitshah811 Jan 10, 2015
1ed0ad6
Fuck everything about this change
Jan 10, 2015
dbb61f9
Merge branch 'attendance'. Closes 255.
Jan 10, 2015
286233d
Don't include waitlisted attendees in attendance marking (for now)
Jan 10, 2015
231e6fd
Don't send attendance followup for TTs before mark launch
Jan 11, 2015
2000097
Remove hosts from index page
Jan 3, 2015
7c84a08
No hosts; all one-third
Jan 12, 2015
6f7816c
Merge pull request #271 from TeaWithStrangers/hostless-home-page
Jan 12, 2015
aa07a72
Update README w. contributing info
Jan 19, 2015
b898deb
Fix Mark Attendance Reminder task link
Jan 23, 2015
2703e86
modified styles for city list
ankitshah811 Jan 27, 2015
27d2137
Merge pull request #277 from TeaWithStrangers/home-cities
Jan 28, 2015
dac8c52
remove holiday indicator in css
Jan 28, 2015
3bf4fdc
fix missing curly brace in css
Jan 28, 2015
f695a1f
remove front-end code for holiday indicator
Jan 29, 2015
2906c07
remove front-end code for holiday indicator
Jan 29, 2015
514fc1f
fix spacing issue with tea time html
Jan 29, 2015
4acea1a
Undo mistaken removal of header container for tea times listing
Jan 29, 2015
ecd3979
Merge pull request #278 from TeaWithStrangers/holiday-parse-indicator
Jan 29, 2015
e349566
Enhancements and fixes to Host Role granting
Feb 18, 2015
ba6adf3
Cheap fix stopping accidentally roles from causing duplicate Host dis…
Feb 18, 2015
a7969df
host_registration.markerb written but ruby variables might be wrong
ankitshah811 Feb 23, 2015
f5915df
Merge pull request #272 from TeaWithStrangers/roles-bitmasks
Feb 28, 2015
ea4bcda
Be strict about ruby version
Feb 28, 2015
a0e2fae
Fix email formatting
Feb 28, 2015
44fa56c
Merge pull request 279 from 'host-registration-improvements'
Feb 28, 2015
5a9c5b9
Gem updates for 2.1.x
Feb 28, 2015
0d41cd9
Robustify bitmask role converter task
Feb 28, 2015
2ed1556
Update Travis config
Feb 28, 2015
f3ce4a1
Update devise to newest release
Oct 10, 2014
12d58b0
Confirmable user model
Oct 10, 2014
ec9a704
User methods relating to confirmable work; routes created
Oct 10, 2014
031e868
The E2E confirmation scenario
Oct 10, 2014
a2a704f
Whitespace fixes
Oct 10, 2014
8167407
Send a valid confirmation token after creating a user
Oct 10, 2014
8b99291
Fix up the rebase/merge with master
Mar 1, 2015
4198563
Gemfile updates
Mar 1, 2015
29d15dc
Fix extraneous space in 'Email Host' link
Mar 4, 2015
4de149d
change upcoming views to ascending chronology
ankitshah811 Mar 13, 2015
e88ce9a
fix email all link in to dos
ankitshah811 Mar 13, 2015
2e8e0f9
get rid of text link
ankitshah811 Mar 14, 2015
3d870c3
Merge pull request #281 from TeaWithStrangers/tea-time-order
Mar 19, 2015
d238735
Merge pull request #282 from TeaWithStrangers/email-all-todo
Mar 19, 2015
1c4f450
Merge remote-tracking branch 'production/master'
Mar 19, 2015
4dfc787
Update devise to newest release
Oct 10, 2014
3edb024
Confirmable user model
Oct 10, 2014
14fd5aa
User methods relating to confirmable work; routes created
Oct 10, 2014
11a1d3d
The E2E confirmation scenario
Oct 10, 2014
15c52a7
Whitespace fixes
Oct 10, 2014
62659aa
Send a valid confirmation token after creating a user
Oct 10, 2014
222f4a6
Fix up the rebase/merge with master
Mar 1, 2015
8c4f565
Gemfile updates
Mar 1, 2015
7c76a9f
Fix up arrows. Because our contributors are pedants.
Mar 24, 2015
1dd3c1d
Allow home_city to be nil for GetOrCreateUser service
Apr 5, 2015
65c38e0
Confirmations progress. Rebase later.
Apr 19, 2015
1f62151
include site guide in host registration email
ankitshah811 Mar 19, 2015
1a02d6c
Reimplement modals
Mar 31, 2015
baab44e
Fix city images so that they cover the div properly
rcchen Apr 18, 2015
86308c6
Replace ignore with transient for factories
Apr 19, 2015
d69d040
add cities redirect for typo
Apr 22, 2015
7674e80
GA was moved out of body tag; fix
Apr 23, 2015
f541604
Remove debug line from hosts controller
Apr 23, 2015
bde364f
Add location to tea time ics
Apr 23, 2015
0360855
Use .ruby-version to specify ruby version
Apr 23, 2015
74b308a
Remove mailcatcher and hirb gems from Gemfile.
Apr 23, 2015
f0e7ce2
Move Logout link to nav bar.
Apr 23, 2015
2922ca3
Update TeaTime#friendly_time to add meridian if start and end are dif…
Apr 24, 2015
c397d04
Make it easier to read routes file
Apr 24, 2015
f1b0616
Alphabetise static routes
Apr 24, 2015
53687b1
Further consolidate routes
Apr 24, 2015
b48cc7a
Add note to README about installing mailcatcher
Apr 24, 2015
eae491a
Add an API route for cities
Apr 24, 2015
a172a7c
Replace 'places' verbiage with 'cities' for consistency
Apr 23, 2015
959a94b
Only install new relic gem in production
Apr 24, 2015
1b9e722
Add FB Insights Meta Tag
Apr 24, 2015
f27f7c4
update required ruby version
rturumella Apr 30, 2015
b036e1f
turns out createuser is it s own utility
Apr 30, 2015
fe10466
this too...maybe ?
Apr 30, 2015
9b45829
Fix development seeds now that roles are bitmasks
Apr 30, 2015
2363779
update readme to remove specific versions
rturumella Apr 30, 2015
dc420af
User methods relating to confirmable work; routes created
Oct 10, 2014
744554a
Whitespace fixes
Oct 10, 2014
0de3bc0
Fix up the rebase/merge with master
Mar 1, 2015
227e259
Update devise to newest release
Oct 10, 2014
b5e6485
Confirmable user model
Oct 10, 2014
e1bf5a9
User methods relating to confirmable work; routes created
Oct 10, 2014
d8fc8b2
The E2E confirmation scenario
Oct 10, 2014
42bc4fa
Send a valid confirmation token after creating a user
Oct 10, 2014
66db601
I liked fat models more anyways
May 3, 2015
82d16b4
Use a partial for the confirmation mail
May 4, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 8 additions & 0 deletions .autotest
@@ -0,0 +1,8 @@
require 'autotest/fsevent'
require 'autotest/growl'

Autotest.add_hook :initialize do |autotest|
%w{.git .svn .hg .DS_Store ._* vendor tmp log doc}.each do |exception|
autotest.add_exception(exception)
end
end
5 changes: 5 additions & 0 deletions .gitignore
Expand Up @@ -19,3 +19,8 @@

# Ignore application configuration
/config/application.yml
# Ignore files uploaded in dev environment
/public/system
.DS_Store

/coverage/
1 change: 1 addition & 0 deletions .rspec
@@ -0,0 +1 @@
--color
1 change: 1 addition & 0 deletions .ruby-version
@@ -0,0 +1 @@
2.1.5
8 changes: 8 additions & 0 deletions .travis.yml
@@ -0,0 +1,8 @@
language: ruby
rvm:
- 2.1.5
bundler_args: --without production
before_script:
- cp config/database.yml.ci config/database.yml
- bundle exec rake db:create
- RAILS_ENV=test bundle exec rake db:migrate --trace
58 changes: 40 additions & 18 deletions Gemfile
@@ -1,36 +1,37 @@
ruby '2.1.5'

source 'https://rubygems.org'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.1.0'
gem 'rails', '4.1.1'

gem 'pg'

# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc

#JS, CSS, Templating

#FIXME: Add versions for these gems
gem 'haml-rails'
gem 'less-rails'
gem 'therubyracer'
gem 'haml-rails', '~> 0.5'
gem 'less-rails', '~> 2.5'
gem 'therubyracer', '~> 0.12'

gem 'uglifier', '>= 1.3.0'
# Serve Assets in Production
gem 'rails_12factor', group: :production
gem 'rails_12factor', group: :production
gem 'turbolinks'
gem 'jquery-rails'
gem 'jquery-ui-rails'

gem 'jquery-ui-rails', '~> 5.0'
gem "active_model_serializers"
gem 'bitmask_attributes', '~> 1.0'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring', group: :development
# Figaro makes it easy to set env variables without Foreman
gem 'figaro', group: [:development, :test]
gem 'markerb'
gem 'sendgrid'

# Figaro makes it easy to set env variables without Foreman
#Calendars
gem 'icalendar', '~> 2.0'
gem 'icalendar', '~> 2.2'
gem 'time_zone_ext'

#Background Jobs
Expand All @@ -41,17 +42,38 @@ gem 'delayed_job_active_record', '~> 4.0.1'
gem 'paperclip', '~> 4.1'
gem 'aws-sdk', '~> 1.5.7'

# soft-delete
gem 'paranoia', "~> 2.0"

# Authentication & Permission Gems
gem 'devise', '~> 3.2.4'
gem 'devise', '~> 3.4.x'
gem 'cancan', '~> 1.6.10'
# Use ActiveModel has_secure_password
gem 'bcrypt', '~> 3.1.7'

# Use unicorn as the app server
gem 'unicorn'
group :production do
gem 'unicorn'
gem 'newrelic_rpm'
end

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# Use debugger
gem 'debugger', group: [:development, :test]
# Dev Gems
gem 'spring', group: :development

# Random debug tools
group :development, :test do
gem 'byebug'
gem 'pry-rails'
gem 'pry-byebug'
gem 'pry-stack_explorer'
gem 'rspec-rails', '~> 2.14.2'
gem 'capybara'
gem 'factory_girl', '~>4.4'
gem 'factory_girl_rails'
gem 'rails-observers'
gem 'shoulda-matchers'
gem 'coveralls', require: false
end