Commit Graph

7162 Commits

Author SHA1 Message Date
gaba 6310528804 Merge branch 'master' into 142993479-tags 2017-05-08 13:12:23 -07:00
Kim Gardner a90e1e132b Merge pull request #569 from coralproject/ui-overlaps
Apply button overlapped text
2017-05-08 13:12:22 -07:00
Wyatt Johnson d262663e3f Merge pull request #568 from coralproject/user-fix
Added privacy fix
2017-05-08 13:12:21 -07:00
Riley Davis 85fae3104e float: right; in css is just fine. 2017-05-08 13:12:21 -07:00
Wyatt Johnson 607ab6c0d6 Added privacy fix 2017-05-08 13:12:20 -07:00
gaba c72cb2428e Fixed errors on tags creation 2017-05-08 13:12:19 -07:00
gaba d7e72bb138 Fix tests. 2017-05-08 13:12:18 -07:00
gaba cb09c50820 Error on duplicate. 2017-05-08 13:11:48 -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
Wyatt Johnson bc3c73a992 Fix for incorrect options passed to pubsub 2017-05-08 13:26:07 -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
David Erwin e2ed21e113 Adding building block documentation 2017-05-08 12:00:22 -04: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
David Erwin b019c5e180 Separate supported and experimental plugin guildes 2017-05-08 10:36:36 -04: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
Belén Curcio c920c7e9bc Merge branch 'master' into FE_Plugin_DOCS 2017-05-08 08:27:04 -03: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
Wyatt Johnson 95f9bac254 Initial migration to JWT 2017-05-05 15:42:34 -06:00
Kim Gardner 70bb6f6632 Merge branch 'master' into approve-reject-noop 2017-05-05 16:53:14 -04:00
Kim Gardner 19d62a8c63 Merge branch 'master' into add-supported-browsers-docs 2017-05-05 16:46:21 -04:00
Kim Gardner b15a2af38c Update formatting of License info 2017-05-05 16:45:15 -04:00
Riley Davis 4ff42385e3 remove dead code 2017-05-05 14:41:19 -06:00
Kim Gardner dc81a59908 Supported Browsers 2017-05-05 16:40:17 -04:00
Kim Gardner fe5ddbe323 Merge pull request #569 from coralproject/ui-overlaps
Apply button overlapped text
2017-05-05 16:16:06 -04:00
Riley Davis f8e8eef989 float: right; in css is just fine. 2017-05-05 14:05:52 -06:00
Riley Davis 9c4b636645 Merge branch 'master' into user-detail-ui 2017-05-05 13:56:45 -06:00
Riley Davis 8212a7e11b Merge branch 'master' into approve-reject-noop 2017-05-05 13:56:38 -06:00
Riley Davis 3fc19df240 Merge branch 'master' into context-from-comment 2017-05-05 13:56:28 -06:00
Chi Vinh Le 13e2382cd7 More code comments 2017-05-06 02:33:23 +07:00
Wyatt Johnson d0cca476e6 Merge pull request #568 from coralproject/user-fix
Added privacy fix
2017-05-05 13:19:59 -06:00