|
|
948eff32c2
|
Fix
|
2019-12-06 14:26:42 -05:00 |
|
|
|
6de219505a
|
Fix admin alert posts displaying
|
2019-12-06 14:25:05 -05:00 |
|
|
|
6f77d03e2d
|
Add back verify button for Admin
|
2019-12-06 13:51:21 -05:00 |
|
|
|
da6e7436ea
|
Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24
|
2019-12-06 13:35:32 -05:00 |
|
|
|
e7afac9a19
|
Fix post topics being added to followed topics list
|
2019-12-06 13:35:28 -05:00 |
|
Aditya Sankaran
|
9449d3544b
|
Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24
|
2019-12-06 13:06:52 -05:00 |
|
|
|
4f2e07756d
|
tell the user if they aren't following anybody
|
2019-12-06 13:04:59 -05:00 |
|
Aditya Sankaran
|
f2cf7542a8
|
fix
|
2019-12-06 13:04:43 -05:00 |
|
|
|
ff7677bfb3
|
Merge pull request #113 from ClaytonWWilson/admin-delete
Admin delete
|
2019-12-06 12:56:40 -05:00 |
|
|
|
a0a522f1d2
|
Display disabled DMs as red and fix errors in login and signup
|
2019-12-06 12:53:27 -05:00 |
|
Aditya Sankaran
|
988c807af2
|
Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24
|
2019-12-06 12:27:00 -05:00 |
|
Aditya Sankaran
|
01b449d01d
|
separated list of topics by comma and space
|
2019-12-06 12:26:29 -05:00 |
|
|
|
f30a9ae27c
|
Fix merge errors, but posts are not displaying on home.js
|
2019-12-06 12:07:36 -05:00 |
|
|
|
a459e6581e
|
Merge branch 'master' into admin-delete
|
2019-12-06 11:45:50 -05:00 |
|
Leon Liang
|
116f97bf64
|
fixed topic.id bug
|
2019-12-06 02:26:01 -05:00 |
|
Leon Liang
|
a4efc15d58
|
allow follow topic only when following user
|
2019-12-06 02:23:28 -05:00 |
|
Leon Liang
|
39613584e7
|
fixed unfollow user and topics
|
2019-12-06 02:17:52 -05:00 |
|
|
|
a1f9a4bef3
|
Fixing errors on the otherUsers page
|
2019-12-05 21:39:38 -05:00 |
|
|
|
c85eeccd4c
|
Display formatted time on otherUser page
|
2019-12-05 21:16:46 -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
|
a92681451f
|
syntax error
|
2019-12-05 18:54:43 -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 |
|
|
|
719294f0ed
|
Fix DM code layout
|
2019-12-05 16:13:56 -05:00 |
|
|
|
fc9994d42e
|
fixed circular progress on home
|
2019-12-05 13:47:10 -05:00 |
|
Leon Liang
|
de72bd9223
|
added alert to user's page
|
2019-12-05 13:45:58 -05:00 |
|
|
|
b85bee7cba
|
Fix merge issue
|
2019-12-05 13:41:24 -05:00 |
|
|
|
b007666317
|
Merge branch 'master' into send-microblog-loading
|
2019-12-05 13:38:04 -05:00 |
|
|
|
a0d2532c22
|
Add circular progress to home page
|
2019-12-05 13:35:19 -05:00 |
|
|
|
739b1cc92a
|
Add circular progress to other user page
|
2019-12-05 13:22:29 -05:00 |
|
|
|
57087a5ea3
|
Add circular progress to user page
|
2019-12-05 13:08:59 -05:00 |
|
|
|
1aff5ba99b
|
Add circular progress to writing_microblogs
|
2019-12-05 12:56:05 -05:00 |
|
Leon Liang
|
2bcf6bfcb3
|
filter by followed user
|
2019-12-05 12:48:26 -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
|
17c7e989ef
|
cleared modal for quoting when hitting cancel button
|
2019-12-04 19:37:53 -05:00 |
|
Aditya Sankaran
|
efecf3b02a
|
fixed stuff
|
2019-12-04 18:48:08 -05:00 |
|
Aditya Sankaran
|
8b4c32b81f
|
syntax error
|
2019-12-04 18:20:28 -05:00 |
|
Aditya Sankaran
|
323cb5bcee
|
Revert "module fuse and syntax errors fixed"
This reverts commit 4a4733f593.
|
2019-12-04 18:15:37 -05:00 |
|
Aditya Sankaran
|
4a4733f593
|
module fuse and syntax errors fixed
|
2019-12-04 18:09:36 -05:00 |
|
asankaran35
|
6989091fb1
|
Merge branch 'master' into likes
|
2019-12-04 17:41:28 -05:00 |
|
|
|
4e5b100968
|
Fix merge issues and change layout of NavBar
|
2019-12-04 16:57:56 -05:00 |
|
