Commit Graph

303 Commits

Author SHA1 Message Date
David Jay 6ef0d3ef41 Posting flags correctly and displaying flags when clicked. 2016-11-09 18:30:01 -05:00
David Jay b7ee23d000 Updating commentstream to reflect new store structure. 2016-11-09 17:01:50 -05:00
David Jay 6ab561b91b Updating and passing coral-framework tests 2016-11-09 16:39:54 -05:00
David Jay e0e80aa5cd Moving coral-framework tests over and updating mocha to transpile them. 2016-11-09 14:10:01 -05:00
David Jay 13aabb9974 Re-adding notification length to config. 2016-11-09 13:54:44 -05:00
David Jay 6616cf0c51 Uncommenting flags and hydrating actions. 2016-11-09 13:42:03 -05:00
David Jay 07db6b3f9c Merge branch 'master' of https://github.com/coralproject/talk into reader-flags 2016-11-09 13:22:45 -05:00
Dan Zajdband 890bacc2e8 Merge pull request #38 from coralproject/community
Routes and Layout Containers
2016-11-09 10:59:45 -05:00
Belen Curcio c36604f7dd Merge branch 'community' of github.com:coralproject/talk into community 2016-11-09 12:26:55 -03:00
Belen Curcio e0512bbe92 Merge branch 'master' of github.com:coralproject/talk into community 2016-11-09 12:19:29 -03:00
Wyatt Johnson 6aae992a45 Merge branch 'master' into community 2016-11-09 08:02:37 -07:00
Dan Zajdband 6dee464eec Merge pull request #45 from coralproject/build-errors
Some dep fixes which will hopefully resolve the CI issues
2016-11-09 10:00:31 -05:00
Wyatt Johnson e638d2785b Some dep fixes which will hopefully resolve the CI issues 2016-11-09 07:53:34 -07:00
Belen Curcio 72d01539fa Adding version and env 2016-11-09 10:16:07 -03:00
Belen Curcio 0df83a2d95 Merge branch 'master' of github.com:coralproject/talk into community 2016-11-08 21:32:32 -03:00
David Jay 62af90be10 Merge pull request #41 from coralproject/error-middleware
Added error middleware
2016-11-08 19:00:19 -05:00
Wyatt Johnson 7d5eae2e2f Added embed stream preview 2016-11-08 16:21:50 -07:00
Wyatt Johnson 84de3085bf Merge branch 'master' into error-middleware 2016-11-08 16:18:15 -07:00
David Jay ae4b2b69c8 Merge pull request #39 from coralproject/webpack-unification
Merged webpack files to unified webpack
2016-11-08 18:09:30 -05:00
David Jay d7ead01180 Expecting stream endpoint to return items broken out by type. 2016-11-08 17:53:38 -05:00
Wyatt Johnson a1fd4d32ba Added error middleware 2016-11-08 15:53:26 -07:00
Belen Curcio 8fd7a46d37 removed log 2016-11-08 19:52:37 -03:00
Belen Curcio 051209d8ad Merge branch 'master' of github.com:coralproject/talk into community 2016-11-08 19:49:54 -03:00
Belen Curcio 4b7b8336ad Env vars 2016-11-08 19:42:58 -03:00
Belen Curcio 6738ff86e1 changes 2016-11-08 19:35:56 -03:00
Wyatt Johnson 2fdd440720 Merge branch 'master' into webpack-unification 2016-11-08 15:07:18 -07:00
David Erwin 571778f42b Merge pull request #36 from coralproject/ci-fixes
Added circle improvements
2016-11-08 17:07:13 -05:00
Wyatt Johnson 3c2eb9a42d Merge branch 'master' into ci-fixes 2016-11-08 15:04:12 -07:00
Wyatt Johnson 8369f263fb Merged webpack files to unified 2016-11-08 15:00:19 -07:00
Belen Curcio ad1d555574 Removing the watch 2016-11-08 18:51:52 -03:00
Belen Curcio 52fd6c1618 Community route 2016-11-08 18:50:40 -03:00
Belen Curcio c9453c3c2a Route nesting 2016-11-08 18:48:43 -03:00
Belen Curcio 285830211f Updated Links 2016-11-08 18:46:50 -03:00
Belen Curcio 8920a59a92 ádding dev back 2016-11-08 18:25:54 -03:00
Belen Curcio ce31161ef9 Production webpack 2016-11-08 18:22:27 -03:00
Belen Curcio 8e449c9023 Merge branch 'master' of github.com:coralproject/talk into community 2016-11-08 17:50:00 -03:00
Belen Curcio cba476edfe removing watch adding webpack const for env vars 2016-11-08 17:49:48 -03:00
Gabriela Rodríguez Berón 5270aefe6a Merge pull request #37 from coralproject/terminology
Add TERMINOLOGY.md
2016-11-08 12:49:15 -08:00
David Erwin 551ba2ebb3 Add TERMINOLOGY.md 2016-11-08 15:46:00 -05:00
Belen Curcio 86350800c2 Merge branch 'master' of github.com:coralproject/talk into community 2016-11-08 17:43:00 -03:00
David Jay e8584b499b Returning actions, items, and comments as seperate arrays. 2016-11-08 15:32:52 -05:00
David Jay fcd65c18fd Switching stream to use action summaries function. 2016-11-08 15:23:04 -05:00
David Jay d3b8184ff4 Removing randomness from comments api tests. 2016-11-08 15:22:38 -05:00
David Jay eb00e63a41 Adding action summaries function to actions model. 2016-11-08 15:21:52 -05:00
Belen Curcio a36524a55f merge 2016-11-08 17:21:12 -03:00
David Erwin 181944e367 Merge pull request #32 from coralproject/embed-link
Embed link
2016-11-08 14:56:28 -05:00
David Erwin 661b402351 Remove npm install from coral-admin build 2016-11-08 14:53:28 -05:00
David Erwin 57c63348bd Merge branch 'master' into embed-link 2016-11-08 14:44:18 -05:00
David Erwin d1b027af27 Merge pull request #35 from coralproject/css-build
enable css modules
2016-11-08 14:42:08 -05:00
Wyatt Johnson 24c9215dc2 Added circle improvements 2016-11-08 12:39:49 -07:00