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

Mei #236

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

Mei #236

wants to merge 185 commits into from

Conversation

meic-123
Copy link

@meic-123 meic-123 commented Nov 7, 2023

Header and footer

Sami-Aiyathurai and others added 30 commits October 31, 2023 15:56
@Sami-Aiyathurai
Update README.md
a75c458 
Added name
@meic-123
Merge pull request #2 from meic-123/Sami
139242a 
Update README.md
@Sami-Aiyathurai
Update README.md
a81a8ea
@meic-123
Merge pull request #3 from meic-123/Sami
cd7e28f 
Update README.md
@Sami-Aiyathurai
testing
12ad31e
@Sami-Aiyathurai
Who knows
af1b8c9
@meic-123
Merge pull request #4 from meic-123/Sami
9fd2d3e 
testing
@achristen3386
skeleton pages
77ffc8c
@meic-123
Merge pull request #5 from meic-123/Home-page-and-skeleton-Anna
bab6c5b 
skeleton pages
@achristen3386
routing and links
90819b5
@meic-123
Merge pull request #6 from meic-123/Home-page-and-skeleton-Anna
2be0a03 
routing and links
@Anhtran0208
finish print bikes and stations
342e2f4
@Sami-Aiyathurai
update bikes and stations
f2d7205
@meic-123
Merge pull request #7 from meic-123/Sami
637952f 
update bikes and stations
@meic123
Header and Footer
7ed8828
@meic-123
Header and Footer CSS
7a00663 
11/7 - mei
@meic-123
Header and Footer HTML
a665153 
11/7 - mei
@Sami-Aiyathurai
tables for users, memberships and transactions
b8c8774
@meic-123
Merge pull request #8 from meic-123/Sami
91b8622 
tables for users, memberships and transactions
@meic-123
Update Home Page.html.erb
43e47e9 
11/7 - mei
@meic-123
Update index.html.erb
6706d56
@Anhtran0208
resolve conflict
5a20337
@Anhtran0208
Merge branch 'master' of https://github.com/meic-123/valetbike into a…
63ec632 
…nh-print-data
@Anhtran0208
Merge pull request #12 from meic-123/anh-print-data
0aa7d63 
finish print bikes and stations
@meic123
Update index.html.erb
3d8af12
@meic123
Merge branch 'mei' of https://github.com/meic-123/valetbike into mei
af0f248
@meic123
Update index.html.erb
95560ba
@meic-123
Merge pull request #13 from meic-123/mei
9a80fc7 
Mei
@Sami-Aiyathurai
Fixed href link
c852917
@meic-123
Merge pull request #14 from meic-123/Sami
0cbc92a 
Fixed href link
Anhtran0208 and others added 30 commits December 10, 2023 01:49
@Anhtran0208
update stripe
6fc833a
@Anhtran0208
Merge pull request #54 from meic-123/anh-update-stripe
f06d181 
update stripe
@Sami-Aiyathurai
Fixed database usage and worked on renting styling
acf97e1
@Sami-Aiyathurai
Merge pull request #55 from meic-123/Sami
abe041e 
Fixed database usage and worked on renting styling
@meic123
dropdown
5461343
@Sami-Aiyathurai
finished styling for returning
86478b7
@Sami-Aiyathurai
Merge pull request #56 from meic-123/Sami
422cea5 
finished styling for returning
@meic-123
Merge branch 'mei' into master
8807b01
@meic-123
Merge pull request #57 from meic-123/master
334fc4b 
update mei
@meic123
stash
c71a91b
@achristen3386
weird database issues
aed3608
@achristen3386
pulling sami changes
9949d3a
@meic123
Merge branch 'master' of https://github.com/meic-123/valetbike into mei
b7510f5
@meic123
Merge branch 'mei' of https://github.com/meic-123/valetbike into mei
de24826
@achristen3386
removed unused controllers, helpers and routes
2aaf557
@achristen3386
Merge pull request #58 from meic-123/remove_unused
103a38b 
removed:
accoutn_helper.rb
return.html.erb
payment_information_controller.erb
payment information folder + index
pay_information routes
active_trip/return routes
past_trips/index from routes
@Anhtran0208
display membership
22dd226
@Anhtran0208
Merge branch 'master' of https://github.com/meic-123/valetbike into a…
f716797 
…nh-update-stripe
@Anhtran0208
Merge pull request #59 from meic-123/anh-display-membership
7d652e2 
Anh display membership
@Sami-Aiyathurai
changed the styling on the membershio buttons
aaacba8
@Sami-Aiyathurai
Merge pull request #60 from meic-123/Sami
dafde99 
changed the styling on the membership buttons
@meic123
Merge branch 'master' of https://github.com/meic-123/valetbike into mei
0e64819
@meic123
dropdown
2278252
@meic-123
Merge pull request #61 from meic-123/mei
8226e3b 
Mei
@meic123
dropdown and header styling
2391d5f
@meic-123
Merge branch 'master' into mei
f95a0f6
@meic-123
Merge pull request #62 from meic-123/mei
5167810 
Mei
@Anhtran0208
fix small error
506b98e
@Anhtran0208
Merge pull request #63 from meic-123/anh-display-membership
cac723d 
fix small error
@meic123
make pretty
af7d7a1
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.
5 participants
@meic-123 @Sami-Aiyathurai @achristen3386 @Anhtran0208 @meic123