Commit Graph

301 Commits

Author SHA1 Message Date
gaba 1cda5b9099 Restrict content in the comment stream when banned. 2016-12-02 08:00:26 -08:00
gaba da7f39c9e9 Merge branch 'master' into ban-user 2016-12-02 07:58:46 -08:00
gaba 29f547d268 Trying to fix ban user dialog. 2016-12-02 06:35:55 -08:00
gaba c83f8eb188 Onclick action. 2016-12-01 13:11:44 -08:00
gaba 15eb946f00 Trying to get the Dialog up. 2016-12-01 13:05:10 -08: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
gaba 443cd031d5 Ban button. 2016-11-30 19:20:07 -08:00
Belen Curcio c38c556002 merge 2016-11-30 20:11:22 -03:00
gaba 2dd3359cb6 Merge branch 'master' into ban-user 2016-11-30 13:31:59 -08: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
Belen Curcio d90a158298 Bio Tooltips 2016-11-30 17:09:34 -03:00
gaba a30388682e Merge branch 'master' into ban-user 2016-11-30 11:26:44 -08:00
gaba ba47250933 Understanding reducers 2016-11-30 11:12:09 -08: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 257ecd3328 Merge branch 'master' into fetch-helper 2016-11-29 15:34:30 -07: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
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
gaba 8af9e14971 Recovered community admin. 2016-11-29 12:42:25 -08:00
gaba a5f67e10d6 Reverts the work on ban in the coral-admin getting everything from master for it. 2016-11-29 11:35:55 -08:00
gaba 281d4f6552 Reverting 2016-11-29 11:17:27 -08:00
gaba a375bf638a Merge branch 'master' into ban-user 2016-11-29 10:42:46 -08:00
Riley Davis 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 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 29f378b863 Merge branch 'master' into bio 2016-11-28 17:20:58 -07:00
gaba abedb36791 Merge branch 'master' into ban-user 2016-11-28 16:04:15 -08:00
David Jay 5f2f70fd51 Fixing bug when adding users to redux. 2016-11-28 18:59:27 -05:00
David Jay aa048365bd Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix 2016-11-28 18:43:20 -05:00
riley 0e3cd001e9 merge master 2016-11-28 16:38:25 -07:00
Riley Davis d5ff0f8f28 keep it DRY. add getInit all over the place. update tests 2016-11-28 16:18:19 -07:00
David Jay 79cda54be2 Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix 2016-11-28 17:28:41 -05: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
gaba 144e716db9 Merge branch 'master' into ban-user 2016-11-28 13:00:56 -08:00
David Jay 8af300a9ec Adding users, comments, and actions to endpoint and moving to store. 2016-11-28 15:51:15 -05:00
Belen Curcio 613a165325 merge 2016-11-28 17:40:22 -03:00
Belen Curcio 67d9bc2e3a Disable selection 2016-11-28 17:36:35 -03:00
Gabriela Rodríguez Berón 31b0453e82 Merge branch 'master' into logout 2016-11-28 12:33:42 -08:00
gaba 6974f30c73 Merge branch 'master' into ban-user 2016-11-28 12:11:46 -08:00
Riley Davis 25d53116f7 remove unused var 2016-11-28 12:49:29 -07:00