|
|
daabbf80f6
|
Actually fix deploy error
|
2019-12-06 14:58:51 -05:00 |
|
|
|
f9acefaafb
|
Fixed deploy error
|
2019-12-06 14:55:01 -05:00 |
|
|
|
7132a2ab45
|
Fix error in getOtherUsersPosts
|
2019-12-06 14:10:17 -05:00 |
|
|
|
5474543af4
|
add catch in addSubscription
|
2019-12-06 13:56:48 -05:00 |
|
|
|
a459e6581e
|
Merge branch 'master' into admin-delete
|
2019-12-06 11:45:50 -05:00 |
|
Leon Liang
|
39613584e7
|
fixed unfollow user and topics
|
2019-12-06 02:17:52 -05:00 |
|
Leon Liang
|
bb50e0fa5d
|
Merge pull request #111 from ClaytonWWilson/filter_timeli
fixed up add subscription method
|
2019-12-05 19:25:44 -05:00 |
|
Leon Liang
|
f111553827
|
fixed up add subscription method
|
2019-12-05 19:24:50 -05:00 |
|
Aditya Sankaran
|
5e935f3508
|
Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24
|
2019-12-05 19:20:50 -05:00 |
|
Aditya Sankaran
|
80a2e1894c
|
sorted posts chronologically everywhere
|
2019-12-05 19:20:05 -05:00 |
|
|
|
8acd29e842
|
Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24
|
2019-12-05 19:14:47 -05:00 |
|
|
|
b402c96864
|
Fixing DMs with users who have them disabled
|
2019-12-05 19:13:00 -05:00 |
|
asankaran35
|
76792148cd
|
Merge pull request #110 from ClaytonWWilson/chronological
can sort posts chronologically in userline and formatted topics listi…
|
2019-12-05 18:56:18 -05:00 |
|
Aditya Sankaran
|
e3522876d7
|
can sort posts chronologically in userline and formatted topics listing for each post
|
2019-12-05 18:50:29 -05:00 |
|
Leon Liang
|
aad9dc0273
|
Merge branch 'master' into finalfix
|
2019-12-05 17:25:19 -05:00 |
|
Leon Liang
|
30df98343e
|
added user post tuple
|
2019-12-05 17:22:55 -05:00 |
|
Leon Liang
|
de72bd9223
|
added alert to user's page
|
2019-12-05 13:45:58 -05:00 |
|
|
|
57087a5ea3
|
Add circular progress to user page
|
2019-12-05 13:08:59 -05:00 |
|
Danny Voltz
|
bae2947003
|
Merge branch 'admin-delete' of https://github.com/ClaytonWWilson/CS307-Team24 into admin-delete:x
|
2019-12-05 12:25:19 -05:00 |
|
Danny Voltz
|
96423cee8a
|
Admin User Stories
|
2019-12-05 12:12:25 -05:00 |
|
|
|
f9a45ffe07
|
Merge pull request #84 from ClaytonWWilson/dms
Direct Messages
|
2019-12-04 22:47:50 -05:00 |
|
Aditya Sankaran
|
efecf3b02a
|
fixed stuff
|
2019-12-04 18:48:08 -05:00 |
|
asankaran35
|
6989091fb1
|
Merge branch 'master' into likes
|
2019-12-04 17:41:28 -05:00 |
|
Aditya Sankaran
|
699ea23750
|
quoting fix
|
2019-12-04 17:16:41 -05:00 |
|
|
|
0bcfdcdd6c
|
Fix deploy error
|
2019-12-04 17:10:26 -05:00 |
|
|
|
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 |
|
Aditya Sankaran
|
856cb8630e
|
readded post.js. got deleted for some reason
|
2019-12-04 14:42:43 -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 |
|
|
|
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 |
|
|
|
ebca5192e0
|
Change storageBucket to variable
|
2019-12-03 18:20:20 -05:00 |
|
Leon Liang
|
56e836451d
|
display posts on other user's page
|
2019-12-03 18:11:10 -05:00 |
|
|
|
1747a29c2e
|
Fix not image not uploading when deployed
|
2019-12-03 17:47:09 -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 |
|
|
|
88064c55a3
|
Merge branch 'master' into dms
|
2019-12-02 16:21:26 -05:00 |
|
|
|
7c7256acbd
|
Fixed having multiple return statements in post.js
|
2019-12-02 15:47: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 |
|
Aditya Sankaran
|
54cd1c44a7
|
edited userline database function
|
2019-11-30 18:11:33 -05:00 |
|
Aditya Sankaran
|
a36212c23d
|
quoting mblogs userline
|
2019-11-30 12:16:30 -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 |
|
|
|
0d8850c45d
|
Comment out logging in fbAuth.js
|
2019-11-27 21:53:02 -05:00 |
|
|
|
731e01c552
|
Comment out some lines in users.js that were throwing errors
|
2019-11-27 21:51:16 -05:00 |
|
asankaran35
|
1a2af4e9bb
|
Merge branch 'master' into engage_microblog
|
2019-11-27 21:08:55 -05:00 |
|