Commit Graph

710 Commits

Author SHA1 Message Date
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 d85d15a55a Merge pull request #84 from coralproject/guides
Add CONTRIBUTING.md first draft
2016-12-04 00:59:08 -05:00
Kim Gardner 2f965f2009 Merge branch 'master' into guides 2016-12-04 00:47:32 -05:00
David Erwin 6990600c10 Merge pull request #124 from coralproject/like-login-prompt
Like/Flag Login Prompt
2016-12-02 16:02:34 -05:00
David Erwin f2273f1698 Merge branch 'master' into like-login-prompt 2016-12-02 15:58:54 -05:00
David Erwin 9f9e80e647 Merge pull request #123 from coralproject/info-box-fix
Info box fix
2016-12-02 15:50:40 -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 8dad90104d Returning infobox data in stream. 2016-12-02 12:26:31 -05:00
Belén Curcio e6b9cf4b7d Merge pull request #120 from coralproject/bio
User Bio and Settings Tab
2016-12-01 13:07:25 -03: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
David Erwin 17a8e4bb25 Merge branch 'master' into guides 2016-11-30 22:07:13 -05:00
Belen Curcio c38c556002 merge 2016-11-30 20:11:22 -03:00
Gabriela Rodríguez Berón d3ff89fd25 Merge pull request #113 from coralproject/mod-queue-fix
Add user info to moderation queue
2016-11-30 12:54:15 -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
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
David Erwin ee03194a90 Merge branch 'master' into guides 2016-11-30 11:00:42 -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
David Jay 4486d3f3e9 Merge pull request #119 from coralproject/fetch-helper
implement coralApi fetch
2016-11-29 18:11:21 -05: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 b7ffd31ea4 Cleaning up tests after merge. 2016-11-29 16:37:39 -05: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
David Jay 3033abaa88 Merge pull request #117 from coralproject/moderation-settings-were-backwards
retreiving comments based on settings was backwards
2016-11-29 15:08:18 -05:00
Riley Davis 9fcd7b8d3a retreiving comments based on settings was backwards 2016-11-29 12:16:51 -07:00
Riley Davis 5485a446f3 Merge pull request #101 from coralproject/bio
Settings Structure and Coral UI Components
2016-11-29 10:41:40 -07:00
Riley Davis 8218d0c18e Merge branch 'master' into bio 2016-11-29 10:36:20 -07:00
Wyatt Johnson cd61ae74b8 Merge pull request #108 from coralproject/asset-searching
Added asset searching
2016-11-29 10:06:00 -07:00
Wyatt Johnson 7f1deffab4 Merge branch 'master' into asset-searching 2016-11-29 10:02:41 -07:00
David Jay 20ef93c0af Test db clear (#116)
* Adding headers to stream request.

* Switching mongodb when node_env === test.
2016-11-29 10:02:02 -07:00
Wyatt Johnson ac17fc2cc6 Added asset settings + improved tests for routes 2016-11-29 10:01:52 -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
David Jay 9533aa59b6 Merge pull request #114 from coralproject/asset-settings
Asset settings
2016-11-29 11:37:08 -05:00
Dan Zajdband 735f2d09ad Merge branch 'master' into asset-searching 2016-11-29 11:36:18 -05:00