Gabriela Rodríguez Berón and GitHub
ba169147e7
Merge branch 'master' into ban-user
2016-12-09 10:28:32 -10:00
gaba
15557c16e2
Merge branch 'master' into ban-user
2016-12-09 08:28:46 -10:00
Belen Curcio
b33713e723
Changes to master
2016-12-09 12:32:59 -03:00
Dan Zajdband
09ba535d68
Merge with master
2016-12-09 10:17:55 -05:00
gaba
a46ffe8ea6
It removes duplicated code.
2016-12-08 18:16:37 -10:00
Dan Zajdband
fed41e1fba
Linted code
2016-12-08 16:59:29 -05:00
Belen Curcio
acbd465636
merge
2016-12-08 16:37:11 -03:00
gaba
50afa3d190
Merge branch 'master' into ban-user
2016-12-08 09:22:22 -10:00
Belén Curcio and GitHub
0c050bdec9
Merge branch 'master' into like-login-prompt
2016-12-08 15:53:16 -03:00
David Jay
e91564f706
Merge branch 'master' of github.com:coralproject/talk into like-login-prompt
2016-12-08 13:49:15 -05:00
Dan Zajdband
fb392422ea
Added textarea for closed message on admin
2016-12-08 12:44:02 -05:00
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
Riley Davis
260d1bd9f4
restoring the scroll to comment functionality
2016-12-06 16:29:40 -10:00
Belen Curcio
623c32a002
Configure Stream Ready, Checkbox Coral UI
2016-12-06 12:18:29 -03:00
Belén Curcio and GitHub
67aa261a56
Merge branch 'master' into stream-e2e
2016-12-05 19:34:57 -03:00
Belen Curcio
08e232c4fe
User Should still be able to see sign info even if its closed // moving comp
2016-12-05 19:28:47 -03:00
Belen Curcio
03b6ec4fe4
Lint
2016-12-05 19:18:29 -03:00
Dan Zajdband
568e46f1e3
Added restricted wrapper
2016-12-05 17:02:21 -05:00
Dan Zajdband
62cc489c21
Merge with master
2016-12-05 16:39:00 -05:00
Dan Zajdband
95ec57c64d
Added default message on thread
2016-12-05 11:11:21 -05:00
Dan Zajdband
4be258c63d
Added simple open/close flow
2016-12-05 11:02:39 -05:00
Kim Gardner and GitHub
e528e0678f
Merge branch 'master' into stream-e2e
2016-12-04 00:49:27 -05:00
gaba
eb916099bd
Merge
2016-12-02 16:52:16 -08:00
David Jay
ead66520e2
Adjusting height of login button to match current comment.
2016-12-02 17:01:06 -05: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
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
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
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
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 and GitHub
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
