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

CS 169 Group 13 Fall 2017 #135

Open
wants to merge 179 commits into
base: master
Choose a base branch
from
Open

Conversation

raychan3
Copy link

@raychan3 raychan3 commented Dec 4, 2017

Pull Request to merge fork.

colinschoen and others added 30 commits October 10, 2017 18:15
Change continous integration badges to point to new continuous integration tools using the current fork under my GitHub account.
Signed-off-by: Colin Schoen <cschoen@berkeley.edu>
Signed-off-by: Colin Schoen <cschoen@berkeley.edu>
Signed-off-by: Colin Schoen <cschoen@berkeley.edu>
Adds YouTube link to Tanay's video to iter0.md
* Add Colin video link to iter0 doc

Signed-off-by: Colin Schoen <cschoen@berkeley.edu>

* Add Cindy 2 min video

Signed-off-by: Colin Schoen <cschoen@berkeley.edu>

* Add gabriel and raymond

Signed-off-by: Colin Schoen <cschoen@berkeley.edu>

* Add cary lnk

Signed-off-by: Colin Schoen <cschoen@berkeley.edu>
Adds the relevant cucumber tests for the
user stories.
Adds user stories for iteration 1-1
* first

* Remove old mailgun utils

Signed-off-by: Colin Schoen <cschoen2020@gmail.com>

* Update readme to include env variables that need to be set for mailgun

Signed-off-by: Colin Schoen <cschoen2020@gmail.com>

* Add mail gun settings production environment

Signed-off-by: Colin Schoen <cschoen2020@gmail.com>

* Add MAIL_DELIVERY_METHOD environment variable

Signed-off-by: Colin Schoen <cschoen2020@gmail.com>

* Add mailgun_rails gem

Signed-off-by: Colin Schoen <cschoen2020@gmail.com>

* Update readme to include new MAIL_DELIVERY_METHOD

Signed-off-by: Colin Schoen <cschoen2020@gmail.com>

* Readd email functionality

Signed-off-by: Colin Schoen <cschoen2020@gmail.com>

* Add back email functionality

Signed-off-by: Colin Schoen <cschoen2020@gmail.com>

* Update gemfile.lock

Signed-off-by: Colin Schoen <cschoen2020@gmail.com>

* Fix | -> || in production environment

Signed-off-by: Colin Schoen <cschoen2020@gmail.com>

* Update readme for necessary environment variables to be set

Signed-off-by: Colin Schoen <cschoen2020@gmail.com>

* Change MAIL_DELIVERY_METHOD to EMAIL_DELIVERY_METHOD

Signed-off-by: Colin Schoen <cschoen2020@gmail.com>

* Code style fixes

* Remove parenthesis in conditoin

* Style changes for create

* Add helper functions to delete database columns

* String break for codeclimate
* Broken fixes on filling sign up email form

* fixed user form logic

* fixed new feature bug

* Edit admin_mailer style

* Comment out unused email functionality

Signed-off-by: Colin Schoen <cschoen2020@gmail.com>

* Some style changes

* More fixes

* Remove cucumber_output

* indentation fixes for admin_mailer

* Lines max width
Add admin skills management step definitions
Signed-off-by: Colin Schoen <cschoen2020@gmail.com>
[fix] Start tracking gemfile lock again
Update all references to new repo fork
Signed-off-by: Colin Schoen <cschoen2020@gmail.com>
Signed-off-by: Colin Schoen <cschoen2020@gmail.com>
Signed-off-by: Colin Schoen <cschoen2020@gmail.com>
raychan3 and others added 30 commits December 3, 2017 22:59
Refactor Teams to Team Listing
] Fix checkbox alignment

Signed-off-by: Colin Schoen <cschoen2020@gmail.com>
Signed-off-by: Colin Schoen <cschoen2020@gmail.com>
Fixes so that later project groups will have easier time
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants