218 Commits

Author SHA1 Message Date
WilliamMiceli
328560597e Fixed syntax and wording of a message 2019-12-04 21:58:13 -05:00
WilliamMiceli
d5f3df965f Minor fixes and closing DB connections as needed 2019-12-04 21:48:04 -05:00
WilliamMiceli
5bb11b100b More formatting 2019-12-04 21:35:09 -05:00
WilliamMiceli
95304ebad4 Implemented Regular Expressions for searching for people 2019-12-04 21:27:01 -05:00
WilliamMiceli
a055e329be All functional now!!! 2019-12-04 21:17:49 -05:00
WilliamMiceli
7967ffaf13 Fixed boolean values 2019-12-04 21:06:48 -05:00
WilliamMiceli
9088543471 Formatting 2019-12-04 21:01:25 -05:00
Logan McInnis
05bc90753f final 2019-12-04 20:56:23 -05:00
Logan McInnis
4e1ecb506f final 2019-12-04 20:52:47 -05:00
WilliamMiceli
f2a9614aef Updated buttons to use button CSS class; removed duplicate background-color declarations 2019-12-04 20:27:05 -05:00
Logan McInnis
c6cd3c5ba8 Update findFriend.php 2019-12-04 20:25:31 -05:00
Logan McInnis
49d9099e2f Merge branch 'LMcInnis-master-patch-94962' into 'master'
fixed it

See merge request williammiceli-educational/CS4430-Project!2
2019-12-04 20:17:37 -05:00
Logan McInnis
e5d5a7b8f4 fixed it 2019-12-04 20:16:53 -05:00
Bryan
6980fa65d2 I messed it up with the last commit, this fixes it 2019-12-04 19:35:54 -05:00
Logan McInnis
bc8f9ac22e Update findFriend.php 2019-12-04 19:33:26 -05:00
Bryan
5cebb420eb check to see if the search was successful or not 2019-12-04 19:26:24 -05:00
WilliamMiceli
3f9787538a Marking messages as read when user visits their inbox 2019-12-04 19:23:26 -05:00
Bryan
b0c8b9debf testing to see if the object is empty 2019-12-04 19:20:24 -05:00
WilliamMiceli
0de96b0d88 Fixed formatting and ordering of columns 2019-12-04 19:13:14 -05:00
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