443cd031d5
Ban button.
2016-11-30 19:20:07 -08:00
17a8e4bb25
Merge branch 'master' into guides
2016-11-30 22:07:13 -05:00
c38c556002
merge
2016-11-30 20:11:22 -03:00
b2b9b0ec42
Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e
2016-11-30 17:55:39 -05:00
3f1f678fb2
Adding comment count test.
2016-11-30 17:49:08 -05:00
fe4e9c5ea9
All e2e tests passing.
2016-11-30 17:38:23 -05:00
2dd3359cb6
Merge branch 'master' into ban-user
2016-11-30 13:31:59 -08:00
c93bc67a40
Removing mocks from pree2e
2016-11-30 16:29:05 -05:00
7503ba9ab3
Moving settings to mocks.
2016-11-30 16:27:03 -05:00
2b0a503c6a
Adding mock functions to tests.
2016-11-30 16:18:54 -05:00
d3ff89fd25
Merge pull request #113 from coralproject/mod-queue-fix
...
Add user info to moderation queue
2016-11-30 12:54:15 -08:00
34671fb327
Fixing filter in moderation queue.
2016-11-30 15:38:43 -05:00
03db1de41a
Removing log statement.
2016-11-30 15:15:58 -05:00
bf3b028370
Close comments: WIP
2016-11-30 15:09:42 -05:00
d90a158298
Bio Tooltips
2016-11-30 17:09:34 -03:00
a30388682e
Merge branch 'master' into ban-user
2016-11-30 11:26:44 -08:00
ba47250933
Understanding reducers
2016-11-30 11:12:09 -08:00
17b79e1869
Adding user and action data to rejected and flagged comments.
2016-11-30 13:51:43 -05:00
94d9f42aa5
Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix
2016-11-30 12:50:44 -05:00
ee03194a90
Merge branch 'master' into guides
2016-11-30 11:00:42 -05:00
6e7926ab30
Working bios
2016-11-30 12:41:50 -03:00
2607c608f5
D
...
ividing userData from userAuth
2016-11-30 10:20:03 -03:00
bd704bf2ce
User Settings, Restricted User, Banned User, Bio and User actions and Reducers
2016-11-30 08:42:25 -03:00
4486d3f3e9
Merge pull request #119 from coralproject/fetch-helper
...
implement coralApi fetch
2016-11-29 18:11:21 -05:00
3e86bfdceb
false positive on user signed in
2016-11-29 15:58:05 -07:00
fb977da01d
Adding mocks file.
2016-11-29 17:36:17 -05:00
257ecd3328
Merge branch 'master' into fetch-helper
2016-11-29 15:34:30 -07:00
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
a7f94fce83
implement coralApi fetch
2016-11-29 14:44:37 -07:00
b7ffd31ea4
Cleaning up tests after merge.
2016-11-29 16:37:39 -05:00
9499e53021
Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix
2016-11-29 16:36:44 -05:00
8af9e14971
Recovered community admin.
2016-11-29 12:42:25 -08:00
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
a5f67e10d6
Reverts the work on ban in the coral-admin getting everything from master for it.
2016-11-29 11:35:55 -08:00
281d4f6552
Reverting
2016-11-29 11:17:27 -08:00
9fcd7b8d3a
retreiving comments based on settings was backwards
2016-11-29 12:16:51 -07:00
27eb341fa8
Fix users and comments as a merge was weird before.
2016-11-29 10:56:44 -08:00
a375bf638a
Merge branch 'master' into ban-user
2016-11-29 10:42:46 -08:00
dafd849b0e
Merge branch 'master' into stream-e2e
2016-11-29 10:48:16 -07:00
3c903ddd6d
Merge branch 'master' into stream-e2e
2016-11-29 10:41:50 -07:00
5485a446f3
Merge pull request #101 from coralproject/bio
...
Settings Structure and Coral UI Components
2016-11-29 10:41:40 -07:00
8218d0c18e
Merge branch 'master' into bio
2016-11-29 10:36:20 -07:00
cd61ae74b8
Merge pull request #108 from coralproject/asset-searching
...
Added asset searching
2016-11-29 10:06:00 -07:00
7f1deffab4
Merge branch 'master' into asset-searching
2016-11-29 10:02:41 -07:00
20ef93c0af
Test db clear ( #116 )
...
* Adding headers to stream request.
* Switching mongodb when node_env === test.
2016-11-29 10:02:02 -07:00
ac17fc2cc6
Added asset settings + improved tests for routes
2016-11-29 10:01:52 -07:00
a5de52aeb9
merge
2016-11-29 13:57:14 -03:00
86faf504bb
changes
2016-11-29 13:56:26 -03:00
ea2ee68ed6
Test db clear ( #116 )
...
* Adding headers to stream request.
* Switching mongodb when node_env === test.
2016-11-29 11:44:54 -05:00
9533aa59b6
Merge pull request #114 from coralproject/asset-settings
...
Asset settings
2016-11-29 11:37:08 -05:00
gaba