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

Postcomment #14

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f073620
add Jo to Title
josmiley76 May 13, 2020
7767de2
added blog.sql database file into repository
josmiley76 May 17, 2020
a84b223
untrack files in .gitignore
josmiley76 May 18, 2020
c6e5978
Merge branch 'master' of https://github.com/LauraWTech/MVC-Skeleton
josmiley76 May 18, 2020
98544e7
Merge pull request #1 from LauraWTech/josfixbranch
josmiley76 May 18, 2020
0ebc871
removed nbproject merge prob files and updated .gitignore and fixed v…
josmiley76 May 18, 2020
bbbd0f6
Merge branch 'fixedvicshomeandignore'
josmiley76 May 18, 2020
b38f3ab
I added gitignore and .DS_store
LauraWTech May 18, 2020
f34436a
resolved conflicts
LauraWTech May 18, 2020
0276d32
final conflict resolving spaces
LauraWTech May 18, 2020
c1dfe4b
addedgitignorefile
HannahSargeant May 19, 2020
0f98b3d
addinggitignore
Amanition May 19, 2020
8d73d94
Merge branch 'fixamanignore'
Amanition May 19, 2020
54005cf
Merge branch 'fixhannahsignore'
HannahSargeant May 19, 2020
e1944ae
Merge branch 'master' of https://github.com/LauraWTech/MVC-Skeleton
Amanition May 19, 2020
cac0ccb
git ignore added hannah
HannahSargeant May 19, 2020
da456e9
Merge branch 'master' of https://github.com/LauraWTech/MVC-Skeleton
HannahSargeant May 19, 2020
9ba7a16
added newPost.php file
LauraWTech May 20, 2020
5c0aebf
Created New Posts files
HannahSargeant May 21, 2020
1043039
update to the database
Amanition May 21, 2020
0ea5b2d
Hannahs Front End Changes
HannahSargeant May 22, 2020
1ff9638
Merge pull request #3 from LauraWTech/ourDatabase
LauraWTech May 22, 2020
c2e7c10
Merge pull request #4 from LauraWTech/newPost
LauraWTech May 22, 2020
93e2d16
connecting the first slice to the databse
Amanition May 22, 2020
769be85
login Page
HannahSargeant May 23, 2020
2c75bf7
Hannah and Amans Changes
HannahSargeant May 23, 2020
05c6e5d
laura and Jo registerBlog changes
LauraWTech May 23, 2020
2a94de2
Hannahs front end changes
HannahSargeant May 23, 2020
57e7673
Merge pull request #5 from LauraWTech/connect_to_database
HannahSargeant May 23, 2020
149a1bd
Merge pull request #6 from LauraWTech/registerBlog
HannahSargeant May 23, 2020
b25f230
Merge branch 'master' into loginPage
HannahSargeant May 23, 2020
5edfbb7
Merge pull request #7 from LauraWTech/loginPage
HannahSargeant May 23, 2020
d219ded
postcommentslice
Amanition May 24, 2020
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
Prev Previous commit
Next Next commit
addinggitignore
Amanition committed May 19, 2020
commit 0f98b3de266803fecef4f152ea096a54fbbf5f39
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/nbproject/
.DS_Store