 Dan Zajdband
|
735f2d09ad
|
Merge branch 'master' into asset-searching
|
2016-11-29 11:36:18 -05:00 |
|
|
David Jay
|
7e7aa5ffb8
|
Merge branch 'master' into asset-settings
|
2016-11-29 11:24:14 -05:00 |
|
|
David Jay
|
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
|
cf93a48186
|
Merge branch 'master' into asset-searching
|
2016-11-28 17:21:06 -07:00 |
|
|
Wyatt Johnson
|
36e0e62471
|
Merge branch 'master' into fix/iframe-injection
|
2016-11-28 17:21:03 -07:00 |
|
|
Wyatt Johnson
|
29f378b863
|
Merge branch 'master' into bio
|
2016-11-28 17:20:58 -07:00 |
|
|
Wyatt Johnson
|
ad4066407a
|
Merge branch 'master' into guides
|
2016-11-28 17:17:28 -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 |
|
|
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 |
|
|
David Jay
|
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
|
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
|
01e7150dd1
|
Merge branch 'master' into return-all-settings
|
2016-11-28 16:26:00 -07:00 |
|
|
Riley Davis
|
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
|
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 |
|
|
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
|
1110cd9582
|
Merge pull request #106 from coralproject/kue-redis-fix
Moved kue redis connector
|
2016-11-28 14:14:15 -07:00 |
|
|
Wyatt Johnson
|
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 |
|
|
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
|
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
|
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
|
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 |
|
|
gaba
|
6974f30c73
|
Merge branch 'master' into ban-user
|
2016-11-28 12:11:46 -08:00 |
|
|
David Erwin
|
109b35951e
|
Merge pull request #102 from coralproject/config-auth-fix
Config auth fix
|
2016-11-28 15:11:19 -05:00 |
|
|
gaba
|
67d54be0d9
|
Remove space.
|
2016-11-28 12:11:05 -08: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 |
|
|
gaba
|
1ec7435ef4
|
Merge branch 'master' into ban-user
|
2016-11-28 11:41:31 -08: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 |
|
|
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 |
|