Commit Graph

18 Commits

Author SHA1 Message Date
4e5b100968 Fix merge issues and change layout of NavBar 2019-12-04 16:57:56 -05:00
374c4d45b0
Merge branch 'master' into dms 2019-12-04 15:56:42 -05:00
77a3ba9f69 Fix merge issues 2019-12-04 00:30:23 -05:00
7a0a5725b7
Merge branch 'master' into edit-profile-image-upload 2019-12-04 00:02:03 -05:00
79051f2243 Error checking and deleting old profile image 2019-12-03 23:46:04 -05:00
2d426840c0 Add @ next to handle on editProfile 2019-12-03 16:37:57 -05:00
5b5e785142 Changed the path of the editProfile page 2019-12-03 16:37:04 -05:00
a4cce0b75e Circular progress when the editProfile page is loading 2019-12-03 16:26:54 -05:00
825c126c6c Delete asks you to confirm 2019-12-03 16:26:16 -05:00
49a4d55f1e Rename edit class to editProfile to be more descriptive 2019-12-03 14:04:40 -05:00
fee2225745 Disable or enable Direct Messages 2019-11-27 23:06:25 -05:00
bbbfc4b750 Editprofile move button positions 2019-11-03 21:10:57 -05:00
Aaron Sun
da14700987 Fixed a small bug with the Delete Account button 2019-10-30 18:15:01 -04:00
Aaron Sun
6db14e3868 Improved the profile page format 2019-10-29 19:39:11 -04:00
44d3450b10 Profile image upload frontend and backend finished 2019-10-27 18:06:47 -04:00
Clayton Wilson
8f5020f881 Fixing editProfile bugs and making the database storage more efficient 2019-10-24 15:44:53 -04:00
b337277aa4 Fix login-frontend merge conflicts 2019-10-11 17:46:38 -04:00
4c1459d890 Renamed edit.js to editProfile.js because it makes more sense 2019-10-03 09:47:07 -04:00