 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 |
|
|
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 DavisandGitHub
|
98c6ef5162
|
Merge branch 'master' into config-auth-fix
|
2016-11-28 11:30:28 -07:00 |
|
|
Wyatt JohnsonandDan Zajdband
|
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 |
|
|
Belen Curcio
|
6714082b99
|
master merge
|
2016-11-28 14:57:16 -03:00 |
|
|
Riley Davis
|
c0eb202858
|
small refactor on items actions
|
2016-11-28 10:57:15 -07:00 |
|
|
Belen Curcio
|
1dc7db9081
|
Structure
|
2016-11-28 14:43:43 -03:00 |
|
|
David ErwinandGitHub
|
c1a7b95705
|
Merge pull request #99 from coralproject/upsertting-actions
Corrected action upserting functionality
|
2016-11-28 12:34:24 -05:00 |
|
|
Belen Curcio
|
5bb386e16a
|
Structure
|
2016-11-28 14:25:30 -03:00 |
|
|
Wyatt JohnsonandGitHub
|
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
|
4d916be170
|
Working tabs
|
2016-11-27 20:54:41 -03:00 |
|
|
Belen Curcio
|
3ebdca33f3
|
Logout func
|
2016-11-27 19:37:17 -03:00 |
|
|
David ErwinandGitHub
|
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 ErwinandGitHub
|
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 ErwinandGitHub
|
6663e59fb3
|
Merge branch 'master' into issue-89
|
2016-11-25 10:36:36 -05:00 |
|
|
David ErwinandGitHub
|
ec746f1ba1
|
Merge pull request #93 from coralproject/authorization
Added authorization pieces + test functions
|
2016-11-25 10:36:17 -05:00 |
|
|
David ErwinandGitHub
|
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 JohnsonandGitHub
|
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 JohnsonandGitHub
|
78f751344a
|
Update PULL_REQUEST_TEMPLATE.md
|
2016-11-22 17:01:48 -07:00 |
|
|
David JayandGitHub
|
a06d1d4bbb
|
Merge branch 'master' into stream-e2e
|
2016-11-22 18:58:54 -05:00 |
|
|
David Jay
|
9a98ccc846
|
Commenting out blocked tests and log statements.
|
2016-11-22 18:48:45 -05:00 |
|
|
David Jay
|
5ab3fba818
|
Setting env variables properly in tests.
|
2016-11-22 18:45:11 -05:00 |
|
|
Kim GardnerandGitHub
|
30547ad2ff
|
Merge pull request #88 from coralproject/reply-update
Reply update
|
2016-11-22 17:18:12 -05:00 |
|
|
David Jay
|
6e6ba89706
|
Hiding reply box on post.
|
2016-11-22 16:51:22 -05:00 |
|
|
David Jay
|
dea62d8895
|
Fixing bug with reply author name.
|
2016-11-22 16:16:10 -05:00 |
|
|
David JayandGitHub
|
0d4a029529
|
Merge pull request #87 from coralproject/add-https-to-script
Adds https and accessibility to embed code.
|
2016-11-22 16:13:53 -05:00 |
|
|
David Jay
|
d04812fd36
|
Adding https and accessability to embed code.
|
2016-11-22 16:09:36 -05:00 |
|
|
David Jay
|
18bfabfd43
|
Moving configuration setting to shared function
|
2016-11-22 16:02:57 -05:00 |
|
|
David Jay
|
2a19399b81
|
Moving configuration setting to shared function
|
2016-11-22 16:01:50 -05:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
32d715e784
|
Merge pull request #86 from coralproject/fix-icon
Icon was missing
|
2016-11-22 12:44:23 -08:00 |
|
|
David Jay
|
e40d5312da
|
Adding premod off reply test.
|
2016-11-22 15:36:52 -05:00 |
|
|
gaba
|
1eb2d04136
|
Icon was missing
|
2016-11-22 12:35:43 -08:00 |
|
|
David Jay
|
4035ed02c2
|
Adding test env variables.
|
2016-11-22 15:29:45 -05:00 |
|
|
David Jay
|
3030bf4f22
|
Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e
|
2016-11-22 15:04:36 -05:00 |
|
|
David Jay
|
25c40fc212
|
Applying client.perform consistently.
|
2016-11-22 14:29:11 -05:00 |
|
|
David Jay
|
654e3580e7
|
Adding second test.
|
2016-11-22 13:49:21 -05:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
d5d02aef32
|
Merge pull request #79 from coralproject/user-integration
User integration
|
2016-11-22 09:30:27 -08:00 |
|
|
David JayandGitHub
|
2e54a51678
|
Merge branch 'master' into user-integration
|
2016-11-22 12:09:29 -05:00 |
|