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

Revert 20 mei #238

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

Revert 20 mei #238

wants to merge 52 commits into from

Conversation

meic-123
Copy link

No description provided.

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
Sami-Aiyathurai and others added 22 commits November 8, 2023 10:27
@Sami-Aiyathurai
created migrations for trip, favorite and report
f625889
@meic-123
Merge pull request #15 from meic-123/Sami
fdd0997 
created migrations for trip, favorite and report
@meic123
Move Stylesheets from Application to Global
2652aa2
@Sami-Aiyathurai
made relationship between memberships and users
283b39e
@achristen3386
login and logout skeleton functionality
52c128c
@Sami-Aiyathurai
Started with the relations for trips
baabc6a
@meic-123
Merge pull request #16 from meic-123/login
1aecb6d 
login and logout skeleton functionality
@meic123
header + footer on each page
b533e3b
@Sami-Aiyathurai
Merge branch 'master' into Sami
2e53998
@meic-123
Merge pull request #17 from meic-123/Sami
dcc8068 
Sami
@Sami-Aiyathurai
Merge branch 'master' of github.com:meic-123/valetbike into Sami
90310cf
@Sami-Aiyathurai
something is wrong
8966974
@meic-123
Merge pull request #18 from meic-123/Sami
b2c8154 
Sami
@meic123
edited global css
da87593
@meic-123
Merge branch 'master' into mei
cd3aaf4
@meic-123
Merge pull request #19 from meic-123/mei
a9c6ca8 
Mei header + footer
@meic123
update routes
880dd72
@meic123
update routes
ea42156
@meic123
Merge branch 'mei' of https://github.com/meic-123/valetbike into mei
f8c8900
@meic123
Update routes.rb
e2e7bbb
@meic-123
Merge pull request #20 from meic-123/mei
a99637a 
Mei routes
@meic-123
Revert "Mei routes"
0832fbb
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