wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-13 17:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 2d6c26887a Merge branch 'master' into config-embed Belén Curcio 2017-05-10 16:05:04 -03:00
  • 7626330ee1 Merge branch 'master' into coral-reaction Belén Curcio 2017-05-10 16:02:01 -03:00
  • 2fc54ac529 Merge branch 'master' of github.com:coralproject/talk into config-embed Belen Curcio 2017-05-10 15:59:09 -03:00
  • 10e8a32c21 Changes Belen Curcio 2017-05-10 15:57:21 -03:00
  • 0a2b26b599 Exports Belen Curcio 2017-05-10 15:53:33 -03:00
  • 4f74d28602 Merge pull request #579 from coralproject/action-fix David Erwin 2017-05-10 14:39:25 -04:00
  • c3dff79e6e Updated Belen Curcio 2017-05-10 15:35:32 -03:00
  • 602c3d0be2 use a slot instead of trying to use facebook directly riley 2017-05-10 12:28:33 -06:00
  • a3a8d23797 patched bug with adding action Wyatt Johnson 2017-05-10 12:18:42 -06:00
  • 7313aaa473 Merge branch 'config-embed' of github.com:coralproject/talk into config-embed Belen Curcio 2017-05-10 15:09:19 -03:00
  • 74ffc00c20 Adding changes Belen Curcio 2017-05-10 15:02:43 -03:00
  • 2673de5059 lintin Belen Curcio 2017-05-10 14:59:10 -03:00
  • 644d00d5d8 Adding coral-plugin-api Belen Curcio 2017-05-10 14:57:24 -03:00
  • 75fb7b6dc2 Merge branch 'master' into user-detail-ui Riley Davis 2017-05-10 11:44:36 -06:00
  • 07778844dc Merge branch 'master' into config-embed Belén Curcio 2017-05-10 14:17:23 -03:00
  • cb45e33b41 merge Belen Curcio 2017-05-10 14:15:24 -03:00
  • 26e5631f52 Changing path for hocs Belen Curcio 2017-05-10 14:13:32 -03:00
  • 3e1b7591e0 Adds displayName for WrappedReactions and alreadyReacted Belen Curcio 2017-05-10 14:07:58 -03:00
  • 40ff265ab1 merge master Riley Davis 2017-05-10 11:07:48 -06:00
  • 19bf7f6cf8 Adds displayName for WrappedReactions Belen Curcio 2017-05-10 13:58:05 -03:00
  • 67c202d89f Merge pull request #577 from coralproject/admin-slots Belén Curcio 2017-05-10 13:53:20 -03:00
  • ad24ff78d2 Merge branch 'master' of github.com:coralproject/talk into coral-reaction Belen Curcio 2017-05-10 13:46:11 -03:00
  • f8b207e563 Return a meaningful error Wyatt Johnson 2017-05-10 10:29:20 -06:00
  • f1e4f98055 Merge branch 'master' into 142993479-tags Gabriela Rodríguez Berón 2017-05-10 08:50:28 -07:00
  • fe279587b5 add staff to dropdown Riley Davis 2017-05-10 09:25:39 -06:00
  • ca51821d7b Merge branch 'master' into config-embed Belén Curcio 2017-05-10 12:01:29 -03:00
  • 250a578dd7 lint, and merge conficts Belen Curcio 2017-05-10 11:05:21 -03:00
  • 17b9e43c14 moved webpack config Wyatt Johnson 2017-05-09 16:53:30 -06:00
  • 785e5a4ac8 Collected config Wyatt Johnson 2017-05-09 16:49:11 -06:00
  • 650e8e205e Merge branch 'edit-comment' of github.com:gobengo/talk into edit-comment Benjamin Goering 2017-05-09 15:03:19 -07:00
  • f37a210479 Only use errors from errors.js for EditWindowHasEnded Benjamin Goering 2017-05-09 15:02:26 -07:00
  • 76d0fdfd67 Added docs Wyatt Johnson 2017-05-09 15:32:19 -06:00
  • 3649605629 Merge branch 'master' into auth-tokens Wyatt Johnson 2017-05-09 15:21:38 -06:00
  • 0d47ee895c removed unused service Wyatt Johnson 2017-05-09 15:02:31 -06:00
  • 2e1bc8d75a Adjusted query/tag flow Wyatt Johnson 2017-05-09 15:01:01 -06:00
  • af89ef45f2 Merge branch 'master' into coral-reaction Belén Curcio 2017-05-09 15:54:36 -03:00
  • 8c219c1c4d Adding config with initial Belen Curcio 2017-05-09 15:53:57 -03:00
  • b81b789afa Merge branch 'master' into query-mutation-api Kim Gardner 2017-05-09 14:29:27 -04:00
  • fa8d96b6be Merge branch 'master' into edit-comment Kim Gardner 2017-05-09 14:19:50 -04:00
  • d8e7b25d0e Merge pull request #576 from coralproject/FE_Plugin_DOCS Kim Gardner 2017-05-09 13:49:49 -04:00
  • 52b0819e78 Adding example for plugins within the Admin Comment Queue Belen Curcio 2017-05-09 14:02:35 -03:00
  • 994b5006b6 Merge branch 'master' into edit-comment Benjamin Goering 2017-05-09 09:12:14 -07:00
  • a187472d5c merge master riley 2017-05-09 10:11:04 -06:00
  • a20bacd78d Merge branch 'master' into FE_Plugin_DOCS Kim Gardner 2017-05-09 12:07:27 -04:00
  • 084f6b28ed merge master Riley Davis 2017-05-09 10:06:41 -06:00
  • 87bc3e0a72 Merge pull request #565 from coralproject/approve-reject-noop Kim Gardner 2017-05-09 12:06:21 -04:00
  • 3c06ee9360 Adds slots to admin stream Belen Curcio 2017-05-09 12:21:21 -03:00
  • 5b22bfbac2 Merge branch 'master' into coral-reaction Belén Curcio 2017-05-09 11:40:30 -03:00
  • c020008fad Merge branch 'master' into config-embed Belén Curcio 2017-05-09 10:54:52 -03:00
  • 4eb20108b1 Merge branch 'master' into approve-reject-noop Kiwi 2017-05-09 20:06:11 +07:00
  • 42db896d33 Merge branch 'master' into FE_Plugin_DOCS Kim Gardner 2017-05-09 08:09:36 -04:00
  • c0b526e98d Fix typo Kim Gardner 2017-05-09 08:03:18 -04:00
  • 743580fd08 Merge branch 'coral-reaction' of github.com:coralproject/talk into coral-reaction Belen Curcio 2017-05-09 09:02:32 -03:00
  • 788610a5f6 Like button params Belen Curcio 2017-05-09 09:02:04 -03:00
  • 3129828f83 Merge pull request #575 from coralproject/suspect-partial Kim Gardner 2017-05-09 07:53:11 -04:00
  • 58ce5d5055 Merge branch 'master' into coral-reaction Belén Curcio 2017-05-09 08:52:04 -03:00
  • f9259ead50 Merge branch 'master' into query-mutation-api Kiwi 2017-05-09 17:49:50 +07:00
  • 6fb227eb72 Merge branch 'master' into approve-reject-noop Kiwi 2017-05-09 17:49:30 +07:00
  • b8e530ca1f Merge branch 'master' into 142993479-tags Gabriela Rodríguez Berón 2017-05-08 21:08:28 -07:00
  • 8af7168f4f Merge branch 'master' into edit-comment Benjamin Goering 2017-05-08 19:26:38 -07:00
  • da0cebbda7 Fix the plugin TagLabel to show the staff tag. gaba 2017-05-08 17:06:49 -07:00
  • 7c09902294 The name for the tag is called ID. gaba 2017-05-08 16:55:11 -07:00
  • d77fcfe9de Merge branch 'master' into suspect-partial Riley Davis 2017-05-08 17:13:50 -06:00
  • 2490e65981 merge master Riley Davis 2017-05-08 17:09:23 -06:00
  • 96cd5197e3 Test was failing as I was not returning an error. gaba 2017-05-08 16:05:40 -07:00
  • 242f3ea5ea do not highlight partial word matches in admin since this is not how the backend works Riley Davis 2017-05-08 17:01:36 -06:00
  • e30bdd1cdc Merge branch 'master' into auth-tokens Wyatt Johnson 2017-05-08 16:11:27 -06:00
  • 5625f5b4b8 Merge pull request #566 from coralproject/context-from-comment Kim Gardner 2017-05-08 17:38:42 -04:00
  • b2c8e3b254 Merge branch 'master' into context-from-comment Kim Gardner 2017-05-08 17:34:55 -04:00
  • 3dff07de40 Merge pull request #572 from coralproject/mod-is-main-tab Kim Gardner 2017-05-08 17:34:43 -04:00
  • 19d7a3323e Merge branch 'master' into mod-is-main-tab Kim Gardner 2017-05-08 17:30:56 -04:00
  • dc86b87a62 Merge pull request #574 from coralproject/sub-fix Wyatt Johnson 2017-05-08 15:29:56 -06:00
  • 6dd01b4334 Merge branch 'master' into mod-is-main-tab Kim Gardner 2017-05-08 17:26:55 -04:00
  • b6e3796afe Merge branch 'master' into sub-fix Wyatt Johnson 2017-05-08 15:25:57 -06:00
  • 34ee1c56ea Merge pull request #573 from coralproject/move-queues Kim Gardner 2017-05-08 17:25:47 -04:00
  • 85d634c221 Merge branch 'master' into sub-fix Wyatt Johnson 2017-05-08 15:21:43 -06:00
  • 513a841aac Merge branch 'master' into coral-reaction Belén Curcio 2017-05-08 18:19:05 -03:00
  • 88861754f1 Adding full example with translations Belen Curcio 2017-05-08 18:05:54 -03:00
  • fe58a5076e Adding coral-plugin-love Belen Curcio 2017-05-08 18:05:39 -03:00
  • 3e258b1787 move approved tab Riley Davis 2017-05-08 14:59:23 -06:00
  • b82cab0655 Lint Belen Curcio 2017-05-08 17:50:15 -03:00
  • b547ad44f1 Better and more friendly API Belen Curcio 2017-05-08 17:46:56 -03:00
  • e04bf7f9bc Merge branch 'master' into approve-reject-noop Kim Gardner 2017-05-08 16:22:42 -04:00
  • 50d832c2f8 Remove pseudocode David Erwin 2017-05-08 16:21:24 -04:00
  • 0b06c233a8 Merge pull request #523 from coralproject/FE_Plugin_DOCS Kim Gardner 2017-05-08 16:20:27 -04:00
  • 7a3b36433a Merge branch 'master' into FE_Plugin_DOCS Kim Gardner 2017-05-08 16:16:34 -04:00
  • d478910a81 Merge pull request #570 from coralproject/add-supported-browsers-docs Belén Curcio 2017-05-08 17:15:16 -03:00
  • 743a96cd21 Removes debug statements. gaba 2017-05-08 13:09:17 -07:00
  • c4c0ee79cd Fix tests. gaba 2017-05-08 12:57:37 -07:00
  • 6310528804 Merge branch 'master' into 142993479-tags gaba 2017-05-05 14:54:54 -07:00
  • a90e1e132b Merge pull request #569 from coralproject/ui-overlaps Kim Gardner 2017-05-05 16:16:06 -04:00
  • 85fae3104e float: right; in css is just fine. Riley Davis 2017-05-05 14:05:52 -06:00
  • d262663e3f Merge pull request #568 from coralproject/user-fix Wyatt Johnson 2017-05-05 13:19:59 -06:00
  • 607ab6c0d6 Added privacy fix Wyatt Johnson 2017-05-05 13:14:34 -06:00
  • c72cb2428e Fixed errors on tags creation gaba 2017-05-05 14:33:02 -07:00
  • d7e72bb138 Fix tests. gaba 2017-05-05 14:09:00 -07:00
  • cb09c50820 Error on duplicate. gaba 2017-05-08 13:11:48 -07:00
  • 028e13761f Complete graphql code refactor in framework Chi Vinh Le 2017-05-09 03:05:19 +07:00
  • 57e7396997 Use correct fragment name Chi Vinh Le 2017-05-09 02:58:50 +07:00
  • 80d08bbe2e Port StopIgnoringUser Mutation Chi Vinh Le 2017-05-09 02:50:52 +07:00