Commit Graph

3544 Commits

Author SHA1 Message Date
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 Gardner b2c8e3b254 Merge branch 'master' into context-from-comment 2017-05-08 17:34:55 -04:00
Kim Gardner 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 Davis 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 Goering 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
Chi Vinh Le ce38b9da64 Rename argument name 2017-05-08 19:41:14 +07:00
Benjamin Goering 81879c9bb9 Move getEditableUntilDate into util file 2017-05-08 00:05:14 -07:00
Benjamin Goering 9fb76d35c8 shorten some syntax that could be shorter 2017-05-07 23:54:51 -07:00
Benjamin Goering a7099295d6 CountdownSeconds component has its own file 2017-05-07 23:47:59 -07:00
Benjamin Goering 3d8c521928 CommentForm component is in its own file 2017-05-07 23:44:41 -07:00
Kim Gardner 70bb6f6632 Merge branch 'master' into approve-reject-noop 2017-05-05 16:53:14 -04:00
Riley Davis 4ff42385e3 remove dead code 2017-05-05 14:41:19 -06:00
Riley Davis f8e8eef989 float: right; in css is just fine. 2017-05-05 14:05:52 -06:00
Chi Vinh Le 13e2382cd7 More code comments 2017-05-06 02:33:23 +07:00
Riley Davis 519ca7beb5 en español 2017-05-05 11:55:28 -06:00
Riley Davis 5db48e8c0f make it a blue link instead of the whole thing 2017-05-05 11:35:18 -06:00
Chi Vinh Le 1b7eedfd8d Implement extendable GraphQL framework 2017-05-05 22:51:19 +07:00
Chi Vinh Le 8b3f69d964 Use getDisplayName from recompose 2017-05-05 22:40:54 +07:00
Riley Davis 5f9240f201 open the comment in context when clicked 2017-05-04 16:32:07 -06:00
Riley Davis f3f0b9c858 change mouse cursor for disabled buttons 2017-05-04 15:55:46 -06:00
Riley Davis 4507059a04 same thing for BanUserDialog and the keyboard shortcuts 2017-05-04 15:43:23 -06:00
Riley Davis 67b17160cb don't accept/reject when a comment is already accepted/rejected respectively 2017-05-04 14:42:43 -06:00
riley 57b0b5ec67 add a drawer for the user details 2017-05-04 13:58:43 -06:00
Riley Davis d255ea84b1 merge master 2017-05-04 11:19:01 -06:00
Belén Curcio 04812797a0 Merge branch 'master' into config-embed 2017-05-04 13:40:39 -03:00
Benjamin Goering 636d29af9f When max char count is disabled, allow posting long comments in CommentBox 2017-05-03 19:41:29 -07:00
Benjamin Goering 9b659b024e Add spanish translations for 2 new error strings 2017-05-03 19:27:32 -07:00