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.

Sign up for GitHub

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

Jump to bottom

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

Closed
wants to merge 852 commits into from
Closed

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

wants to merge 852 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Sep 17, 2014

  1. Merge pull request #208 from TeaWithStrangers/admin-overview-improvem… 

    …ents

Add shitty host overview page
    Nick Barnwell committed Sep 17, 2014
    Configuration menu
    Copy the full SHA
    d263c2a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #209 from TeaWithStrangers/new-404 

    Fix 404 img to be relative to root
    Nick Barnwell committed Sep 17, 2014
    Configuration menu
    Copy the full SHA
    1527fe9 View commit details
    Browse the repository at this point in the history

  3. adjust display for attendees list

    @ankitshah811
    ankitshah811 committed Sep 17, 2014
    Configuration menu
    Copy the full SHA
    4bed3da View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2014

  1. Add null user to Attendance relation

    Nick Barnwell committed Sep 20, 2014
    Configuration menu
    Copy the full SHA
    95385b7 View commit details
    Browse the repository at this point in the history

  2. Test and changed name for User nil_user method

    Nick Barnwell committed Sep 20, 2014
    Configuration menu
    Copy the full SHA
    66ab17d View commit details
    Browse the repository at this point in the history

  3. Integration test for history page

    Nick Barnwell committed Sep 20, 2014
    Configuration menu
    Copy the full SHA
    12f8260 View commit details
    Browse the repository at this point in the history

  4. Fix variable naming bug in TT controller (unrelated)

    Nick Barnwell committed Sep 20, 2014
    Configuration menu
    Copy the full SHA
    68a0dc2 View commit details
    Browse the repository at this point in the history

  5. Fix 500 page teacup image

    Nick Barnwell committed Sep 20, 2014
    Configuration menu
    Copy the full SHA
    4b0bb51 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #210 from TeaWithStrangers/fix-deleted-user-refere… 

    …nces

Fix deleted user references
    Nick Barnwell committed Sep 20, 2014
    Configuration menu
    Copy the full SHA
    3bff4c5 View commit details
    Browse the repository at this point in the history

  7. Add to_s method to Tea Time

    Nick Barnwell committed Sep 20, 2014
    Configuration menu
    Copy the full SHA
    f9eff04 View commit details
    Browse the repository at this point in the history

  8. Mobile users will no longer encounter modals

    Nick Barnwell committed Sep 20, 2014
    Configuration menu
    Copy the full SHA
    6c5b0d2 View commit details
    Browse the repository at this point in the history

  9. Host tea times on host pages

    Nick Barnwell committed Sep 20, 2014
    Configuration menu
    Copy the full SHA
    776415d View commit details
    Browse the repository at this point in the history

  10. Only display 'Upcoming Tea times' for a city if there are any

    Nick Barnwell committed Sep 20, 2014
    Configuration menu
    Copy the full SHA
    130169b View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2014

  1. Hosts can now reassign the host of a tea time

    Nick Barnwell committed Sep 21, 2014
    1 Configuration menu
    Copy the full SHA
    3a22b71 View commit details
    Browse the repository at this point in the history

  2. Tests for host changing tea time

    Nick Barnwell committed Sep 21, 2014
    Configuration menu
    Copy the full SHA
    fe28dfd View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2014

  1. note about how to add post-schedule note for host pages

    @ankitshah811
    ankitshah811 committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    1a21b2d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #211 from TeaWithStrangers/no-mobile-modals 

    No Mobile Modals
    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    4dbdd33 View commit details
    Browse the repository at this point in the history

  3. copy changes for registration and ethos emails

    @ankitshah811
    ankitshah811 committed Sep 22, 2014
    2 Configuration menu
    Copy the full SHA
    539a258 View commit details
    Browse the repository at this point in the history

  4. Add host info to scheduling partial. TODO: Undo

    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    d1922d8 View commit details
    Browse the repository at this point in the history

  5. Don't show cancelled tea times on /profile. Closes #149

    Mehul Kar authored and Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    b412f9b View commit details
    Browse the repository at this point in the history

  6. added cancelled tea time styles

    @ankitshah811
    ankitshah811 authored and Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    4b4e662 View commit details
    Browse the repository at this point in the history

  7. fix

    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    9aa465b View commit details
    Browse the repository at this point in the history

  8. Merge branch 'cancelled-view'

    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    57c8450 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'host-tts-on-host-page'

    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    0f1167d View commit details
    Browse the repository at this point in the history

  10. Merge branch 'reassign-tt-host'

    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    dbc56b6 View commit details
    Browse the repository at this point in the history

  11. Waitlists for tea time 

    - Sign up link changes according to user attendance status
- Emails waitlisted users when a flaking from a full tea time
- Shows list of future waitlisted tea times on profile page
    @darkmirage
    darkmirage authored and Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    b1a052d View commit details
    Browse the repository at this point in the history

  12. Simple integration test for waitlisting

    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    2353d19 View commit details
    Browse the repository at this point in the history

  13. Mock and test waitlist notifications when flaking

    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    2baa24a View commit details
    Browse the repository at this point in the history

  14. Simplify TT controller logic

    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    ec2f978 View commit details
    Browse the repository at this point in the history

  15. Rename and test waitlisted?/attending? methods

    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    a55d8a5 View commit details
    Browse the repository at this point in the history

  16. Remove commented test code

    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    d5bd2ef View commit details
    Browse the repository at this point in the history

  17. waitlist email edits, change scheduling page when no tea times, add s… 

    …ocial share on no tea schedule pg
    @ankitshah811
    ankitshah811 authored and Nick Barnwell committed Sep 22, 2014
    6 Configuration menu
    Copy the full SHA
    c3f2180 View commit details
    Browse the repository at this point in the history

  18. waitlist to wait list, adjust waiting list modal

    @ankitshah811
    ankitshah811 authored and Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    027fd39 View commit details
    Browse the repository at this point in the history

  19. Use enums in favour of custom scopes where appropriate

    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    0180c2f View commit details
    Browse the repository at this point in the history

  20. Refactor all waitlist mailers to reside in AttendanceMailer

    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    a828603 View commit details
    Browse the repository at this point in the history

  21. Fix Ankit's changes to Waitlist mailers

    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    6d18710 View commit details
    Browse the repository at this point in the history

  22. Display spots button on waitlisted tea time

    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    4440959 View commit details
    Browse the repository at this point in the history

  23. Change waitlist button text when waitlisted

    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    4a2978a View commit details
    Browse the repository at this point in the history

  24. Fix erroneous acceptance of merge conflict

    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    3ba1d13 View commit details
    Browse the repository at this point in the history

  25. Merge branch 'waitlist'

    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    0ee85e2 View commit details
    Browse the repository at this point in the history

  26. remove now unnecessary prompt in waitlist partial

    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    e484efe View commit details
    Browse the repository at this point in the history

  27. add utm tracking to all emails

    @ankitshah811
    ankitshah811 committed Sep 22, 2014
    1 Configuration menu
    Copy the full SHA
    54c02d9 View commit details
    Browse the repository at this point in the history

  28. Turn string literal into interpolated string 

    For strings with interpolation in them (`#{...}`) you need to have double quotes `"` instead of `'`
    Nick Barnwell committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    017c7d8 View commit details
    Browse the repository at this point in the history

  29. change padding for cancelled label

    @ankitshah811
    ankitshah811 committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    550b1d7 View commit details
    Browse the repository at this point in the history

  30. adjust future to only be 2 weeks

    @ankitshah811
    ankitshah811 committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    45bde39 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2014

  1. change host change email copy

    @ankitshah811
    ankitshah811 committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    9cf3c52 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'email-copy' of https://github.com/TeaWithStrangers/tws-… 

    …on-rails into email-copy
    @ankitshah811
    ankitshah811 committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    eb33d8b View commit details
    Browse the repository at this point in the history

  3. add create tea time link under host tt list

    @ankitshah811
    ankitshah811 committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    3509f17 View commit details
    Browse the repository at this point in the history

  4. fix subject variable for tt confirmation

    @ankitshah811
    ankitshah811 committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    9bdb7d1 View commit details
    Browse the repository at this point in the history

  5. fix merge

    @ankitshah811
    ankitshah811 committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    63c1661 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #224 from TeaWithStrangers/cancel-tweak 

    Change padding for cancelled label
    Nick Barnwell committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    aed9cc4 View commit details
    Browse the repository at this point in the history

  7. Update flake.markerb 

    Fix `url_for` line wrapping.
    Nick Barnwell committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    11e9e0a View commit details
    Browse the repository at this point in the history

  8. Update host_changed.markerb 

    Remove whitespace
    Nick Barnwell committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    cb95092 View commit details
    Browse the repository at this point in the history

  9. Use idiomatic Ruby for times

    Nick Barnwell committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    fd6546f View commit details
    Browse the repository at this point in the history

  10. Merge branch 'tt-2wks'

    Nick Barnwell committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    4844f97 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #227 from TeaWithStrangers/host-admin 

    Add 'Create Tea Time' link under Host TT list
    Nick Barnwell committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    79dcd3c View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2014

  1. Fix 5th attendee of TT being waitlisted 

    Problem was caused by setting default attendance status to :pending.
Fix: Don't persist attendance until `try_join` is called and its status
is set.

Nit: Swapped usage of unless for an 'if !'. It's cleaner.
    Nick Barnwell committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    d4159bc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'wl-fix'

    Nick Barnwell committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    231afb8 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2014

  1. Update update_tea_time.rb

    Nick Barnwell committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    57a0e8e View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2014

  1. Merge branch 'master' of github.com:TeaWithStrangers/tws-on-rails

    Nick Barnwell committed Sep 26, 2014
    Configuration menu
    Copy the full SHA
    98e36a9 View commit details
    Browse the repository at this point in the history

  2. Fixes #231: Host change notifications

    Nick Barnwell committed Sep 26, 2014
    Configuration menu
    Copy the full SHA
    fdc61e9 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2014

  1. really fix #231

    Nick Barnwell committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    93f44d8 View commit details
    Browse the repository at this point in the history

  2. Create NilUser class to replace placeholder Users 

    Step one towards stopping attendances being created without a user
    Nick Barnwell committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    f8c5a6c View commit details
    Browse the repository at this point in the history

  3. Flake future tea times when a user is deleted

    Nick Barnwell committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    af531f8 View commit details
    Browse the repository at this point in the history

  4. Fix indendation in TT controller

    Nick Barnwell committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    ce4fe2e View commit details
    Browse the repository at this point in the history

  5. Abort Attendance creation if User is nil

    Nick Barnwell committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    c286c36 View commit details
    Browse the repository at this point in the history

  6. Add paranoia gem and migrations

    Nick Barnwell committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    da4447c View commit details
    Browse the repository at this point in the history

  7. Activate paranoia gem on TTs and Attendances

    Nick Barnwell committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    d70c39e View commit details
    Browse the repository at this point in the history

  8. Don't display host drop down at Create Time

    Nick Barnwell committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    b834ff4 View commit details
    Browse the repository at this point in the history

  9. Fix #235

    Nick Barnwell committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    1fa85c7 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2014

  1. correct some utm sources, spacing, parameters

    @ankitshah811
    ankitshah811 committed Sep 28, 2014
    Configuration menu
    Copy the full SHA
    7c3a603 View commit details
    Browse the repository at this point in the history

  2. redo follow up email to attendees

    @ankitshah811
    ankitshah811 committed Sep 28, 2014
    Configuration menu
    Copy the full SHA
    48fb307 View commit details
    Browse the repository at this point in the history

  3. quick change

    @ankitshah811
    ankitshah811 committed Sep 28, 2014
    Configuration menu
    Copy the full SHA
    64ce88e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #240 from TeaWithStrangers/no-host-picker-at-creat… 

    …e-time

Don't display host selection during create
    Nick Barnwell committed Sep 28, 2014
    Configuration menu
    Copy the full SHA
    259938e View commit details
    Browse the repository at this point in the history

  5. Merge pull request #239 from TeaWithStrangers/deleted-items-fixes 

    Fix #232, Implement 'Paranoid' gem
    Nick Barnwell committed Sep 28, 2014
    Configuration menu
    Copy the full SHA
    7d06281 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #244 from TeaWithStrangers/host-changed-email-fix 

    Fix #235
    Nick Barnwell committed Sep 28, 2014
    Configuration menu
    Copy the full SHA
    39a07dc View commit details
    Browse the repository at this point in the history

  7. Fixes #237 

    Only change attendance status on pending attendees when a tea time
is cancelled.
    Nick Barnwell committed Sep 28, 2014
    Configuration menu
    Copy the full SHA
    170095b View commit details
    Browse the repository at this point in the history

  8. Merge pull request #245 from TeaWithStrangers/cancellation-status-change 

    Cancelling Tea Time only affects Pending Attendees
    Nick Barnwell committed Sep 28, 2014
    Configuration menu
    Copy the full SHA
    595337e View commit details
    Browse the repository at this point in the history

  9. Email All button for each group of statuses. Fixes #234

    Nick Barnwell committed Sep 28, 2014
    Configuration menu
    Copy the full SHA
    d9e8252 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2014

  1. Update all mail calls to send both formats. Closes #214

    @mehulkar
    mehulkar committed Sep 29, 2014
    Configuration menu
    Copy the full SHA
    952e508 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2014

  1. Merge pull request #249 from TeaWithStrangers/host-mail-buttons 

    Email All button for each group of statuses. Fixes #234
    Nick Barnwell committed Sep 30, 2014
    Configuration menu
    Copy the full SHA
    d7c7f86 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2014

  1. Merge remote-tracking branch 'origin/mail-format' into email-copy-tests 

    Fixes #214

Conflicts:
	app/mailers/attendance_mailer.rb
	app/mailers/tea_time_mailer.rb
	app/mailers/user_mailer.rb
    Nick Barnwell committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    44cb84d View commit details
    Browse the repository at this point in the history

  2. Add test for registration mailer

    Nick Barnwell committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    2772520 View commit details
    Browse the repository at this point in the history

  3. Minimal Attendance Mailer specs+some bugfixes

    Nick Barnwell committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    0472a9b View commit details
    Browse the repository at this point in the history

  4. I did just say we were testing rendering...

    Nick Barnwell committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    445522b View commit details
    Browse the repository at this point in the history

  5. Fix attendance mailer

    Nick Barnwell committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    f538c80 View commit details
    Browse the repository at this point in the history

  6. User Mailer spec and fixes

    Nick Barnwell committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    6c73e1b View commit details
    Browse the repository at this point in the history

  7. Update Sendgrid Category for every mail

    Nick Barnwell committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    ae295cb View commit details
    Browse the repository at this point in the history

  8. Merge branch 'email-copy-tests' 

    Mailer enhancements all around!
    Nick Barnwell committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    54d0a2c View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2014

  1. new openhouse info and links

    @ankitshah811
    ankitshah811 committed Oct 2, 2014
    Configuration menu
    Copy the full SHA
    d1aff74 View commit details
    Browse the repository at this point in the history

  2. utm link tilt link

    @ankitshah811
    ankitshah811 committed Oct 2, 2014
    Configuration menu
    Copy the full SHA
    5449a3c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #254 from TeaWithStrangers/openhouse 

    Openhouse
    @ankitshah811
    ankitshah811 committed Oct 2, 2014
    Configuration menu
    Copy the full SHA
    b4dfd60 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2014

  1. change flake lang in messages

    @ankitshah811
    ankitshah811 committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    d75ee61 View commit details
    Browse the repository at this point in the history

  2. change last tea in host overview to date. changing next tea is confus… 

    …ing me
    @ankitshah811
    ankitshah811 committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    5aa1134 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #256 from TeaWithStrangers/host-overview 

    change last tea in host overview to date. changing next tea is confusing...
    @ankitshah811
    ankitshah811 committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    362c1ff View commit details
    Browse the repository at this point in the history

  4. Merge pull request #257 from TeaWithStrangers/change-flake-lang 

    change flake lang in messages
    @ankitshah811
    ankitshah811 committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    c8c0fc9 View commit details
    Browse the repository at this point in the history

  5. Revert "change last tea in host overview to date. changing next tea i… 

    …s confusing me"

This reverts commit 5aa1134.
    @ankitshah811
    ankitshah811 committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    6e2e4a2 View commit details
    Browse the repository at this point in the history

  6. Here.

    Nick Barnwell committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    8c27127 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #259 from TeaWithStrangers/bug/233-not-really-a-bug 

    'Fix' #233
    @ankitshah811
    ankitshah811 committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    1496435 View commit details
    Browse the repository at this point in the history

  8. robots instead of fam, spacing issues on emails

    @ankitshah811
    ankitshah811 committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    74d3c13 View commit details
    Browse the repository at this point in the history

  9. change some date/time formatting, email copy changes, host/admin disp… 

    …lay issues for create tea time
    @ankitshah811
    ankitshah811 committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    1822eb4 View commit details
    Browse the repository at this point in the history

  10. bold where and when in emails

    @ankitshah811
    ankitshah811 committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    e1527da View commit details
    Browse the repository at this point in the history

  11. remove teatimefriendlytime test

    @ankitshah811
    ankitshah811 committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    03e8633 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #262 from TeaWithStrangers/email-copy 

    Email copy
    @ankitshah811
    ankitshah811 committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    453dd54 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2014

  1. Hacky warning RE: holiday TT availability

    Nick Barnwell committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    2f2d75d View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2014

  1. Fixes #253

    Nick Barnwell committed Dec 21, 2014
    Configuration menu
    Copy the full SHA
    e212b62 View commit details
    Browse the repository at this point in the history

  2. Attendance update route can now take a reason from params. Updates #78

    @mehulkar
    mehulkar authored and Nick Barnwell committed Dec 21, 2014
    Configuration menu
    Copy the full SHA
    da41fa0 View commit details
    Browse the repository at this point in the history

  3. Basic spec for flake

    Nick Barnwell committed Dec 21, 2014
    Configuration menu
    Copy the full SHA
    bd5a095 View commit details
    Browse the repository at this point in the history

  4. Update user spec for new flake flow

    Nick Barnwell committed Dec 21, 2014
    Configuration menu
    Copy the full SHA
    eeb2999 View commit details
    Browse the repository at this point in the history

  5. Users can now supply a reason for flaking w. a modal

    Nick Barnwell committed Dec 21, 2014
    Configuration menu
    Copy the full SHA
    998c17a View commit details
    Browse the repository at this point in the history

  6. Add flake reason to admin overview

    Nick Barnwell committed Dec 21, 2014
    Configuration menu
    Copy the full SHA
    0aa8427 View commit details
    Browse the repository at this point in the history

  7. flake modal styles and copy adjusted for desktop and mobile

    @ankitshah811
    ankitshah811 authored and Nick Barnwell committed Dec 21, 2014
    Configuration menu
    Copy the full SHA
    029ce7e View commit details
    Browse the repository at this point in the history

  8. Fix user behaviours spec

    Nick Barnwell committed Dec 21, 2014
    Configuration menu
    Copy the full SHA
    893c359 View commit details
    Browse the repository at this point in the history

  9. Require users be authorised to flake

    Nick Barnwell committed Dec 21, 2014
    Configuration menu
    Copy the full SHA
    6e58fd3 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #248 from TeaWithStrangers/flake-reason 

    Attendance update route can now take a reason from params. Updates #78
    Nick Barnwell committed Dec 21, 2014
    Configuration menu
    Copy the full SHA
    19a8db2 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #266 from TeaWithStrangers/host-change-email-edit 

    Update TT Host Change Email Verbiage
    Nick Barnwell committed Dec 21, 2014
    Configuration menu
    Copy the full SHA
    d4719fe View commit details
    Browse the repository at this point in the history

  12. Ethos mail was erroring. Need to beef up mailer tests

    Nick Barnwell committed Dec 21, 2014
    Configuration menu
    Copy the full SHA
    bfc9edb View commit details
    Browse the repository at this point in the history

  13. Some preliminary tests. Hacky. Temporary

    Nick Barnwell committed Dec 21, 2014
    Configuration menu
    Copy the full SHA
    1573d58 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #267 from TeaWithStrangers/ethos-mail-fix 

    Ethos mail was erroring. Need to beef up mailer tests
    Nick Barnwell committed Dec 21, 2014
    Configuration menu
    Copy the full SHA
    c5fafc1 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2014

  1. Attendance reminder queueing, fixes #263 

    Update TT controller to reflext altered method name
    Nick Barnwell committed Dec 22, 2014
    Configuration menu
    Copy the full SHA
    0682871 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #269 from TeaWithStrangers/attendance-email-queuei… 

    …ng-fix

Attendance reminder queueing, fixes #263
    Nick Barnwell committed Dec 22, 2014
    Configuration menu
    Copy the full SHA
    876b3ff View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2014

  1. Update iCalendar gem to one with AS Support

    Nick Barnwell committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    034cbcd View commit details
    Browse the repository at this point in the history

  2. Fix Calendar TZs and organizers

    Nick Barnwell committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    0e3e034 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #270 from TeaWithStrangers/ical-timezone-support 

    iCalendar Attachment Timezone Support
    Nick Barnwell committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    e8ae507 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2014

  1. Merge branch 'scrollmagic'; holiday warning

    Nick Barnwell committed Dec 24, 2014
    Configuration menu
    Copy the full SHA
    59039a7 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2015

  1. Testing out bitmasks

    Nick Barnwell committed Jan 4, 2015
    Configuration menu
    Copy the full SHA
    f0fc5c8 View commit details
    Browse the repository at this point in the history

  2. Simplify Role code by using a gem for bitmasks

    Nick Barnwell committed Jan 4, 2015
    Configuration menu
    Copy the full SHA
    ab3bb3e View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2015

  1. Fix failing tests

    Nick Barnwell committed Jan 5, 2015
    Configuration menu
    Copy the full SHA
    2a748d8 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2015

  1. Add dev Procfile and update README

    Nick Barnwell committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    e728b6f View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2015

  1. Attendance reminder queueing, fixes #263 

    Update TT controller to reflext altered method name
    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    778d412 View commit details
    Browse the repository at this point in the history

  2. Attendance update route can now take a reason from params. Updates #78

    @mehulkar
    mehulkar authored and Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    2962bb7 View commit details
    Browse the repository at this point in the history

  3. Attendance beginnings

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    32b95e8 View commit details
    Browse the repository at this point in the history

  4. Post-tea time tasks page. Marking attendance works. No specs

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    c098e62 View commit details
    Browse the repository at this point in the history

  5. Remove code depending on TT n/a status

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    bab42e8 View commit details
    Browse the repository at this point in the history

  6. Hosts can see tea times that have been marked

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    0f851c4 View commit details
    Browse the repository at this point in the history

  7. Validate there are no pending attendances before saving TT

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    5eedcb2 View commit details
    Browse the repository at this point in the history

  8. ugh

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    80b92c7 View commit details
    Browse the repository at this point in the history

  9. Fix botched rebase that broke flaking reasons

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    ef62f00 View commit details
    Browse the repository at this point in the history

  10. Make attendance marking validation less strict

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    7210b8a View commit details
    Browse the repository at this point in the history

  11. Update Factories with new traits to simplify test setup

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    da3790c View commit details
    Browse the repository at this point in the history

  12. Rewrite Followup Mailer to work with custom job 

    Moves control of grouping outside of ActionMailer, where it doesn't work as expected.
    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    d4fb31a View commit details
    Browse the repository at this point in the history

  13. Custom processor for tea time followup

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    9cf29a5 View commit details
    Browse the repository at this point in the history

  14. Only send Ethos mail when user hasn't been to a TT

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    f63cc71 View commit details
    Browse the repository at this point in the history

  15. Marking works across the board

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    5d9d144 View commit details
    Browse the repository at this point in the history

  16. Send followup emails once attendance has been marked

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    00b2a1d View commit details
    Browse the repository at this point in the history

  17. Nit fix

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    5a421ed View commit details
    Browse the repository at this point in the history

  18. Hosts can mark an attendee as a potential host

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    4392d5c View commit details
    Browse the repository at this point in the history

  19. Remove now completely invalid routes.md

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    6c9dd34 View commit details
    Browse the repository at this point in the history

  20. Code review updates. Thanks @mehulkar 

    Nit fixing
    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    2eb5b36 View commit details
    Browse the repository at this point in the history

  21. Host Marking attendance spec

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    e70af72 View commit details
    Browse the repository at this point in the history

  22. Fix bugs integration tests caught

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    ed07ea4 View commit details
    Browse the repository at this point in the history

  23. Mark Attendance Reminder

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    ff97cd4 View commit details
    Browse the repository at this point in the history

  24. Add stub template for Ankit to fill in

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    ebfd116 View commit details
    Browse the repository at this point in the history

  25. attendance follow up email copy, requires path syntax

    @ankitshah811
    ankitshah811 authored and Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    457fc80 View commit details
    Browse the repository at this point in the history

  26. copy changes for follow up emails

    @ankitshah811
    ankitshah811 authored and Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    1cade80 View commit details
    Browse the repository at this point in the history

  27. prelim changes to host tasks

    @ankitshah811
    ankitshah811 authored and Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    ce1b15d View commit details
    Browse the repository at this point in the history

  28. Add subject lines for attendances

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    7222297 View commit details
    Browse the repository at this point in the history

  29. Hosts can now edit attendance after marking 

    * Followup Emails not sent until host marks followup as complete
    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    6fd5174 View commit details
    Browse the repository at this point in the history

  30. Organise tasks by TT rather than status

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    18c08e5 View commit details
    Browse the repository at this point in the history

  31. style post-tea interface

    @ankitshah811
    ankitshah811 authored and Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    4584fd4 View commit details
    Browse the repository at this point in the history

  32. revise post-tea styles

    @ankitshah811
    ankitshah811 authored and Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    11e78f9 View commit details
    Browse the repository at this point in the history

  33. Fuck everything about this change

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    1ed0ad6 View commit details
    Browse the repository at this point in the history

  34. Merge branch 'attendance'. Closes 255.

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    dbb61f9 View commit details
    Browse the repository at this point in the history

  35. Don't include waitlisted attendees in attendance marking (for now)

    Nick Barnwell committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    286233d View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2015

  1. Don't send attendance followup for TTs before mark launch

    Nick Barnwell committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    231e6fd View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2015

  1. Remove hosts from index page

    Nick Barnwell committed Jan 12, 2015
    Configuration menu
    Copy the full SHA
    2000097 View commit details
    Browse the repository at this point in the history

  2. No hosts; all one-third

    Nick Barnwell committed Jan 12, 2015
    Configuration menu
    Copy the full SHA
    7c84a08 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #271 from TeaWithStrangers/hostless-home-page 

    Remove Hosts from Home Page
    Nick Barnwell committed Jan 12, 2015
    Configuration menu
    Copy the full SHA
    6f7816c View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2015

  1. Update README w. contributing info

    Nick Barnwell committed Jan 19, 2015
    1 Configuration menu
    Copy the full SHA
    aa07a72 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2015

  1. Fix Mark Attendance Reminder task link

    Nick Barnwell committed Jan 23, 2015
    Configuration menu
    Copy the full SHA
    b898deb View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2015

  1. modified styles for city list

    @ankitshah811
    ankitshah811 committed Jan 27, 2015
    Configuration menu
    Copy the full SHA
    2703e86 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2015

  1. Merge pull request #277 from TeaWithStrangers/home-cities 

    Display cities three abreast on home page
    Nick Barnwell committed Jan 28, 2015
    Configuration menu
    Copy the full SHA
    27d2137 View commit details
    Browse the repository at this point in the history

  2. remove holiday indicator in css

    Cynthia Wright committed Jan 28, 2015
    Configuration menu
    Copy the full SHA
    dac8c52 View commit details
    Browse the repository at this point in the history

  3. fix missing curly brace in css

    Cynthia Wright committed Jan 28, 2015
    Configuration menu
    Copy the full SHA
    3bf4fdc View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2015

  1. remove front-end code for holiday indicator

    Cynthia Wright committed Jan 29, 2015
    3 Configuration menu
    Copy the full SHA
    f695a1f View commit details
    Browse the repository at this point in the history

  2. remove front-end code for holiday indicator

    Cynthia Wright committed Jan 29, 2015
    Configuration menu
    Copy the full SHA
    2906c07 View commit details
    Browse the repository at this point in the history

  3. fix spacing issue with tea time html

    Cynthia Wright committed Jan 29, 2015
    Configuration menu
    Copy the full SHA
    514fc1f View commit details
    Browse the repository at this point in the history

  4. Undo mistaken removal of header container for tea times listing

    Nick Barnwell committed Jan 29, 2015
    Configuration menu
    Copy the full SHA
    4acea1a View commit details
    Browse the repository at this point in the history

  5. Merge pull request #278 from TeaWithStrangers/holiday-parse-indicator 

    Remove Tea Time Scarcity Warning due to holidays from city page
    Nick Barnwell committed Jan 29, 2015
    Configuration menu
    Copy the full SHA
    ecd3979 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2015

  1. Enhancements and fixes to Host Role granting 

    * Creates a custom registration/welcome to family methods for hosts
* Stops hosts who were existings users from having their passwords reset
    Nick Barnwell committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    e349566 View commit details
    Browse the repository at this point in the history

  2. Cheap fix stopping accidentally roles from causing duplicate Host dis… 

    …play
    Nick Barnwell committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    ba6adf3 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2015

  1. host_registration.markerb written but ruby variables might be wrong

    @ankitshah811
    ankitshah811 committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    a7969df View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2015

  1. Merge pull request #272 from TeaWithStrangers/roles-bitmasks 

    Model user roles as a bitmask on the User record, not a relation.

Incldues migration rake task that converts between the old and new formats.
    Nick Barnwell committed Feb 28, 2015
    Configuration menu
    Copy the full SHA
    f5915df View commit details
    Browse the repository at this point in the history

  2. Be strict about ruby version

    Nick Barnwell committed Feb 28, 2015
    Configuration menu
    Copy the full SHA
    ea4bcda View commit details
    Browse the repository at this point in the history

  3. Fix email formatting

    Nick Barnwell committed Feb 28, 2015
    Configuration menu
    Copy the full SHA
    a0e2fae View commit details
    Browse the repository at this point in the history

  4. Merge pull request 279 from 'host-registration-improvements' 

    * Friendlier and more sensible host welcome email.
* Don't reset host password when they're promoted to host.
    Nick Barnwell committed Feb 28, 2015
    Configuration menu
    Copy the full SHA
    44fa56c View commit details
    Browse the repository at this point in the history

  5. Gem updates for 2.1.x

    Nick Barnwell committed Feb 28, 2015
    Configuration menu
    Copy the full SHA
    5a9c5b9 View commit details
    Browse the repository at this point in the history

  6. Robustify bitmask role converter task

    Nick Barnwell committed Feb 28, 2015
    Configuration menu
    Copy the full SHA
    0d41cd9 View commit details
    Browse the repository at this point in the history

  7. Update Travis config

    Nick Barnwell committed Feb 28, 2015
    Configuration menu
    Copy the full SHA
    2ed1556 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2015

  1. Update devise to newest release

    Nick Barnwell committed Mar 1, 2015
    Configuration menu
    Copy the full SHA
    f3ce4a1 View commit details
    Browse the repository at this point in the history

  2. Confirmable user model 

    * Database migration with confirmable fields
* Refactors out some user role related things incl. confirmable stuff into a
  mixin
    Nick Barnwell committed Mar 1, 2015
    Configuration menu
    Copy the full SHA
    12d58b0 View commit details
    Browse the repository at this point in the history

  3. User methods relating to confirmable work; routes created

    Nick Barnwell committed Mar 1, 2015
    Configuration menu
    Copy the full SHA
    ec9a704 View commit details
    Browse the repository at this point in the history

  4. The E2E confirmation scenario

    Nick Barnwell committed Mar 1, 2015
    Configuration menu
    Copy the full SHA
    031e868 View commit details
    Browse the repository at this point in the history

  5. Whitespace fixes

    Nick Barnwell committed Mar 1, 2015
    Configuration menu
    Copy the full SHA
    a2a704f View commit details
    Browse the repository at this point in the history

  6. Send a valid confirmation token after creating a user

    Nick Barnwell committed Mar 1, 2015
    Configuration menu
    Copy the full SHA
    8167407 View commit details
    Browse the repository at this point in the history

  7. Fix up the rebase/merge with master

    Nick Barnwell committed Mar 1, 2015
    Configuration menu
    Copy the full SHA
    8b99291 View commit details
    Browse the repository at this point in the history

  8. Gemfile updates

    Nick Barnwell committed Mar 1, 2015
    Configuration menu
    Copy the full SHA
    4198563 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2015

  1. Fix extraneous space in 'Email Host' link

    Nick Barnwell committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    29d15dc View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2015

  1. change upcoming views to ascending chronology

    @ankitshah811
    ankitshah811 authored and Nick Barnwell committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    4de149d View commit details
    Browse the repository at this point in the history

  2. fix email all link in to dos

    @ankitshah811
    ankitshah811 authored and Nick Barnwell committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    e88ce9a View commit details
    Browse the repository at this point in the history

  3. get rid of text link

    @ankitshah811
    ankitshah811 authored and Nick Barnwell committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    2e8e0f9 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #281 from TeaWithStrangers/tea-time-order 

    Upcoming tea times are now sorted from soonest to latest, rather than vice versa.
    Nick Barnwell committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    3d870c3 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #282 from TeaWithStrangers/email-all-todo 

    Don't include flakes in "Email All" button for Hosts
    Nick Barnwell committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    d238735 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'production/master'

    Nick Barnwell committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    1c4f450 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2015

  1. Update devise to newest release

    Nick Barnwell committed Mar 24, 2015
    Configuration menu
    Copy the full SHA
    4dfc787 View commit details
    Browse the repository at this point in the history

  2. Confirmable user model 

    * Database migration with confirmable fields
* Refactors out some user role related things incl. confirmable stuff into a
  mixin
    Nick Barnwell committed Mar 24, 2015
    Configuration menu
    Copy the full SHA
    3edb024 View commit details
    Browse the repository at this point in the history

  3. User methods relating to confirmable work; routes created

    Nick Barnwell committed Mar 24, 2015
    Configuration menu
    Copy the full SHA
    14fd5aa View commit details
    Browse the repository at this point in the history

  4. The E2E confirmation scenario

    Nick Barnwell committed Mar 24, 2015
    Configuration menu
    Copy the full SHA
    11a1d3d View commit details
    Browse the repository at this point in the history

  5. Whitespace fixes

    Nick Barnwell committed Mar 24, 2015
    Configuration menu
    Copy the full SHA
    15c52a7 View commit details
    Browse the repository at this point in the history

  6. Send a valid confirmation token after creating a user

    Nick Barnwell committed Mar 24, 2015
    Configuration menu
    Copy the full SHA
    62659aa View commit details
    Browse the repository at this point in the history

  7. Fix up the rebase/merge with master

    Nick Barnwell committed Mar 24, 2015
    Configuration menu
    Copy the full SHA
    222f4a6 View commit details
    Browse the repository at this point in the history

  8. Gemfile updates

    Nick Barnwell committed Mar 24, 2015
    Configuration menu
    Copy the full SHA
    8c4f565 View commit details
    Browse the repository at this point in the history

  9. Fix up arrows. Because our contributors are pedants. 

    SO PROUD
    Nick Barnwell committed Mar 24, 2015
    Configuration menu
    Copy the full SHA
    7c76a9f View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2015

  1. Allow home_city to be nil for GetOrCreateUser service

    Nick Barnwell committed Apr 5, 2015
    Configuration menu
    Copy the full SHA
    1dd3c1d View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2015

  1. Confirmations progress. Rebase later.

    Nick Barnwell committed Apr 19, 2015
    Configuration menu
    Copy the full SHA
    65c38e0 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2015

  1. include site guide in host registration email

    @ankitshah811
    ankitshah811 authored and Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    1f62151 View commit details
    Browse the repository at this point in the history

  2. Reimplement modals

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    1a02d6c View commit details
    Browse the repository at this point in the history

  3. Fix city images so that they cover the div properly

    @rcchen
    rcchen authored and Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    baab44e View commit details
    Browse the repository at this point in the history

  4. Replace ignore with transient for factories

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    86308c6 View commit details
    Browse the repository at this point in the history

  5. add cities redirect for typo

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    d69d040 View commit details
    Browse the repository at this point in the history

  6. GA was moved out of body tag; fix

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    7674e80 View commit details
    Browse the repository at this point in the history

  7. Remove debug line from hosts controller

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    f541604 View commit details
    Browse the repository at this point in the history

  8. Add location to tea time ics

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    bde364f View commit details
    Browse the repository at this point in the history

  9. Use .ruby-version to specify ruby version

    Mehul Kar authored and Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    0360855 View commit details
    Browse the repository at this point in the history

  10. Remove mailcatcher and hirb gems from Gemfile. 

    Both gems should be installed locally on user machines
and should not be in the project Gemfile.
    Mehul Kar authored and Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    74b308a View commit details
    Browse the repository at this point in the history

  11. Move Logout link to nav bar. 

    This solves 2 UX problems:

1. It makes it harder to click the logout button accidentally
when scheduling a tea time
2. It puts Login and Logout in the same place for consistency
    Mehul Kar authored and Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    f0e7ce2 View commit details
    Browse the repository at this point in the history

  12. Update TeaTime#friendly_time to add meridian if start and end are dif… 

    …ferent
    Mehul Kar authored and Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    2922ca3 View commit details
    Browse the repository at this point in the history

  13. Make it easier to read routes file

    Mehul Kar authored and Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    c397d04 View commit details
    Browse the repository at this point in the history

  14. Alphabetise static routes

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    f1b0616 View commit details
    Browse the repository at this point in the history

  15. Further consolidate routes

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    53687b1 View commit details
    Browse the repository at this point in the history

  16. Add note to README about installing mailcatcher

    Mehul Kar authored and Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    b48cc7a View commit details
    Browse the repository at this point in the history

  17. Add an API route for cities

    Mehul Kar authored and Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    eae491a View commit details
    Browse the repository at this point in the history

  18. Replace 'places' verbiage with 'cities' for consistency

    Mehul Kar authored and Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    a172a7c View commit details
    Browse the repository at this point in the history

  19. Only install new relic gem in production

    Mehul Kar authored and Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    959a94b View commit details
    Browse the repository at this point in the history

  20. Add FB Insights Meta Tag

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    1b9e722 View commit details
    Browse the repository at this point in the history

  21. update required ruby version

    @rturumella
    rturumella authored and Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    f27f7c4 View commit details
    Browse the repository at this point in the history

  22. turns out createuser is it s own utility

    yrizk authored and Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    b036e1f View commit details
    Browse the repository at this point in the history

  23. this too...maybe ?

    yrizk authored and Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    fe10466 View commit details
    Browse the repository at this point in the history

  24. Fix development seeds now that roles are bitmasks

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    9b45829 View commit details
    Browse the repository at this point in the history

  25. update readme to remove specific versions

    @rturumella
    rturumella authored and Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    2363779 View commit details
    Browse the repository at this point in the history

  26. User methods relating to confirmable work; routes created

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    dc420af View commit details
    Browse the repository at this point in the history

  27. Whitespace fixes

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    744554a View commit details
    Browse the repository at this point in the history

  28. Fix up the rebase/merge with master

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    0de3bc0 View commit details
    Browse the repository at this point in the history

  29. Update devise to newest release

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    227e259 View commit details
    Browse the repository at this point in the history

  30. Confirmable user model 

    * Database migration with confirmable fields
* Refactors out some user role related things incl. confirmable stuff into a
  mixin
    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    b5e6485 View commit details
    Browse the repository at this point in the history

  31. User methods relating to confirmable work; routes created

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    e1bf5a9 View commit details
    Browse the repository at this point in the history

  32. The E2E confirmation scenario

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    d8fc8b2 View commit details
    Browse the repository at this point in the history

  33. Send a valid confirmation token after creating a user

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    42bc4fa View commit details
    Browse the repository at this point in the history

  34. I liked fat models more anyways

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    66db601 View commit details
    Browse the repository at this point in the history

  35. Use a partial for the confirmation mail

    Nick Barnwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    82d16b4 View commit details
    Browse the repository at this point in the history