 Wyatt Johnson
|
ac17fc2cc6
|
Added asset settings + improved tests for routes
|
2016-11-29 10:01:52 -07:00 |
|
|
Dan Zajdband
|
735f2d09ad
|
Merge branch 'master' into asset-searching
|
2016-11-29 11:36:18 -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 |
|
|
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 |
|
|
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
|
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 |
|
|
Belén Curcio
|
0cdc010124
|
Merge pull request #103 from coralproject/logout
Admin Logout
|
2016-11-28 17:39:37 -03:00 |
|
|
Gabriela Rodríguez Berón
|
31b0453e82
|
Merge branch 'master' into logout
|
2016-11-28 12:33:42 -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 |
|
|
Dan Zajdband
|
f6e423e945
|
Fixed linting issues
|
2016-11-28 15:09:26 -05: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 |
|
|
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 |
|
|
David Erwin
|
c1a7b95705
|
Merge pull request #99 from coralproject/upsertting-actions
Corrected action upserting functionality
|
2016-11-28 12:34:24 -05:00 |
|
|
Wyatt Johnson
|
b22a76536c
|
Merge branch 'master' into upsertting-actions
|
2016-11-28 10:21:03 -07:00 |
|
|
Wyatt Johnson
|
d34cbc7870
|
Moved the action insert into the action model.
|
2016-11-28 10:19:33 -07:00 |
|
|
Wyatt Johnson
|
9d8968f1ce
|
Corrected action upserting functionality
|
2016-11-28 10:14:13 -07:00 |
|
|
Belen Curcio
|
3ebdca33f3
|
Logout func
|
2016-11-27 19:37:17 -03:00 |
|
|
David Erwin
|
2d39dd81e4
|
Merge pull request #95 from coralproject/deprecate-stream-preview
Deprecate stream preview
|
2016-11-25 12:00:51 -05:00 |
|
|
David Erwin
|
cb31caed4b
|
Update comments
|
2016-11-25 11:47:00 -05:00 |
|
|
David Erwin
|
a022ef8a52
|
Restore embed/stream.ejs
|
2016-11-25 10:50:30 -05:00 |
|
|
David Erwin
|
93cd4ea74c
|
Remove non-standard stream embed template
|
2016-11-25 10:43:32 -05:00 |
|
|
David Erwin
|
7a6ea34468
|
Remove the preview link
|
2016-11-25 10:42:38 -05:00 |
|
|
David Erwin
|
bb8570a3d4
|
Merge pull request #94 from coralproject/issue-89
The field is action_type and not action.
|
2016-11-25 10:39:44 -05:00 |
|
|
David Erwin
|
6663e59fb3
|
Merge branch 'master' into issue-89
|
2016-11-25 10:36:36 -05:00 |
|
|
David Erwin
|
ec746f1ba1
|
Merge pull request #93 from coralproject/authorization
Added authorization pieces + test functions
|
2016-11-25 10:36:17 -05:00 |
|
|
David Erwin
|
c0de7a40c3
|
Merge branch 'master' into issue-89
|
2016-11-25 10:31:55 -05:00 |
|
|
gaba
|
e5c02c4274
|
The field is action_type and not action.
|
2016-11-22 17:14:24 -08:00 |
|
|
Wyatt Johnson
|
29a8b686b3
|
Merge branch 'master' into authorization
|
2016-11-22 17:23:14 -07:00 |
|
|
Wyatt Johnson
|
325162cb3e
|
Added authorization pieces + test functions
|
2016-11-22 17:15:14 -07:00 |
|
|
Wyatt Johnson
|
78f751344a
|
Update PULL_REQUEST_TEMPLATE.md
|
2016-11-22 17:01:48 -07:00 |
|
|
Kim Gardner
|
30547ad2ff
|
Merge pull request #88 from coralproject/reply-update
Reply update
|
2016-11-22 17:18:12 -05:00 |
|