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

More styling #5

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

More styling #5

wants to merge 126 commits into from

Conversation

ehickle
Copy link

@ehickle ehickle commented Jul 30, 2017

No description provided.

jmharvey0 and others added 30 commits July 27, 2017 19:34
@jmharvey0
Add twilio toy example view, contoller, and service object
3635137
Integrate with Braintree API, create view for new transaction
ff44eda
Fix Twilio API key issues
410dc3e
@jameswmoody
Merge pull request #1 from jameswmoody/twilio-fix
2f5e59f 
Fix Twilio API key issues
Create simple test, it passes
9e2b6e5
Merge branch 'master' into rspec-test
62fd6d5
fix to dotenv
a537b05
@jameswmoody
Merge pull request #2 from jameswmoody/rspec-test
c44e697 
Rspec test
james....
a394197
Merge branch 'master' into rspec-test
3f81e7f
@jameswmoody
Merge pull request #3 from jameswmoody/rspec-test
627dbb0 
Rspec test
Add generic landing page
1851575
@jameswmoody
Merge pull request #4 from jameswmoody/landing_page
2ba5790 
Add generic landing page
fix landing page routes
7a76089
Add keys
d5f5d32
fix merge conflicts
9cbd291
@jmharvey0
Begin writing README
5648ae9
@jmharvey0
create models for customers,businesses,tabs,items with validations
2c8d807
@jmharvey0
model tests written and passing
d7fa582
Merge pull request #5 from jameswmoody/db-setup
b37bbe7 
Db setup
Merge branch 'master' of https://github.com/jameswmoody/tab-out
e2275a8
Merge branch 'master' of https://github.com/jameswmoody/tab-out
cd6899e
@jmharvey0
add awesome seed file with awesome print
d3b38cb
Merge pull request #6 from jameswmoody/seed_data
2417591 
Seed Data
Add fake user view
7243d65
Merge branch 'master' of https://github.com/jameswmoody/tab-out
61eaa36 
Seed data
Merge branch 'master' into user_show
c90be82 
Seed file
@jmharvey0
Merge branch 'master' into read_me
6804be3
@jmharvey0
add table for dev team, break time
2c5e660
@jmharvey0
change phone_number to phone in customers table
8ac115b
jmharvey0 and others added 30 commits July 29, 2017 19:52
@jmharvey0
refix merge conflict oops
d22007f
Merge pull request #20 from jameswmoody/checkout_feature
1d58e99 
Checkout feature
Add transaction_id to database
e83c724
@jameswmoody
Add basic structure for Bootstrap customization
31ef406
@jameswmoody
Remove Dotenv load for heroku deploy
2838836
@jameswmoody
Add Apple status bar translucent meta tag
a456654
@jameswmoody
Add padding to navbar to clear iphone status bar
6be0122
@jameswmoody
Add js to prevent links from opening safari on iOS
a194820
@jameswmoody
Add native app-esque styling
fc360dc
@jameswmoody
Add additional styling
2489fdb
@jameswmoody
Add additional styling
49a0e91
@nicoglennon
Merge pull request #21 from jameswmoody/bootstrap-skeleton
5864f5b 
Bootstrap skeleton
@jameswmoody
Customize Braintree Drop-In styling for optimization
b6bc2f1
@nicoglennon
add CSS to make list items appear as cards
56e94ba
@nicoglennon
Merge pull request #22 from jameswmoody/bootstrap-skeleton
3964d25 
Bootstrap skeleton
@nicoglennon
Merge conflict resolved in application.css and application.html.erb
6cb3940
Add ability to check open/closed status of a tab
da4c27b
Merge pull request #23 from jameswmoody/open_tab_feature
2b94392 
Open tab feature
Revert "Open tab feature"
2b398e7
Merge pull request #24 from jameswmoody/revert-23-open_tab_feature
32f1926 
Revert "Open tab feature"
Add p statement for debuggging"
4357189
Merge pull request #25 from jameswmoody/open-tab-feature
2ac93a1 
Add p statement for debuggging"
Revert "Revert "Open tab feature""
18bdfe0
Merge pull request #26 from jameswmoody/revert-24-revert-23-open_tab_…
13a9d5e 
…feature

Revert "Revert "Open tab feature""
remove print statement
10e2cbb
Merge pull request #27 from jameswmoody/open-tab-debug
8ae1641 
remove print statement in tabs_controller
@nicoglennon
Add some general stylings, fonts, buttons
1b23b7f
@nicoglennon
Merge conflict resolved
58c66b7
@nicoglennon
Fix merge conflict residual
2982a94
@nicoglennon
Add user profile conditionals for no tab open
ea55dc5
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
@ehickle @jmharvey0 @jameswmoody @nicoglennon