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

Pet-Shop-Server Greg Mikeska, David Coleman and John Goldsmith #460

Open
wants to merge 40 commits into
base: pet-shop-server
Choose a base branch
from
Open

Pet-Shop-Server Greg Mikeska, David Coleman and John Goldsmith #460

wants to merge 40 commits into from

Conversation

gmikeska
Copy link

No description provided.

gmikeska and others added 30 commits December 11, 2014 14:54
@gmikeska
initial commit
3208a46
@gmikeska
adding repos
700ea53
@gmikeska
set up BCrypt for user authentication
a038b79
@gmikeska
set up BCrypt for user authentication 2
52c1b2e
@colemandavid55
set session id upon succesful password and collect pet data
8b4743c
@JMGoldsmith
petshop query
86a82fb
@colemandavid55
change login name from default to current user
4c24c27
@JMGoldsmith
petshop query
7f35743
@JMGoldsmith
no clue
68a5391
@JMGoldsmith
Merge branch 'pet-shop-server' of https://github.com/gmikeska/ruby-co…
3cf37af 
…urse into pet-shop-server
@JMGoldsmith
cats repo
454bae9
@JMGoldsmith
petshop repo extended
1d92bbb
@colemandavid55
add dogs repo function
dcc983e
@colemandavid55
Merge branch 'pet-shop-server' of https://github.com/gmikeska/ruby-co…
156b4b9 
…urse into pet-shop-server

Conflicts:
	lib/petshops_repo/petshops_repo.rb
@colemandavid55
adjust dog endpoints
0022d1f
@colemandavid55
change class to module for petshop-dogsrepo
8b1a40d
@gmikeska
fixing bugs with the user repo spec
fe3142f
@gmikeska
Merge branch 'pet-shop-server' of github.com:gmikeska/ruby-course int…
8c2ab4d 
…o pet-shop-server

Conflicts:
	lib/petshops_repo/petshops_repo.rb
@gmikeska
removing HEAD thngy
7eb4b89
@colemandavid55
Merge correction
e09dc97
@colemandavid55
Merge branch 'pet-shop-server' of https://github.com/gmikeska/ruby-co…
b0f63a5 
…urse into pet-shop-server

Conflicts:
	lib/petshops_repo/petshops_repo.rb
@gmikeska
got rid of spec closes #7
3d9755b
@gmikeska
Merge branch 'pet-shop-server' of github.com:gmikeska/ruby-course int…
cf8873b 
…o pet-shop-server
@gmikeska
removed .rspec file. OUT DAMNED SPEC!!!!
b092222
@colemandavid55
remove rest-client, require json and render reterned hashes into json
1aacd35
@colemandavid55
create db connection in dog sections
4d8c760
@gmikeska
set up database call for shops.all
5e2abbd
@gmikeska
Merge branch 'pet-shop-server' of github.com:gmikeska/ruby-course int…
1234e41 
…o pet-shop-server
@gmikeska
adds requires for bcrypt dependency run bundle install when pulling!
370e8ee
@gmikeska
corrected typo in server.rb
70dc152
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
@gmikeska @colemandavid55 @JMGoldsmith