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.

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

Mongoose2 #500

Open
wants to merge 64 commits into
base: main
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
6a83034
Adding test docs folder and docs
Swright88 Jun 12, 2023
695b1a7
Reversed posts
Swright88 Jun 13, 2023
3cb3a40
Install dotenv
cutetofuu Jun 13, 2023
cdc17ed
Set up production environment
cutetofuu Jun 13, 2023
57982b6
Add first and last names
cutetofuu Jun 13, 2023
bb69b3d
Merge branch 'main' into mongodb-setup
cutetofuu Jun 13, 2023
322ac35
Merge pull request #1 from MMal87/mongodb-setup
cutetofuu Jun 13, 2023
cbc2ab1
changes
Chrishall17 Jun 13, 2023
05da992
working on posts and comments
MMal87 Jun 13, 2023
f609f27
working on comments
MMal87 Jun 14, 2023
be596ed
changes
Chrishall17 Jun 14, 2023
783fd87
add seed data to development, create profile page/routes
AlexBuz-web Jun 14, 2023
376c233
Add login and signup links
cutetofuu Jun 14, 2023
54aec43
Install bcrypt
cutetofuu Jun 14, 2023
a991cef
Add password hashing feature
cutetofuu Jun 14, 2023
eba3db6
comments working
MMal87 Jun 14, 2023
f17c9fa
draft posts tests
Swright88 Jun 14, 2023
87d82d0
implement list of friends and non-friends on profile page first draft
AlexBuz-web Jun 14, 2023
ed399e3
ability to add and remove friends from database and show on html page
AlexBuz-web Jun 14, 2023
9a21f63
Update seed data
cutetofuu Jun 14, 2023
2614eab
like button work
MMal87 Jun 14, 2023
9c6eee2
"css and password validation"
Chrishall17 Jun 14, 2023
983e89d
Merge branch 'tester-ch' into main
Chrishall17 Jun 15, 2023
2bd6624
Merge pull request #2 from MMal87/main
Chrishall17 Jun 15, 2023
23a92b1
ready to merge
Chrishall17 Jun 15, 2023
1274bb9
Merge pull request #3 from MMal87/tester-ch
Chrishall17 Jun 15, 2023
8eaafd9
Created a couple of tests, added input on show.hbs
PHagan23 Jun 15, 2023
11cd474
"changes"
Chrishall17 Jun 15, 2023
da65184
when user submits add friend it goes into friend requests section for…
AlexBuz-web Jun 15, 2023
7e92548
changes to likes
MMal87 Jun 15, 2023
b8e3bc9
likes
MMal87 Jun 15, 2023
916111c
"changes"
Chrishall17 Jun 15, 2023
f7eea29
Merge pull request #4 from MMal87/tester-ch
Chrishall17 Jun 15, 2023
70ffa0d
added tests
PHagan23 Jun 15, 2023
d91efa1
changes
Chrishall17 Jun 15, 2023
8b24f6b
Add login and signup error messages
cutetofuu Jun 15, 2023
4e85664
Merge pull request #5 from MMal87/tester-ch
Chrishall17 Jun 15, 2023
665f935
Merge branch 'main' into signup-validation
cutetofuu Jun 15, 2023
0b82e3e
likes and comments
MMal87 Jun 15, 2023
a4c7568
likes
MMal87 Jun 15, 2023
9d8f035
edited likebutton name
MMal87 Jun 15, 2023
5c05679
likebutton
MMal87 Jun 15, 2023
e6ef101
fix bug and page now updates after accepting friend request to reflec…
AlexBuz-web Jun 15, 2023
9e68988
Update stylesheet links
cutetofuu Jun 15, 2023
0b61a7b
Update error message
cutetofuu Jun 15, 2023
61fa331
likes on index page
MMal87 Jun 15, 2023
fa1ede2
Merge branch 'main' into tuesday
ClaudiaGC1339 Jun 15, 2023
9704f5c
Merge pull request #7 from MMal87/tuesday
ClaudiaGC1339 Jun 15, 2023
65e0f4a
Add form validation with regex
cutetofuu Jun 15, 2023
07a1111
Merge branch 'main' to signup-validation
cutetofuu Jun 15, 2023
22d62f9
fixed some styling issues
AlexBuz-web Jun 15, 2023
9ba2005
Merge branch 'main' into mongoose
AlexBuzea Jun 15, 2023
74f0516
Merge pull request #8 from MMal87/mongoose
AlexBuzea Jun 15, 2023
2b25996
Update routes
cutetofuu Jun 15, 2023
dc750fe
Merge branch 'main' into signup-validation
cutetofuu Jun 15, 2023
78803e8
Merge pull request #6 from MMal87/signup-validation
cutetofuu Jun 15, 2023
7ed740e
Update seed data with hashed passwords
cutetofuu Jun 16, 2023
e24fa8b
Merge pull request #9 from MMal87/update-seed-data
cutetofuu Jun 16, 2023
ebb2155
Add user to seed data
cutetofuu Jun 16, 2023
892919c
Merge branch 'main' of https://github.com/MMal87/acebook-neutral into…
cutetofuu Jun 16, 2023
037b447
Merge pull request #10 from MMal87/update-seed-data
cutetofuu Jun 16, 2023
d75a31f
fix remove friend
AlexBuz-web Jun 16, 2023
8c968a1
fix bug where use
AlexBuz-web Jun 16, 2023
e142210
add sentFriendRequests field to user model in order to evaluate wheth…
AlexBuz-web Jun 16, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.