Commit Graph

199 Commits

Author SHA1 Message Date
WilliamMiceli aa5cf8b099 Fixed redirect 2019-12-04 19:11:05 -05:00
WilliamMiceli eb4d732e81 Split messages into Inbox and Sent pages 2019-12-04 19:07:05 -05:00
WilliamMiceli da583c714a Added some more default data 2019-12-04 19:06:03 -05:00
Bryan 26dd7c2a54 finally fixed the messaging system 2019-12-04 18:49:15 -05:00
Bryan 46cb58ae7d fixes 2019-12-04 18:37:28 -05:00
Logan McInnis 44a50b12e8 Update findFriend.php 2019-12-04 18:20:49 -05:00
Bryan dbcc3761ef test 2019-12-04 18:19:38 -05:00
Bryan 558f0c64da trying to find the bug 2019-12-04 18:15:27 -05:00
Logan McInnis d2a12a3bd3 made error correction 2019-12-04 18:13:48 -05:00
Bryan 11a4d63b81 debugging 2019-12-04 18:10:24 -05:00
Bryan 59bc0a3863 fixes hopefully 2019-12-04 18:03:06 -05:00
Logan McInnis efaba4937d should work now 2019-12-04 17:57:33 -05:00
Logan McInnis c6285e4110 should work 2019-12-04 17:56:55 -05:00
WilliamMiceli 5025f6aa49 Not declaring message ID anymore 2019-12-04 17:56:10 -05:00
WilliamMiceli 8842492263 Merge branch 'master' of https://git.williammiceli.systems/williammiceli-educational/CS4430-Project 2019-12-04 17:55:19 -05:00
WilliamMiceli 60edb6aa5c messageID now auto-increments 2019-12-04 17:55:02 -05:00
Bryan 9eb8ad9f12 put the query in a try catch 2019-12-04 17:54:10 -05:00
Logan McInnis e866ae84bf should work 2019-12-04 17:44:55 -05:00
WilliamMiceli 65d723189c Fixed placeholders 2019-12-04 17:43:29 -05:00
Bryan fafaf9ab02 fixes, simplifying queries 2019-12-04 17:40:17 -05:00
WilliamMiceli 5705abe102 Added First and Last name fields and added INSERT for contacts table 2019-12-04 17:39:31 -05:00
Logan McInnis 9155a501f6 Update pendingFriend.php 2019-12-04 17:31:45 -05:00
Logan McInnis e70d20f43b Update pendingFriend.php 2019-12-04 17:28:54 -05:00
Bryan 7dacd12031 update CSS on nameSearch and usernameSearch. Hopefully this also gets messageSender working 2019-12-04 17:27:32 -05:00
Logan McInnis f87be9a3fd Update pendingFriend.php 2019-12-04 17:25:07 -05:00
WilliamMiceli 5967ee13e0 Login fields now only allow alphanumeric characters 2019-12-04 17:19:32 -05:00
Bryan 68e4bf54ad Merge branch 'master' of https://git.williammiceli.systems/williammiceli-educational/CS4430-Project 2019-12-04 17:17:49 -05:00
Bryan dd8c953ae9 get rid of debug and add style to nameSearch 2019-12-04 17:16:57 -05:00
Logan McInnis 2994d3873c switched to links to php 2019-12-04 17:16:45 -05:00
WilliamMiceli 05275da9b6 Signup is now functional! 2019-12-04 17:10:55 -05:00
Bryan 9f134993a7 Merge branch 'master' of https://git.williammiceli.systems/williammiceli-educational/CS4430-Project 2019-12-04 17:09:41 -05:00
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