Commit Graph

274 Commits

Author SHA1 Message Date
David Jay 2cb439ccf8 Reloading banned word list from settings. 2016-12-01 21:12:13 -05:00
David Jay a91b73e94a Fixing bug when writing settings to state. 2016-12-01 20:26:48 -05:00
David Jay 827b94001a Changing save button color when settings are changed 2016-12-01 20:24:34 -05:00
David Jay a16faddac6 Adding banned word list. 2016-12-01 20:11:33 -05:00
David Jay 957837169f Moving configuration sections to seperate files. 2016-12-01 19:35:35 -05:00
David Jay ef58c439f2 Adding banned word list menu option. 2016-12-01 18:46:02 -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 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
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
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
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
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
Riley Davis 25d53116f7 remove unused var 2016-11-28 12:49:29 -07:00
Belen Curcio d384a69111 Main Tabs 2016-11-28 15:56:14 -03:00
Riley Davis 0d7014f77a add helpers to talk-adapter 2016-11-28 11:50:25 -07:00
Riley Davis 98c6ef5162 Merge branch 'master' into config-auth-fix 2016-11-28 11:30:28 -07: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
Riley Davis ee0e0ea9ed import belen's fetch helpers 2016-11-28 11:17:41 -07:00
Riley Davis c0eb202858 small refactor on items actions 2016-11-28 10:57:15 -07:00
Belen Curcio 1dc7db9081 Structure 2016-11-28 14:43:43 -03: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
Belen Curcio 3ebdca33f3 Logout func 2016-11-27 19:37:17 -03:00