wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-11 20:44:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 0df83a2d95 Merge branch 'master' of github.com:coralproject/talk into community Belen Curcio 2016-11-08 21:32:32 -03:00
  • 418b1529ed Updating copying style to match designs. David Jay 2016-11-08 19:18:26 -05:00
  • d8ec009482 Added linting to the client Wyatt Johnson 2016-11-08 17:16:24 -07:00
  • b5769f429c One test to do. gaba 2016-11-08 16:01:57 -08:00
  • 62af90be10 Merge pull request #41 from coralproject/error-middleware David Jay 2016-11-08 19:00:19 -05:00
  • b19f936e64 Adds tests gaba 2016-11-08 15:59:35 -08:00
  • 3d17dc4c1a Moderation queue depending on moderation settings. gaba 2016-11-08 15:26:05 -08:00
  • fff333480d Merge branch 'master' of github.com:coralproject/talk gaba 2016-11-08 15:28:22 -08:00
  • 0968b02c3a Moderation queue depending on moderation settings. gaba 2016-11-08 15:26:05 -08:00
  • 843f90baea merge master riley 2016-11-08 16:22:05 -07:00
  • 7d5eae2e2f Added embed stream preview Wyatt Johnson 2016-11-08 16:21:50 -07:00
  • c6188913d8 display a simple error text Riley Davis 2016-11-08 16:19:40 -07:00
  • 84de3085bf Merge branch 'master' into error-middleware Wyatt Johnson 2016-11-08 16:18:15 -07:00
  • ff52714f27 update state correctly. save to server correctly Riley Davis 2016-11-08 16:16:27 -07:00
  • ae4b2b69c8 Merge pull request #39 from coralproject/webpack-unification David Jay 2016-11-08 18:09:30 -05:00
  • d7ead01180 Expecting stream endpoint to return items broken out by type. David Jay 2016-11-08 17:53:38 -05:00
  • a1fd4d32ba Added error middleware Wyatt Johnson 2016-11-08 15:53:26 -07:00
  • 8fd7a46d37 removed log Belen Curcio 2016-11-08 19:52:37 -03:00
  • 051209d8ad Merge branch 'master' of github.com:coralproject/talk into community Belen Curcio 2016-11-08 19:49:54 -03:00
  • 4b7b8336ad Env vars Belen Curcio 2016-11-08 19:42:58 -03:00
  • 6738ff86e1 changes Belen Curcio 2016-11-08 19:35:56 -03:00
  • 2823232c12 add actions and reducers for settings Riley Davis 2016-11-08 15:25:48 -07:00
  • 8c215e0861 api-adapt(coral-admin): Get flagging mod queue working with the backend Dan Zajdband 2016-11-08 17:15:57 -05:00
  • 2fdd440720 Merge branch 'master' into webpack-unification Wyatt Johnson 2016-11-08 15:07:18 -07:00
  • 571778f42b Merge pull request #36 from coralproject/ci-fixes David Erwin 2016-11-08 17:07:13 -05:00
  • 3c2eb9a42d Merge branch 'master' into ci-fixes Wyatt Johnson 2016-11-08 15:04:12 -07:00
  • 8369f263fb Merged webpack files to unified Wyatt Johnson 2016-11-08 15:00:19 -07:00
  • ad1d555574 Removing the watch Belen Curcio 2016-11-08 18:51:52 -03:00
  • 52fd6c1618 Community route Belen Curcio 2016-11-08 18:50:40 -03:00
  • c9453c3c2a Route nesting Belen Curcio 2016-11-08 18:48:43 -03:00
  • 285830211f Updated Links Belen Curcio 2016-11-08 18:46:50 -03:00
  • 8920a59a92 ádding dev back Belen Curcio 2016-11-08 18:25:54 -03:00
  • ce31161ef9 Production webpack Belen Curcio 2016-11-08 18:22:27 -03:00
  • 8e449c9023 Merge branch 'master' of github.com:coralproject/talk into community Belen Curcio 2016-11-08 17:50:00 -03:00
  • cba476edfe removing watch adding webpack const for env vars Belen Curcio 2016-11-08 17:49:48 -03:00
  • 5270aefe6a Merge pull request #37 from coralproject/terminology Gabriela Rodríguez Berón 2016-11-08 12:49:15 -08:00
  • 551ba2ebb3 Add TERMINOLOGY.md David Erwin 2016-11-08 15:46:00 -05:00
  • 86350800c2 Merge branch 'master' of github.com:coralproject/talk into community Belen Curcio 2016-11-08 17:43:00 -03:00
  • e8584b499b Returning actions, items, and comments as seperate arrays. David Jay 2016-11-08 15:32:52 -05:00
  • fcd65c18fd Switching stream to use action summaries function. David Jay 2016-11-08 15:23:04 -05:00
  • d3b8184ff4 Removing randomness from comments api tests. David Jay 2016-11-08 15:22:38 -05:00
  • eb00e63a41 Adding action summaries function to actions model. David Jay 2016-11-08 15:21:52 -05:00
  • a36524a55f merge Belen Curcio 2016-11-08 17:21:12 -03:00
  • 181944e367 Merge pull request #32 from coralproject/embed-link David Erwin 2016-11-08 14:56:28 -05:00
  • 661b402351 Remove npm install from coral-admin build David Erwin 2016-11-08 14:53:28 -05:00
  • 57c63348bd Merge branch 'master' into embed-link David Erwin 2016-11-08 14:44:18 -05:00
  • d1b027af27 Merge pull request #35 from coralproject/css-build David Erwin 2016-11-08 14:42:08 -05:00
  • 24c9215dc2 Added circle improvements Wyatt Johnson 2016-11-08 12:39:49 -07:00
  • 15f7f9ee0c Merge branch 'master' into css-build Riley Davis 2016-11-08 12:38:50 -07:00
  • b0b5136b4f Merged branch css-build into css-build Riley Davis 2016-11-08 12:38:24 -07:00
  • 1874206dd7 update root package.json Riley Davis 2016-11-08 12:38:16 -07:00
  • a615356936 Merge pull request #34 from coralproject/update-readme David Jay 2016-11-08 14:37:17 -05:00
  • 130fc259bf Cleanup Belen Curcio 2016-11-08 16:36:52 -03:00
  • 6c9e31c52d Drop trailing slash requirement on admin route David Erwin 2016-11-08 14:36:40 -05:00
  • c609e5b3bb enable css modules Riley Davis 2016-11-08 12:35:37 -07:00
  • b7c0602a2c Header, Drawer, Layout Belen Curcio 2016-11-08 16:32:09 -03:00
  • ff42d571e6 Add trailing slashes to URLs Kim Gardner 2016-11-08 14:25:53 -05:00
  • db66c66f3d Update admin route Kim Gardner 2016-11-08 14:23:24 -05:00
  • e3074892ce Add moderator view URL Kim Gardner 2016-11-08 11:56:55 -05:00
  • c7cf2785fd Update README Kim Gardner 2016-11-07 21:36:52 -05:00
  • b18104c8d9 Layout Container and Route handling Belen Curcio 2016-11-08 16:19:53 -03:00
  • 2baeedeb58 Merge pull request #33 from coralproject/admin-routes David Erwin 2016-11-08 14:15:56 -05:00
  • 23eb24272d Merge branch 'master' into admin-routes Riley Davis 2016-11-08 12:04:20 -07:00
  • 80f1f70a2a hardcode routes in react app Riley Davis 2016-11-08 12:03:49 -07:00
  • ef3a34680a config for pre git Belen Curcio 2016-11-08 15:52:09 -03:00
  • 1508eac92d Removing divs from routes Belen Curcio 2016-11-08 15:51:43 -03:00
  • 28e6f87b1b Merge pull request #26 from coralproject/mod-queue Gabriela Rodríguez Berón 2016-11-08 10:30:01 -08:00
  • 6f6da14401 fix build script a bit Riley Davis 2016-11-08 11:27:47 -07:00
  • ed01d54418 It fixes random test on get comment by comment_id. gaba 2016-11-08 10:23:59 -08:00
  • b2bfadafca Merged branch admin-routes into admin-routes Riley Davis 2016-11-08 11:25:00 -07:00
  • b6355b06db remove unused var Riley Davis 2016-11-08 11:24:46 -07:00
  • e56284569a Merge branch 'master' into admin-routes Riley Davis 2016-11-08 11:20:53 -07:00
  • a15d2eade7 add ejs templating and serve coral-admin from /admin Riley Davis 2016-11-08 11:15:08 -07:00
  • 242e64198a Add autoprefixer to dependencies David Erwin 2016-11-08 13:09:09 -05:00
  • 2807b2d5b2 Merge master into nod-queue David Erwin 2016-11-08 13:05:31 -05:00
  • 4a3f16b136 Merge branch 'master' into embed-link David Jay 2016-11-08 13:03:14 -05:00
  • 28eee209a8 Merge pull request #31 from coralproject/even-more-fixing Gabriela Rodríguez Berón 2016-11-08 10:01:14 -08:00
  • 7e72046481 Adding npm install to build process for coral-admin so build works. David Jay 2016-11-08 12:57:16 -05:00
  • ee33b8445b Adding embed script to appropriate screen in settings. David Jay 2016-11-08 12:56:22 -05:00
  • 80754ee57b Updating build scripts for coral-admin David Jay 2016-11-08 12:55:32 -05:00
  • 095f6a319e remove the 2 requests in settings tests. add Promises riley 2016-11-08 10:38:49 -07:00
  • 411e6e48f3 Removing unused copy from build process. David Jay 2016-11-08 12:28:09 -05:00
  • bc7c877bfb Merge pull request #30 from coralproject/fix-settings-test Kim Gardner 2016-11-08 12:27:37 -05:00
  • b10ae913ab fix a race condition in the tests Riley Davis 2016-11-08 10:07:41 -07:00
  • 98bd1db614 Merge branch 'master' into mod-queue gaba 2016-11-08 08:57:11 -08:00
  • 12aa9c6260 Merge pull request #29 from coralproject/one-build David Erwin 2016-11-08 11:43:15 -05:00
  • 4fcbead158 Merge branch 'master' into one-build David Erwin 2016-11-08 11:34:59 -05:00
  • ed509ad36b build from root. routes in coral-admin menu work Riley Davis 2016-11-08 09:10:01 -07:00
  • 588a8de489 MOve two lines into one. gaba 2016-11-07 18:16:04 -08:00
  • c8c82fd03b Move all DB functions into models. Clean up tests. gaba 2016-11-07 18:10:17 -08:00
  • 57ec16e6ef Merge pull request #28 from coralproject/post-comment David Erwin 2016-11-07 18:47:07 -05:00
  • 33c77178a9 Fixing id bug in redux store. David Jay 2016-11-07 18:41:23 -05:00
  • e7f4f82f66 Fixing comment post order bug. David Jay 2016-11-07 18:41:07 -05:00
  • b51766ee2e Merge pull request #27 from coralproject/post-comment David Erwin 2016-11-07 18:20:45 -05:00
  • 269be5b33f Merge branch 'master' into post-comment David Jay 2016-11-07 18:17:33 -05:00
  • 1cd79c2793 Merge branch 'master' into mod-queue gaba 2016-11-07 15:13:57 -08:00
  • 0c04e765d6 Moderation queue on flagged comments. gaba 2016-11-07 15:10:56 -08:00
  • 456524e4ee Adding multiline comments. David Jay 2016-11-07 18:09:26 -05:00
  • 47bcd163b1 Showing comments in chronological order. David Jay 2016-11-07 17:56:44 -05:00
  • 8cc6d9db10 Merge pull request #25 from coralproject/post-comment David Erwin 2016-11-07 17:34:34 -05:00