gaba
ec2b40fafe
Missed a few actions when banned.
2016-12-07 16:49:55 -10:00
gaba
23c67b4a49
It fix the status change after merging master in.
2016-12-07 16:37:11 -10:00
gaba
eb916099bd
Merge
2016-12-02 16:52:16 -08:00
David Jay
0eca9eeadc
Prompting login when a loggout out user likes or comments.
2016-12-02 15:45:26 -05:00
gaba
1cda5b9099
Restrict content in the comment stream when banned.
2016-12-02 08:00:26 -08:00
Belen Curcio
990782a542
Sign in a restricted rout
2016-12-01 11:17:07 -03:00
Belen Curcio
c38c556002
merge
2016-11-30 20:11:22 -03:00
Belen Curcio
2607c608f5
D
...
ividing userData from userAuth
2016-11-30 10:20:03 -03:00
Belen Curcio
bd704bf2ce
User Settings, Restricted User, Banned User, Bio and User actions and Reducers
2016-11-30 08:42:25 -03:00
Riley Davis and Dan Zajdband
ef172cabfc
Scroll to comment ( #92 )
...
* host pym locally
* host pym. fix some permalink styles
* get url from parent document
* reset copy dialog timeout
* use pym.parentUrl instead of depending on the parent document
* use a simpler method to find the url
* add some horrible setInterval code
* add some awesome polling
* merge master
* bail out of comment look up after 10 seconds
* re-update permalink attrs
* re-add my listeners to article.ejs
* allow for overriding the talk db name in an environment var
2016-11-29 17:19:56 -05:00
Belen Curcio
86faf504bb
changes
2016-11-29 13:56:26 -03:00
Belen Curcio
55afe36e3b
Renaming
2016-11-29 06:24:13 -03:00
Belen Curcio
613a165325
merge
2016-11-28 17:40:22 -03:00
Belen Curcio
d384a69111
Main Tabs
2016-11-28 15:56:14 -03:00
Wyatt Johnson and Dan Zajdband
b0f01cf00f
Initial commit of asset queuing ( #97 )
...
* Initial commit of asset queuing
* Addresssing comments
2016-11-28 13:29:39 -05:00
Belen Curcio
5bb386e16a
Structure
2016-11-28 14:25:30 -03:00
Belen Curcio
4d916be170
Working tabs
2016-11-27 20:54:41 -03:00
David Jay
6e6ba89706
Hiding reply box on post.
2016-11-22 16:51:22 -05:00
David Jay
dea62d8895
Fixing bug with reply author name.
2016-11-22 16:16:10 -05:00
David Jay
1a648ca20e
Simplifying item references in CommentStream.
2016-11-21 17:12:55 -05:00
David Jay
9afc9640ee
Merge branch 'user-integration' of https://github.com/coralproject/talk into notification-room
2016-11-21 16:26:22 -05:00
David Jay
56205aee74
Expanding dialog box for signin.
2016-11-21 16:19:27 -05:00
David Jay
a4a8b97873
Including author name when comments are first posted.
2016-11-18 23:15:41 -05:00
David Jay
29bf5b9990
Adding author info to comments and author name display.
2016-11-18 14:22:21 -05:00
David Jay
a0db48ea22
Adding author id to posted comments.
2016-11-18 13:10:59 -05:00
David Jay
da07b737b2
Allowing commentstream to be rendered outside of embed.
2016-11-18 12:19:58 -05:00
David Jay
95cd83c09e
Merge branch 'master' of https://github.com/coralproject/talk into notification-room
2016-11-18 11:55:47 -05:00
David Jay
53fa63b269
Fixing bug where reply buttons in replies to not operate as expected.
2016-11-18 11:30:38 -05:00
David Jay
243c36a306
Switching Permalink props on replies to avoid null errors.
2016-11-17 17:45:44 -05:00
Belen Curcio
f1320c7f04
Merge branch 'master' of github.com:coralproject/talk into passport
2016-11-17 10:54:16 -03:00
David Erwin and GitHub
e6ff70784d
Merge branch 'master' into site-wide-comments
2016-11-16 10:48:28 -05:00
gaba
4137758bfd
Merge branch 'master' into comment-box
2016-11-15 15:21:08 -08:00
gaba
d24c7c0bc2
Struggling with hiding elements.
2016-11-15 15:18:17 -08:00
gaba
08d672ed46
Changes model and add admin.
2016-11-15 10:11:37 -08:00
David Jay
14405b22aa
Stripping out protocol and query from asset url.
2016-11-14 20:02:01 -05:00
David Jay
16fa3e46f5
Loading comment stream based on parent URL.
2016-11-14 16:51:54 -05:00
Belen Curcio
69ea37a520
removing mock
2016-11-14 18:48:08 -03:00
David Jay
688fbd0bf6
Sending asset_url to backend and retreiving stream with asset.
2016-11-14 16:40:04 -05:00
Belen Curcio
765b674cf9
Cleanup, and UserBox with Logout
2016-11-14 18:35:21 -03:00
David Jay
494b7d808b
Addressing lint error.
2016-11-14 13:02:08 -05:00
David Jay
8abec63620
Merge branch 'master' of https://github.com/coralproject/talk into like-button
2016-11-11 19:20:37 -05:00
David Jay
b629cf359f
Removing likes and flags on second click.
2016-11-11 19:07:15 -05:00
Belen Curcio
103acd4bce
Continue with Facebook Funtionalit
2016-11-11 20:18:22 -03:00
David Jay
1adac5cde1
Adding like button.
2016-11-11 16:25:47 -05:00
Riley Davis and GitHub
8369f09bda
Merge branch 'master' into permalinks-v2
2016-11-11 11:45:42 -07:00
Riley Davis
e2735759a6
first pass at permalink box
2016-11-11 11:27:39 -07:00
David Jay
0ce892fe7a
Loading settings and modifying commentbox to reflect pre and post-mod behavior.
2016-11-10 17:04:04 -05:00
David Erwin
f4bc5d4e82
Merge and resolve an initial state bug
2016-11-10 13:20:21 -05:00
David Jay
b50c22a414
Merge branch 'master' of https://github.com/coralproject/talk into reader-flags
2016-11-09 22:44:12 -05:00
David Jay
6ef0d3ef41
Posting flags correctly and displaying flags when clicked.
2016-11-09 18:30:01 -05:00
gaba