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 and GitHub
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 and GitHub
5485a446f3
Merge pull request #101 from coralproject/bio
...
Settings Structure and Coral UI Components
2016-11-29 10:41:40 -07:00
Riley Davis and GitHub
8218d0c18e
Merge branch 'master' into bio
2016-11-29 10:36:20 -07:00
Wyatt Johnson and GitHub
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 and Wyatt Johnson
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 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
David Jay and GitHub
9533aa59b6
Merge pull request #114 from coralproject/asset-settings
...
Asset settings
2016-11-29 11:37:08 -05:00
Dan Zajdband and GitHub
735f2d09ad
Merge branch 'master' into asset-searching
2016-11-29 11:36:18 -05:00
David Jay and GitHub
7e7aa5ffb8
Merge branch 'master' into asset-settings
2016-11-29 11:24:14 -05:00
David Jay and GitHub
b36d905046
Merge pull request #104 from coralproject/fix/iframe-injection
...
Allow embedding into third-party websites
2016-11-29 11:23:16 -05:00
Belen Curcio
55afe36e3b
Renaming
2016-11-29 06:24:13 -03:00
Wyatt Johnson and GitHub
cf93a48186
Merge branch 'master' into asset-searching
2016-11-28 17:21:06 -07:00
Wyatt Johnson and GitHub
36e0e62471
Merge branch 'master' into fix/iframe-injection
2016-11-28 17:21:03 -07:00
Wyatt Johnson and GitHub
29f378b863
Merge branch 'master' into bio
2016-11-28 17:20:58 -07:00
Wyatt Johnson
fd9636dc9d
Merge branch 'master' into asset-settings
2016-11-28 17:16:39 -07:00
Wyatt Johnson
3448752f6f
Added asset settings + improved tests for routes
2016-11-28 17:13:11 -07:00
David Jay and GitHub
00858e467b
Merge pull request #112 from coralproject/more-getinit
...
keep it DRY. add getInit all over the place. update tests
2016-11-28 18:43:06 -05:00
riley
0e3cd001e9
merge master
2016-11-28 16:38:25 -07:00
Riley Davis and GitHub
6cd3d679d3
Merge pull request #111 from coralproject/return-all-settings
...
Returning all settings from api/v1/settings.
2016-11-28 16:30:46 -07:00
Riley Davis and GitHub
01e7150dd1
Merge branch 'master' into return-all-settings
2016-11-28 16:26:00 -07:00
Riley Davis and GitHub
ce9d1e6c2d
Merge pull request #109 from coralproject/settings-in-stream
...
Settings in stream
2016-11-28 16:23:27 -07:00
David Jay
c0a9ea9905
Returning all settings from api/v1/settings.
2016-11-28 18:19:07 -05: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
461e80e260
Removing switch in steam endpoint.
2016-11-28 17:43:24 -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
Wyatt Johnson
ab46c020d9
Added asset searching
2016-11-28 15:01:13 -07:00
David Jay
ca5049feeb
Adding settings to stream.
2016-11-28 16:52:00 -05:00
Wyatt Johnson and GitHub
1110cd9582
Merge pull request #106 from coralproject/kue-redis-fix
...
Moved kue redis connector
2016-11-28 14:14:15 -07:00
Wyatt Johnson and GitHub
d882e4965e
Merge branch 'master' into kue-redis-fix
2016-11-28 14:06:47 -07:00
Wyatt Johnson
616dd534d9
Moved kue redis connector
2016-11-28 14:05:06 -07:00
Belen Curcio
9c3edd2ed5
merge
2016-11-28 17:41:26 -03:00
Belen Curcio
613a165325
merge
2016-11-28 17:40:22 -03:00
Belén Curcio and GitHub
0cdc010124
Merge pull request #103 from coralproject/logout
...
Admin Logout
2016-11-28 17:39:37 -03:00
Belen Curcio
67d9bc2e3a
Disable selection
2016-11-28 17:36:35 -03:00
Gabriela Rodríguez Berón and GitHub
31b0453e82
Merge branch 'master' into logout
2016-11-28 12:33:42 -08:00
Riley Davis
a9e2217e29
Merged branch master into bio
2016-11-28 13:21:53 -07:00
David Erwin and GitHub
109b35951e
Merge pull request #102 from coralproject/config-auth-fix
...
Config auth fix
2016-11-28 15:11:19 -05:00
Dan Zajdband
f6e423e945
Fixed linting issues
2016-11-28 15:09:26 -05:00
riley
bd6bc62733
Merged master into bio
2016-11-28 12:49:43 -07:00
Riley Davis
25d53116f7
remove unused var
2016-11-28 12:49:29 -07:00
Dan Zajdband
552e174b0d
fix(embed): Disabled framing middleware enabling placing the comment box in third-party sites. In the future we will count with a whitelist so we can adjust the middleware
2016-11-28 14:23:22 -05:00
