wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-15 11:26:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,039 Commits 10 Branches 125 Tags
b8d00ec9ceee3b5fd41e809c6400a6cf435d0ee1
Commit Graph
2716 Commits
Author SHA1 Message Date
Belen Curcio 19bf7f6cf8 Adds displayName for WrappedReactions 2017-05-10 13:58:05 -03:00
Belen Curcio ad24ff78d2 Merge branch 'master' of github.com:coralproject/talk into coral-reaction 2017-05-10 13:46:11 -03:00
Gabriela Rodríguez BerónandGitHub f1e4f98055 Merge branch 'master' into 142993479-tags 2017-05-10 08:50:28 -07:00
Riley Davis fe279587b5 add staff to dropdown 2017-05-10 09:25:39 -06:00
Belén CurcioandGitHub ca51821d7b Merge branch 'master' into config-embed 2017-05-10 12:01:29 -03:00
Belen Curcio 250a578dd7 lint, and merge conficts 2017-05-10 11:05:21 -03:00
Belén CurcioandGitHub af89ef45f2 Merge branch 'master' into coral-reaction 2017-05-09 15:54:36 -03:00
Belen Curcio 8c219c1c4d Adding config with initial 2017-05-09 15:53:57 -03:00
Kim GardnerandGitHub b81b789afa Merge branch 'master' into query-mutation-api 2017-05-09 14:29:27 -04:00
Benjamin GoeringandGitHub 994b5006b6 Merge branch 'master' into edit-comment 2017-05-09 09:12:14 -07:00
Riley Davis 084f6b28ed merge master 2017-05-09 10:06:41 -06:00
Belen Curcio 3c06ee9360 Adds slots to admin stream 2017-05-09 12:21:21 -03:00
Belén CurcioandGitHub 5b22bfbac2 Merge branch 'master' into coral-reaction 2017-05-09 11:40:30 -03:00
Belén CurcioandGitHub c020008fad Merge branch 'master' into config-embed 2017-05-09 10:54:52 -03:00
KiwiandGitHub 4eb20108b1 Merge branch 'master' into approve-reject-noop 2017-05-09 20:06:11 +07:00
Belén CurcioandGitHub 58ce5d5055 Merge branch 'master' into coral-reaction 2017-05-09 08:52:04 -03:00
KiwiandGitHub f9259ead50 Merge branch 'master' into query-mutation-api 2017-05-09 17:49:50 +07:00
KiwiandGitHub 6fb227eb72 Merge branch 'master' into approve-reject-noop 2017-05-09 17:49:30 +07:00
Gabriela Rodríguez BerónandGitHub b8e530ca1f Merge branch 'master' into 142993479-tags 2017-05-08 21:08:28 -07:00
Benjamin GoeringandGitHub 8af7168f4f Merge branch 'master' into edit-comment 2017-05-08 19:26:38 -07:00
gaba da0cebbda7 Fix the plugin TagLabel to show the staff tag. 2017-05-08 17:06:49 -07:00
gaba 7c09902294 The name for the tag is called ID. 2017-05-08 16:55:11 -07:00
Riley Davis 2490e65981 merge master 2017-05-08 17:09:23 -06:00
Riley Davis 242f3ea5ea do not highlight partial word matches in admin since this is not how the backend works 2017-05-08 17:01:36 -06:00
Kim GardnerandGitHub b2c8e3b254 Merge branch 'master' into context-from-comment 2017-05-08 17:34:55 -04:00
Kim GardnerandGitHub 6dd01b4334 Merge branch 'master' into mod-is-main-tab 2017-05-08 17:26:55 -04:00
Riley Davis 3e258b1787 move approved tab 2017-05-08 14:59:23 -06:00
Belen Curcio b82cab0655 Lint 2017-05-08 17:50:15 -03:00
Belen Curcio b547ad44f1 Better and more friendly API 2017-05-08 17:46:56 -03:00
Riley Davisandgaba 85fae3104e float: right; in css is just fine. 2017-05-08 13:12:21 -07:00
Chi Vinh Le 028e13761f Complete graphql code refactor in framework 2017-05-09 03:05:19 +07:00
Chi Vinh Le 57e7396997 Use correct fragment name 2017-05-09 02:58:50 +07:00
Chi Vinh Le 80d08bbe2e Port StopIgnoringUser Mutation 2017-05-09 02:50:52 +07:00
Chi Vinh Le 5c44922d2b Port IgnoreUser mutation 2017-05-09 02:46:42 +07:00
Chi Vinh Le 7077300dbc Fix refetchQueries 2017-05-09 02:45:28 +07:00
Riley Davis c00e6c1ece default view is moderate > all 2017-05-08 13:40:24 -06:00
Chi Vinh Le 774a6f68ac Port RemoveCommentTag Mutation 2017-05-09 02:22:44 +07:00
Chi Vinh Le b87c36078a Port AddCommentTag Mutation 2017-05-09 02:19:55 +07:00
Belen Curcio 6934263f71 Ádding uuid v4 2017-05-08 15:59:52 -03:00
Belen Curcio cd18a7e76f Fully working. replaced typename by typereaction. Thanks kiwi 😂 2017-05-08 15:51:17 -03:00
Belen Curcio b7de01b0ad no console 2017-05-08 15:47:08 -03:00
Belen Curcio 011e5da26f Almost fully working 2017-05-08 15:44:11 -03:00
Chi Vinh Le 0e931d023d Port DeleteAction Mutation 2017-05-09 01:15:07 +07:00
Benjamin GoeringandGitHub 295de61f36 Merge branch 'master' into edit-comment 2017-05-08 10:00:58 -07:00
Benjamin Goering 096025b72a Add asset_id to editComment mutation to allow mongo query happy path to be atomic 2017-05-08 09:57:52 -07:00
Chi Vinh Le 83ef41000c Port PostDontAgree mutation 2017-05-08 22:56:01 +07:00
Chi Vinh Le 10796ed4b3 Port PostFlag mutation 2017-05-08 22:35:59 +07:00
Chi Vinh Le 7f0b3c2ddd Merge branch 'master' into query-mutation-api 
Conflicts:
	client/coral-embed-stream/src/components/Comment.js
	client/coral-embed-stream/src/containers/Stream.js
 2017-05-08 21:44:35 +07:00
Belen Curcio a5f6e1f343 Adding coral-reaction 2017-05-08 11:32:46 -03:00
Chi Vinh Le 4c17cec4fd Lazily resolve fragments in queries and mutations 2017-05-08 21:30:25 +07:00