|
|
374c4d45b0
|
Merge branch 'master' into dms
|
2019-12-04 15:56:42 -05:00 |
|
|
|
99ffbe52a4
|
Posts on Home now display profile images
|
2019-12-04 15:37:09 -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 |
|
|
|
fd1718a1f4
|
Fixing more errors
|
2019-12-03 20:54:54 -05:00 |
|
|
|
7fd976d4cb
|
Merge branch 'master' into fix-warnings
|
2019-12-03 20:34:08 -05:00 |
|
|
|
72d099e05e
|
Fixing errors and warnings
|
2019-12-03 20:26:31 -05:00 |
|
Leon Liang
|
7141bf9000
|
changed color if user is following the same topic
|
2019-12-03 19:15:23 -05:00 |
|
Leon Liang
|
acecf704dc
|
Merge pull request #102 from ClaytonWWilson/otheruser_posts
display posts on other user's page
|
2019-12-03 18:14:40 -05:00 |
|
Leon Liang
|
56e836451d
|
display posts on other user's page
|
2019-12-03 18:11:10 -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 |
|
|
|
f0c4a2974f
|
Fix mismatched parenthesis
|
2019-12-03 13:49:37 -05:00 |
|
|
|
c26ff21b20
|
Merge branch 'master' into fix-login-loading
|
2019-12-03 13:44:12 -05:00 |
|
|
|
1a6aae6545
|
Fixed mismatched parenthesis
|
2019-12-03 13:33:48 -05:00 |
|
|
|
4abaa13b09
|
Merge branch 'master' into microblogs-material-ui
|
2019-12-03 13:24:36 -05:00 |
|
|
|
09a3ccd12d
|
Merge branch 'master' into dms
|
2019-12-03 13:21:30 -05:00 |
|
|
|
1a02b53d0f
|
Improved speed of search and made it fuzzy search
|
2019-12-03 00:54:06 -05:00 |
|
|
|
e4ea325fb8
|
Liking posts with Redux and Material UI
|
2019-12-02 20:18:44 -05:00 |
|
Leon Liang
|
684ccd1a85
|
Merge branch 'master' into fix_follow
|
2019-12-02 18:38:54 -05:00 |
|
Leon Liang
|
f0ddaa30b1
|
add topics when publish new post
|
2019-12-02 18:31:33 -05:00 |
|
|
|
8244631d4d
|
Fix some code after merge
|
2019-12-02 16:40:22 -05:00 |
|
|
|
4d97afcb09
|
Merge branch 'master' into microblogs-material-ui
|
2019-12-02 16:29:52 -05:00 |
|
|
|
88064c55a3
|
Merge branch 'master' into dms
|
2019-12-02 16:21:26 -05:00 |
|
|
|
cff0fd4e05
|
DMs are deleted when the delete function runs
|
2019-12-02 15:46:13 -05:00 |
|
Leon Liang
|
e218708e0a
|
Merge pull request #95 from ClaytonWWilson/fix_follow
Fix follow
|
2019-12-02 00:08:07 -05:00 |
|
Leon Liang
|
445c8b39de
|
allow delete without refreshing page
|
2019-12-02 00:00:25 -05:00 |
|
Aditya Sankaran
|
6e8b7f410a
|
saved liked posts
|
2019-12-01 15:55:53 -05:00 |
|
Aditya Sankaran
|
07a8f0b7bb
|
userline frontend shows quoted posts
|
2019-11-30 18:23:46 -05:00 |
|
Aditya Sankaran
|
54cd1c44a7
|
edited userline database function
|
2019-11-30 18:11:33 -05:00 |
|
Aditya Sankaran
|
ca7f793d4c
|
likeCount updating auto
|
2019-11-30 16:50:20 -05:00 |
|
Aditya Sankaran
|
b83eb0c897
|
saved states of post for each user
|
2019-11-29 20:18:51 -05:00 |
|
|
|
fee2225745
|
Disable or enable Direct Messages
|
2019-11-27 23:06:25 -05:00 |
|
|
|
f7ef0cb333
|
Fix DM message content overflowing
|
2019-11-27 21:52:14 -05:00 |
|
asankaran35
|
1a2af4e9bb
|
Merge branch 'master' into engage_microblog
|
2019-11-27 21:08:55 -05:00 |
|
Aditya Sankaran
|
c34f06f130
|
formatted feed and userline
|
2019-11-27 20:57:42 -05:00 |
|
|
|
3814377817
|
Display loading icon when the user logs in or signs up
|
2019-11-25 13:55:03 -05:00 |
|
|
|
445687cc54
|
Automatically display new Direct Messages
|
2019-11-22 18:21:52 -05:00 |
|
|
|
331509da7f
|
Direct Messages sending DMs
|
2019-11-22 16:44:53 -05:00 |
|
Leon Liang
|
4e817c9647
|
integrated backend change, added pointer cursor
|
2019-11-21 20:09:47 -05:00 |
|
Leon Liang
|
3da2449050
|
change topic display to user-specific topics
|
2019-11-21 18:10:44 -05:00 |
|
Leon Liang
|
607ea3fd55
|
Merge pull request #83 from ClaytonWWilson/edit-profile-linking
Changing profile page layout
|
2019-11-21 17:58:56 -05:00 |
|
Aditya Sankaran
|
e8110d643f
|
finished quoting microblogs
|
2019-11-21 15:42:43 -05:00 |
|
|
|
e06cc614cb
|
Dynamic front-end adding new DM channels
|
2019-11-20 20:48:49 -05:00 |
|
Leon Liang
|
81749c19ce
|
completed search page and redirect to user profile page
|
2019-11-19 22:30:15 -05:00 |
|
Aditya Sankaran
|
1ccc195036
|
liking and unliking work
|
2019-11-19 21:09:07 -05:00 |
|
|
|
3d9266778d
|
Direct Messages can use redux for creating new DM channels
|
2019-11-19 19:04:25 -05:00 |
|
Leon Liang
|
2de3da928a
|
added UI for follow and unfollow other user
|
2019-11-19 19:03:28 -05:00 |
|
Leon Liang
|
42c53fdbc4
|
Add profile image, topics for other user page
|
2019-11-19 15:56:39 -05:00 |
|
Leon Liang
|
c8aa1fd050
|
Added page to display other users' profile
|
2019-11-19 13:57:24 -05:00 |
|
|
|
0f1cfe0393
|
Front-end layout mostly completed
|
2019-11-19 01:18:20 -05:00 |
|
|
|
2f5ec1c5ac
|
Basic style for direct messages
|
2019-11-12 23:50:53 -05:00 |
|
|
|
9372a092ad
|
Fix edit profile button link
|
2019-11-05 17:43:19 -05:00 |
|
|
|
7a6ac8499c
|
fix merge
|
2019-11-05 17:38:11 -05:00 |
|
|
|
6149e15b35
|
Profile page kinda works on mobile
|
2019-11-05 17:35:16 -05:00 |
|
|
|
80670d054e
|
Main layout of profile page
|
2019-11-05 17:19:28 -05:00 |
|
|
|
947e5b01a4
|
Converted tabs back to spaces
|
2019-11-05 17:16:34 -05:00 |
|
|
|
7cc8a3f11f
|
Fixing up profile UI
|
2019-11-05 17:04:33 -05:00 |
|
|
|
7476833f0a
|
Main layout of profile page
|
2019-11-05 16:32:16 -05:00 |
|
|
|
bbbfc4b750
|
Editprofile move button positions
|
2019-11-03 21:10:57 -05:00 |
|
|
|
38df4ef087
|
Added styles and spaced cards
|
2019-11-03 15:29:39 -05:00 |
|
|
|
2bd1c08c2c
|
Writing_Microblogs to Material-UI and UI improvements
|
2019-11-03 15:17:14 -05:00 |
|
Danny Voltz
|
6924af58a7
|
progress for admin delete
|
2019-11-01 15:40:26 -05:00 |
|
|
|
903ea35662
|
Fix indents
|
2019-11-01 16:19:54 -04:00 |
|
|
|
e644498108
|
Merge pull request #67 from ClaytonWWilson/verify-profile
Users can be verified and have a check mark displayed on their profiles
|
2019-11-01 16:11:53 -04:00 |
|
|
|
97bc9c4fb1
|
Verify users front-end
|
2019-11-01 16:11:02 -04:00 |
|
Shobhit Makhija
|
f2dac314e5
|
Merge pull request #74 from ClaytonWWilson/Beautify
Fixing UI
|
2019-11-01 15:39:57 -04:00 |
|
shobhitm23
|
d3bfd8b5f3
|
Fixing UI
|
2019-11-01 15:36:22 -04:00 |
|
|
|
f4bedea2c7
|
Merge branch 'master' into verify-profile
|
2019-11-01 13:40:30 -04:00 |
|
|
|
3fa4cd7033
|
Changing writing microblogs to Material-UI
|
2019-11-01 13:02:37 -04:00 |
|
|
|
ab07d45205
|
Fix loading on image upload, so it waits for new image
|
2019-11-01 10:12:54 -04:00 |
|
Leon Liang
|
f60c045483
|
Merge branch 'master' into search_page
|
2019-10-31 16:57:22 -04:00 |
|
Leon Liang
|
1842eef2f8
|
added search page
|
2019-10-31 16:54:34 -04:00 |
|
|
|
ce984df437
|
Merge branch 'master' into auth-backend-3
|
2019-10-31 16:09:17 -04:00 |
|
|
|
112988c8fb
|
Add '@' to profile handle
|
2019-10-31 15:46:33 -04:00 |
|
Leon Liang
|
35e5cf8e9d
|
revert changes that I f ed up
|
2019-10-31 15:11:16 -04:00 |
|
Leon Liang
|
e73b2d02f3
|
Merge branch 'master' into delete_topic
|
2019-10-31 14:44:03 -04:00 |
|
Leon Liang
|
50bc73870b
|
delete topic fully works
|
2019-10-31 14:32:54 -04:00 |
|
|
|
ca1d86acf1
|
Users can be verified and have a check mark displayed on their profiles
|
2019-10-31 13:56:40 -04:00 |
|
Aaron Sun
|
da14700987
|
Fixed a small bug with the Delete Account button
|
2019-10-30 18:15:01 -04:00 |
|
Aaron Sun
|
26afabe709
|
All posts from db can now show on home page timeline
|
2019-10-30 18:04:35 -04:00 |
|
Aaron Sun
|
a61c296ddf
|
Made the posts look prettier
|
2019-10-30 16:12:53 -04:00 |
|
Aaron Sun
|
1337071bec
|
UI can now display all features of a post
|
2019-10-30 15:07:19 -04:00 |
|
Aaron Sun
|
cd19364efc
|
Can now display post body on profile page
|
2019-10-30 11:40:44 -04:00 |
|
|
|
3c31db9bf5
|
Converted tabs back to spaces
|
2019-10-29 23:02:36 -04:00 |
|
Aaron Sun
|
6db14e3868
|
Improved the profile page format
|
2019-10-29 19:39:11 -04:00 |
|
Aaron Sun
|
d3a77afe43
|
Pulled and merged the latest code from master
|
2019-10-29 14:02:56 -04:00 |
|
|
|
3d875e2bde
|
Fixing up profile UI
|
2019-10-28 23:25:12 -04:00 |
|
Leon Liang
|
b20408c144
|
delete topic
|
2019-10-28 21:38:32 -04:00 |
|
|
|
3001ec0b38
|
Merge branch 'master' into edit-profile-image-upload
|
2019-10-27 23:46:15 -04:00 |
|
Aaron Sun
|
657277bcad
|
Username and user id now show in post data
|
2019-10-27 23:11:24 -04:00 |
|
Aaron Sun
|
d69828ef7f
|
Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 into auth-backend-3
|
2019-10-27 20:48:15 -04:00 |
|
|
|
44d3450b10
|
Profile image upload frontend and backend finished
|
2019-10-27 18:06:47 -04:00 |
|
Aaron Sun
|
fd226b454e
|
Delete users fully works now
|
2019-10-27 14:46:31 -04:00 |
|
Leon Liang
|
97998a8f09
|
merge changes
|
2019-10-27 13:24:53 -04:00 |
|
Leon Liang
|
13a1401759
|
Reformat code
|
2019-10-27 02:53:12 -04:00 |
|
