Commit Graph
48 Commits
Author SHA1 Message Date
Bryan b0c8b9debf testing to see if the object is empty 2019-12-04 19:20:24 -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
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
Bryan 11a4d63b81 debugging 2019-12-04 18:10:24 -05:00
Bryan 59bc0a3863 fixes hopefully 2019-12-04 18:03:06 -05:00
Bryan 9eb8ad9f12 put the query in a try catch 2019-12-04 17:54:10 -05:00
Bryan fafaf9ab02 fixes, simplifying queries 2019-12-04 17:40:17 -05:00
Bryan 7dacd12031 update CSS on nameSearch and usernameSearch. Hopefully this also gets messageSender working 2019-12-04 17:27: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
Bryan 9f134993a7 Merge branch 'master' of https://git.williammiceli.systems/williammiceli-educational/CS4430-Project 2019-12-04 17:09:41 -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
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
Bryan 3cda81a3a6 another test 2019-12-04 16:41:40 -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
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
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
Bryan b3e367c240 update index with breaks in between the buttons 2019-11-25 22:15:26 -05:00
Bryan 6dbe81040c final correction to this, I promise 2019-11-25 21:57:49 -05:00
Bryan 7785a39f2b add in a " to correct the php file 2019-11-25 21:51:19 -05:00
Bryan aeaf4c16a0 update the string concatenation 2019-11-25 21:35:07 -05:00
Bryan 3dc67d5661 testing the usernameSearch 2019-11-25 14:32:25 -05:00
Bryan 20fc6d6d35 testing the database with usernamesearch 2019-11-25 14:19:03 -05:00
Bryan c4d2fcf1b5 Merge branch 'master' of https://git.williammiceli.systems/williammiceli-educational/CS4430-Project 2019-11-25 13:55:49 -05:00
Bryan 73143f14f2 updating index to add backslashes to make the buttons work 2019-11-25 13:54:51 -05:00
Bryan fcf59fe3e3 update the index page 2019-11-25 13:36:33 -05:00
Bryan f58264e674 Merge branch 'master' of https://git.williammiceli.systems/williammiceli-educational/CS4430-Project 2019-11-25 13:29:12 -05:00
Bryan e3b7fcc646 fix the nginx conf file 2019-11-25 13:28:38 -05:00
Bryan 36beca341f updating the searching 2019-11-25 13:24:32 -05:00
Bryan 3a7e7ced94 Cosmetic fix for the search site 2019-11-25 03:30:23 -05:00
Bryan b90e6961de Deleting the unused html files 2019-11-25 03:25:08 -05:00
Bryan 9e56fe8d46 Merge branch 'master' of https://git.williammiceli.systems/williammiceli-educational/CS4430-Project 2019-11-25 03:22:57 -05:00
Bryan 235c55285d fixing the search, now does it for full name or username, not complete just yet 2019-11-25 03:17:21 -05:00
Bryan 7728958a94 Merge branch 'master' of https://git.williammiceli.systems/williammiceli-educational/CS4430-Project 2019-11-24 23:09:10 -05:00
Bryan d5f977e7d1 Updating search and sendMessage. Also correcting the landing page to redirect to redirect to the new pages 2019-11-24 23:07:11 -05:00
Bryan 94cbb0d559 adding the initial html pages 2019-11-21 17:49:45 -05:00