[go: nahoru, domu]
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

Ignoredev #22

Closed
wants to merge 57 commits into from
Closed

Ignoredev #22

wants to merge 57 commits into from

Conversation

georgebabayan
Copy link
Owner

No description provided.

rdfm and others added 30 commits February 15, 2017 13:39
@rdfm
Adds homepage, set root and view, and adds normalize CSS to app CSS a…
df52921 
…ssest
@jonbent
Merge pull request #2 from georgebabayan/homepage
af831df 
Adds homepage, set root and view, and adds normalize CSS to app CSS a…
@jonbent
adds bcrypt to app, adds some seeds
57e97fb
@jonbent
Merge branch 'dev' of https://github.com/georgebabayan/multiplayer-ba…
f8623ee 
…ttleship-RoR into dev
@jonbent
adds associations for all classes, adds less hardcoded board
c578880
@jonbent
adds game association to rounds
f482a01
@rdfm
Merge pull request #4 from georgebabayan/jonbent
09a0962 
Jonbent
@amber-nash
Merge branch 'dev' of https://github.com/georgebabayan/multiplayer-ba…
462de55 
…ttleship-RoR

I want to work on the project.
@jonbent
fixes seeds, comment out destroys on first seed
c5644fb
@jonbent
Merge pull request #5 from georgebabayan/jonbent
b42c1f5 
fixes seeds, comment out destroys on first seed
@amber-nash
Create resource/routes for user.
fddce95
@amber-nash
Create controller for user.
944919c
@amber-nash
Create views for user.
81b6e8e
@amber-nash
Create navbar for new users.
058219b
@amber-nash
Update form field type password for security.
6637da1
@amber-nash
Initial build of sessions controller/helper.
bfa11df
@rdfm
Adds board layout, and background image
b151614
@amber-nash
Merge pull request #6 from georgebabayan/board_view
563c587 
Adds board layout, and background image
@amber-nash
Merge branch 'dev' of https://github.com/georgebabayan/multiplayer-ba…
93ec92d 
…ttleship-RoR into users-login

Contributor on project.
@jonbent
Merge pull request #8 from georgebabayan/users-login
4479825 
Users login
@jonbent
fixes some database issues, and adds some logic to rounds model
02201fe
@jonbent
Merge branch 'dev' into jonbent
af4197e
@jonbent
Update schema.rb
34022a5
@jonbent
Update seeds.rb
63308cf
@jonbent
Merge pull request #9 from georgebabayan/jonbent
54c95da 
fixes some database issues, and adds some logic to rounds model
@amber-nash
Plural sessions_helper file name.
d08b62a
@jonbent
Merge pull request #10 from georgebabayan/users-login
897bbc7 
Plural sessions_helper file name.
@jonbent
fixes some minor bugs, adds back serializing for json
6c64727
@amber-nash
Merge pull request #11 from georgebabayan/jonbent
576d25b 
fixes some minor bugs, adds back serializing for json
@georgebabayan
Add logic to sheep
75a367e
amber-nash and others added 25 commits February 15, 2017 22:25
@amber-nash
Create custom routes for sessions, and login view.
ee6afe1
@amber-nash
Fix bugs with user registration, add errors.
26c7f79
@amber-nash
Create errors partial for user.
83f00d2
@jonbent
Merge pull request #12 from georgebabayan/sheep_shooter
f9f72e2 
Sheep shooter
@georgebabayan
Add ships
f424bb4
@amber-nash
Change param term, add password verify/validation feature to reg.
be23fc0
@georgebabayan
Merge pull request #13 from georgebabayan/sheep_shooter
93ab46b 
Add ships
@amber-nash
Fix incorrect login form_tag param and update login custom routes.
81e0dee
@amber-nash
Create partial for failed login error messages.
7c1fc1a
@amber-nash
Correct user show page link_to path.
8f1fe7d
@amber-nash
Add gitignore file.
d9e5c80
@amber-nash
Fix merge conflict.
480970a
@rdfm
Merge pull request #14 from georgebabayan/users-login
f073448 
Users login
@georgebabayan
Add hirb and fit checker
d0787e3
@georgebabayan
Add new conflit
de4636d
@georgebabayan
fixes database and stuff
95f5a1b
@georgebabayan
fixed seed
1781c6d
@georgebabayan
Merge pull request #18 from georgebabayan/sheep_shooter
29c5bec 
Sheep shooter
@amber-nash
Add title page image.
9754463
@amber-nash
Reconfigure .gititnore file cause GEORGE.
52624ba
@georgebabayan
Add alot of Jon's mistakes
3157bde
@georgebabayan
Merge pull request #19 from georgebabayan/db_master
d92f470 
Add alot of Jon's mistakes
@amber-nash
Merge pull request #20 from georgebabayan/styling
4693b6c 
Styling
@georgebabayan
Add logic for diplay sheep and Chat
990f826
@georgebabayan
Add ignore git
4ca8759
@georgebabayan georgebabayan deleted the ignoredev branch February 17, 2017 01:22
@georgebabayan georgebabayan restored the ignoredev branch February 17, 2017 01:23
@georgebabayan georgebabayan deleted the ignoredev branch February 17, 2017 01:23
@georgebabayan georgebabayan restored the ignoredev branch February 17, 2017 01:28
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.

None yet
4 participants
@georgebabayan @rdfm @jonbent @amber-nash