David Jay
74eb09a807
Cleaning up after merge.
2016-12-06 18:20:19 -05:00
David Jay
507e89a301
Merge branch 'master' of github.com:coralproject/talk into flag-username
2016-12-06 18:19:45 -05:00
David Jay
9e69a453d9
Adding text to postAction in commentStream.
2016-12-06 18:14:53 -05:00
David Jay
13d0dec84a
Updating postAction to send reasons to backend.
2016-12-06 18:11:44 -05:00
David Jay
3438024624
Posting flag action.
2016-12-06 18:01:11 -05:00
David Jay
9da19e87ea
Adding options to popup menu.
2016-12-06 17:48:08 -05:00
David Jay
5e8315c0d7
Styling popup menu.
2016-12-06 15:46:03 -05:00
David Jay
ab43d1f0ac
Showing first set of options in menu.
2016-12-05 17:38:13 -05: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
David Jay
a9bc90619d
Adding popup on report button click.
2016-12-05 15:59:16 -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
David Erwin and GitHub
f2273f1698
Merge branch 'master' into like-login-prompt
2016-12-02 15:58:54 -05:00
David Jay
0eca9eeadc
Prompting login when a loggout out user likes or comments.
2016-12-02 15:45:26 -05:00
David Jay
b1d0f8443f
Updating infobox styling.
2016-12-02 12:47:18 -05: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
647fb06c99
HandleSave on Submit
2016-12-01 12:58:37 -03: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
David Jay
34671fb327
Fixing filter in moderation queue.
2016-11-30 15:38:43 -05:00
David Jay
03db1de41a
Removing log statement.
2016-11-30 15:15:58 -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
David Jay
17b79e1869
Adding user and action data to rejected and flagged comments.
2016-11-30 13:51:43 -05:00
David Jay
94d9f42aa5
Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix
2016-11-30 12:50:44 -05:00
Belen Curcio
6e7926ab30
Working bios
2016-11-30 12:41:50 -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
3e86bfdceb
false positive on user signed in
2016-11-29 15:58:05 -07:00
Riley Davis and GitHub
257ecd3328
Merge branch 'master' into fetch-helper
2016-11-29 15:34:30 -07: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
Riley Davis
a7f94fce83
implement coralApi fetch
2016-11-29 14:44:37 -07:00
David Jay
9499e53021
Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix
2016-11-29 16:36:44 -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
Riley Davis and GitHub
8218d0c18e
Merge branch 'master' into bio
2016-11-29 10:36:20 -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
David Jay and Dan Zajdband
ea2ee68ed6
Test db clear ( #116 )
...
* Adding headers to stream request.
* Switching mongodb when node_env === test.
2016-11-29 11:44:54 -05:00
Belen Curcio
55afe36e3b
Renaming
2016-11-29 06:24:13 -03:00
Wyatt Johnson and GitHub
29f378b863
Merge branch 'master' into bio
2016-11-28 17:20:58 -07:00
David Jay
5f2f70fd51
Fixing bug when adding users to redux.
2016-11-28 18:59:27 -05:00
David Jay