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

Trish add favicon #23

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

Trish add favicon #23

wants to merge 352 commits into from

Conversation

Trishthedish
Copy link

Added Vampire favicon. It renders as a vampire teeth pic.

RedSquirrelious and others added 30 commits October 21, 2016 10:33
@RedSquirrelious
added link to github auth
9d6d6d5
@RedSquirrelious
uncommented the git sessions routes
e203d4a
@ellevargas
Merge pull request #21 from mayawang/ev_styling
eaa92b0 
Ev styling
@RedSquirrelious
changed auth_hash['id'] to auth_hash['uid'] and the like
daad4ac
@RedSquirrelious
commented out most methods
d8aca65
@RedSquirrelious
fixed typos
18b09ae
@RedSquirrelious
fixed typos
f1af9c7
@RedSquirrelious
fixed typos, fixed through to join table
1837152
@RedSquirrelious
fixed typos
4a53879
@RedSquirrelious
commented out has_secure_password, uncommented validators and build b…
687a305 
…y github
@RedSquirrelious
moved and commented out create test
f13c901
@RedSquirrelious
added true test, added options for other controller tests
8a90d51
@RedSquirrelious
fixed odd rails references _id_id thing
396ebc0
@RedSquirrelious
fixed odd rails references _id_id thing
8ba1893
@RedSquirrelious
fixed odd rails references _id_id thing
5110007
@RedSquirrelious
changed id to uid
a513e74
@RedSquirrelious
new schema version, add provider and uid columns
6ad529c
@RedSquirrelious
added default status to provider column
d17736e
@RedSquirrelious
added scaffolding-infrastructure for simple_form gem
e445ac0
@RedSquirrelious
added uid column to help with omniauth
34381c5
@RedSquirrelious
resolved conflicts
25a5d47
@RedSquirrelious
Merge pull request #25 from mayawang/sk_re_omniauth
8f21879 
Sk re omniauth
@ellevargas
rake db migrated
b698f11
@ellevargas
added photos to specific categories and did basic styling
f0c324a
@ellevargas
Merge pull request #26 from mayawang/ev_fix_photos
8671aeb 
added photos to specific categories and did basic styling
@RedSquirrelious
added card class etc.
0c508c6
@ellevargas
Merge pull request #27 from mayawang/sk_css_categories
9ab9317 
added card class etc.
completed add new order to cart mvc logic. not save order info yet.
4c1bc8d
Fix show_seller_products
94f0869
Fix user_id_id
eb68832
Maya Wang and others added 30 commits October 27, 2016 14:42
fixed sytax error in app.css
9207636
resolved merge conflict
6aa4457
@ellevargas
Merge pull request #62 from mayawang/mw_css_sytax_fix
f7710b2 
Mw css sytax fix
Updated Gemfile for heroku
1e74b1d
comment out line 10 of application.rb
c8d1d90
@ellevargas
missing css syntax
754a46b
fix syntax in application.css
b8cb297
Remove integer limits for postgres
981b6ba
Convert types in seeds
cf0d013
Change phone columns to string
02a5d0e
Remove unused script tags
d5ddbf5
@ellevargas
worked on nav
10d55c0
@ellevargas
worked on homepage fruitlessly - switching to basic page formatting
f3ae1a6
@ellevargas
Merge branch 'master' of github.com:mayawang/Vampazon
b2f7615
@ellevargas
cleaned up css and consolidated a few classes on show category view
230baa5
@ellevargas
no more integer limit 4 bs
269307e
@ellevargas
show category pages are all synced up as far as styling
4d0cf77
@ellevargas
got individual pages working and cleaned up css
b7dd841
@ellevargas
omg the all products page looks awesome
01b0a23
@ellevargas
standardized forms and user account info
265cd49
@Trishthedish
Found clever way to fix decimal issues. Things are tested and working.
478450e
@ellevargas
Merge pull request #65 from mayawang/currency_validation
7905710 
currency validation: Found clever way to fix decimal issues. Tested and working. Thanks @ellevargas for catching bug
@ellevargas
working on nav bar and homepage now
dd37ee3
@ellevargas
still working on nav bar and homepage, but atom almost froze :|
45f3699
@ellevargas
added two frontpage photos - will work on this tomorrow morning
04ae252
@ellevargas
added dollar signs and minor tweaks
c6fd7e0
@ellevargas
fixed conflicts and removed js stuff from application.html.erb
664a4a4
@ellevargas
fixed minor change to confirmation page
672add4
@ellevargas
Merge pull request #66 from mayawang/ev_yescss
3aa53d9 
Ev yescss
@Trishthedish
Fixed favicon conflicts
e18d1b1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Trishthedish @RedSquirrelious @ellevargas