David Jay
b1d0f8443f
Updating infobox styling.
2016-12-02 12:47:18 -05:00
gaba
1cda5b9099
Restrict content in the comment stream when banned.
2016-12-02 08:00:26 -08:00
David Jay
e5fe91af8b
Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e
2016-12-01 18:25:08 -05:00
David Jay
a118d263ea
Cleaning url regex in commentstream.
2016-12-01 16:23:33 -05:00
David Jay
d853b1f912
Merging master into stream-e2e
2016-12-01 14:36:47 -05: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
David Jay
b2b9b0ec42
Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e
2016-11-30 17:55:39 -05:00
Dan Zajdband
bf3b028370
Close comments: WIP
2016-11-30 15:09:42 -05:00
Belen Curcio
d90a158298
Bio Tooltips
2016-11-30 17:09:34 -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
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
Wyatt Johnson
dafd849b0e
Merge branch 'master' into stream-e2e
2016-11-29 10:48:16 -07:00
Wyatt Johnson
3c903ddd6d
Merge branch 'master' into stream-e2e
2016-11-29 10:41:50 -07:00
Belen Curcio
a5de52aeb9
merge
2016-11-29 13:57:14 -03: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
Wyatt Johnson
29f378b863
Merge branch 'master' into bio
2016-11-28 17:20:58 -07:00
David Jay
7cf05bbdca
Merge branch 'master' of https://github.com/coralproject/talk into settings-in-stream
2016-11-28 17:25:07 -05:00
David Jay
823c223cf1
Adding settings to redux store from stream.
2016-11-28 17:11:37 -05: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
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
a06d1d4bbb
Merge branch 'master' into stream-e2e
2016-11-22 18:58:54 -05:00
David Jay
5ab3fba818
Setting env variables properly in tests.
2016-11-22 18:45:11 -05: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
David Jay
c7d2a9a94f
Adding padding for notifications at the bottom of the comment stream.
2016-11-17 14:52:08 -05:00
Belen Curcio
c967587b95
Pym and Iframe support embed
2016-11-17 11:40:11 -03:00
Belen Curcio
f1320c7f04
Merge branch 'master' of github.com:coralproject/talk into passport
2016-11-17 10:54:16 -03:00
David Erwin
e6ff70784d
Merge branch 'master' into site-wide-comments
2016-11-16 10:48:28 -05:00
gaba
3abc0692bb
At the top, not the bottom.
2016-11-15 15:31:12 -08: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
David Jay