218 Commits

Author SHA1 Message Date
William Miceli
707a41d486 Merge branch 'WilliamMiceli-master-patch-29789' into 'master'
Duplicate

See merge request williammiceli-educational/CS4430-Project!1
2019-12-04 17:09:20 -05:00
William Miceli
47de22bbc0 Duplicate 2019-12-04 17:08:51 -05:00
Logan McInnis
b7d54f1fbc added value into friendList 2019-12-04 17:08:39 -05:00
Bryan
2d1196ad20 actually fixed it for once, also hopefully fixed nameSearch 2019-12-04 17:08:34 -05:00
Bryan
de6ac7132f fix usernameSearch 2019-12-04 17:02:51 -05:00
Bryan
84f1b389f8 Merge branch 'master' of https://git.williammiceli.systems/williammiceli-educational/CS4430-Project 2019-12-04 16:58:14 -05:00
Bryan
7ad382259d update usernameSearch 2019-12-04 16:57:39 -05:00
Logan McInnis
00c0e459f2 Update findFriend.php 2019-12-04 16:54:39 -05:00
Bryan
e2a092ba9c test 2019-12-04 16:44:02 -05:00
Bryan
e1463ae18b Merge branch 'master' of https://git.williammiceli.systems/williammiceli-educational/CS4430-Project 2019-12-04 16:42:17 -05:00
Logan McInnis
9dace110ac rough code 2019-12-04 16:42:08 -05:00
Bryan
3cda81a3a6 another test 2019-12-04 16:41:40 -05:00
Logan McInnis
80f14b13f4 rough code 2019-12-04 16:40:04 -05:00
Bryan
40824affc6 testing 2019-12-04 16:33:54 -05:00
Bryan
f9e7127d38 adding in and fixing usernameSearch, search, and nameSearch. Hopefully they work 2019-12-04 16:28:08 -05:00
Logan McInnis
a68a1fd1a0 rough code 2019-12-04 16:27:12 -05:00
Bryan
bbc725221c fixing the usernameSearch hopefully 2019-12-04 16:16:40 -05:00
Bryan
b7bccb0797 Merge branch 'master' of https://git.williammiceli.systems/williammiceli-educational/CS4430-Project 2019-12-04 16:07:38 -05:00
Bryan
c44a0126eb updating the username search 2019-12-04 16:06:47 -05:00
WilliamMiceli
62486df5fb Login page is now the default landing page 2019-12-04 16:06:13 -05:00
WilliamMiceli
85ab536dd1 Moved into the navigation bar 2019-12-04 16:05:58 -05:00
WilliamMiceli
604d42f707 Removed duplicate 2019-12-04 16:05:42 -05:00
William Miceli
2a8564dbdf Minor fixes 2019-12-04 01:52:02 -05:00
William Miceli
59711ac7f6 New signup page! Hopefully it works... 2019-12-04 01:51:50 -05:00
William Miceli
0516a4597a Minor updates 2019-12-04 01:51:34 -05:00
William Miceli
2b11c3339a Visual improvements 2019-12-03 23:53:43 -05:00
William Miceli
e93827e46f Fixes and cleanup 2019-12-03 22:53:52 -05:00
William Miceli
393b9e8725 Fixed case of filename 2019-12-03 22:53:40 -05:00
William Miceli
4139767a22 Made things look a little nicer 2019-12-03 22:24:42 -05:00
William Miceli
dff8bd9306 Previous version was horrible... trying to keep things stupid simple 2019-12-03 06:01:54 -05:00
William Miceli
e8a40fc89b Making things look a little nicer hopefully 2019-12-03 05:44:33 -05:00
William Miceli
a71ea11075 Needed in this location actually 2019-12-03 05:44:18 -05:00
William Miceli
029971608a Attempting to add a modular navigation bar 2019-12-03 05:23:34 -05:00
William Miceli
0c59c98d75 Major re-work of things... 2019-12-03 04:41:39 -05:00
William Miceli
efed1f081f Functional 2019-12-03 04:41:11 -05:00
William Miceli
fcaee64038 Core functionality is done 2019-12-03 04:40:58 -05:00
William Miceli
9cf9218dcb Combined into the login page 2019-12-03 04:40:39 -05:00
William Miceli
6901fe3de2 All PHP pages now 2019-12-03 04:40:00 -05:00
William Miceli
aa2a2900dd Seemed like a typo? 2019-12-03 04:39:40 -05:00
William Miceli
7c51cd7891 Uniformity in camelCase 2019-12-03 04:39:22 -05:00
William Miceli
52c4f35350 No longer need to put the database server connection info in each page 2019-12-03 04:38:53 -05:00
William Miceli
40debb217c Found way to insert multiple values using single VALUES clause 2019-12-03 04:37:29 -05:00
William Miceli
b9afe780e5 Using caps to be consistent 2019-12-03 04:37:03 -05:00
Logan McInnis
e20f0dbbfb Merge branch 'master' of https://git.williammiceli.systems/williammiceli-educational/CS4430-Project 2019-12-02 18:52:03 -08:00
Logan McInnis
8466d68a15 stuff 2019-12-02 18:47:20 -08:00
Logan McInnis
0f7bf31a62 did stuff 2019-12-02 18:36:54 -08:00
Bryan
751632226e correcting the connection when querying the database 2019-11-26 00:38:49 -05:00
Bryan
0bf67e78d1 adding more descriptive error message and taking out one of the useless buttons on index page 2019-11-26 00:29:29 -05:00
Bryan
74eedc9961 initial database output, probably doesn't work 2019-11-26 00:19:34 -05:00
Bryan
6343d24c60 get the query ready for nameSearch.php 2019-11-25 22:22:47 -05:00