Commit Graph

4030 Commits

Author SHA1 Message Date
gaba 05bf21fe09 Refactoring 2017-04-24 10:08:33 -05:00
Chi Vinh Le 11fb5421b5 Implement Stream Container 2017-04-24 19:27:54 +07:00
Chi Vinh Le 4dc3b0c2f4 Merge branch 'master' into query-composition-2
Conflicts:
	client/coral-embed-stream/src/Embed.js
	client/coral-embed-stream/src/components/Comment.js
	client/coral-embed-stream/src/index.js
	client/coral-framework/services/store.js
	client/coral-settings/containers/ProfileContainer.js
	graph/resolvers/root_query.js
2017-04-24 15:24:34 +07:00
Riley Davis 2743f6faf6 return all the known types 2017-04-21 16:44:42 -06:00
Gabriela Rodríguez Berón e337a0d18b Merge branch 'master' into subscriptions 2017-04-21 14:35:21 -07:00
Riley Davis d1ab279f74 add a little keyboard shortcut widget 2017-04-21 13:26:32 -06:00
Riley Davis 2a2a069cea more matching on the fragment 2017-04-21 12:50:29 -06:00
Riley Davis f20f0c5d10 Merge branch 'master' into all-comments-queue 2017-04-21 09:05:38 -06:00
Riley Davis 945b0b5df8 Merge branch 'master' into remove-rejected-comments 2017-04-20 18:04:11 -06:00
Riley Davis a58e15c4c8 let ApolloClient know which types are interfaces 2017-04-20 18:00:06 -06:00
David Erwin e8c3bdc5b1 Merge branch 'master' into mobilify-login-popup 2017-04-20 17:28:54 -04:00
Riley Davis bcf31e5fa9 reporting a comment zooms the window 2017-04-20 15:19:19 -06:00
Wyatt Johnson 1f562c8fad Merge branch 'master' into subscriptions 2017-04-20 15:17:44 -06:00
Riley Davis a2131c205a make the viewport non-scalable on mobile. make input font-size bigger to prevent mobile zoom effect 2017-04-20 15:14:15 -06:00
Riley Davis 8708fcf2cd actually, we want to have the action_summaries on all requests, since a plugin could potentially pre-flag a pre-mod comment 2017-04-20 14:37:48 -06:00
Riley Davis 3dc2674f47 the pre-mod tab does not request action_summaries since there wouldn't be any 2017-04-20 14:33:49 -06:00
Chi Vinh Le 4519a550a2 Fix fresh login on profile 2017-04-21 02:27:26 +07:00
David Erwin 00e24ce88a Merge branch 'master' into login-popup 2017-04-20 15:15:51 -04:00
Riley Davis 2d212393ff Merge branch 'master' into login-popup 2017-04-20 12:57:13 -06:00
Riley Davis d1729e5115 camel_case 2017-04-20 12:44:25 -06:00
Belén Curcio fc4b821f05 Merge branch 'master' into action-summary-fix 2017-04-20 15:04:09 -03:00
Chi Vinh Le 8fc2d5e8aa Merge branch 'login-popup' of ssh://github.com/coralproject/talk into login-popup 2017-04-21 00:54:45 +07:00
Chi Vinh Le f0e584f0b3 Restore login flow in ProfileContainer 2017-04-21 00:52:45 +07:00
Chi Vinh Le 6df2103da3 Remove obsolete offset and styling 2017-04-21 00:45:00 +07:00
Chi Vinh Le f3f1cc53fe Fix safari popup resizing 2017-04-21 00:27:26 +07:00
Belen Curcio c47047c3ff Classes 2017-04-20 14:23:44 -03:00
Belen Curcio c9207fd620 Merge branch 'login-popup' of github.com:coralproject/talk into login-popup 2017-04-20 14:19:04 -03:00
Belen Curcio 09cb518049 Merge branch 'master' of github.com:coralproject/talk into login-popup 2017-04-20 14:18:40 -03:00
Chi Vinh Le 5b7750f7a5 Reuse same store and action flows 2017-04-20 23:48:30 +07:00
Riley Davis 50774f1922 remove null checks 2017-04-20 10:04:28 -06:00
Chi Vinh Le b12d4ef4a2 WIP 2017-04-20 21:30:24 +07:00
Chi Vinh Le 348c01ae80 Fix linting errors 2017-04-20 20:58:45 +07:00
Chi Vinh Le 1b95fbd852 Remove SignInContainer from admin 2017-04-20 20:34:36 +07:00
Chi Vinh Le 3bf2187688 Fix crashing admin when using framework 2017-04-20 18:45:55 +07:00
Kiwi b7ffbdb762 Merge branch 'master' into action-label-fix 2017-04-20 16:48:12 +07:00
Riley Davis ffdec225c7 fix RespectButton component code 2017-04-19 22:02:57 -06:00
Riley Davis 59fbff3caf fix how FlagActionSummaries works in the embed 2017-04-19 21:15:03 -06:00
Belen Curcio 6155a46e71 Sign up popup 2017-04-19 18:10:09 -03:00
Belen Curcio 13965e1111 Adding actions, routes and login popup 2017-04-19 17:04:49 -03:00
Chi Vinh Le 3cd9e802dd WIP 2017-04-20 00:37:45 +07:00
Riley Davis 1abafb7037 Merge branch 'master' into flag-detail 2017-04-19 11:21:55 -06:00
Riley Davis 1535f10450 Merge branch 'master' into action-label-fix 2017-04-19 11:11:21 -06:00
Chi Vinh Le 34fee9439f Move active tab to redux 2017-04-19 23:26:26 +07:00
Riley Davis b34cd2d4c1 Merge branch 'master' into premod-load-collapse 2017-04-19 09:50:30 -06:00
Belén Curcio c72a5c6df9 Merge branch 'master' into action-label-fix 2017-04-19 12:05:59 -03:00
Belen Curcio 9ddc6c35fd Action labels default.css, temporary fix 2017-04-19 11:59:07 -03:00
Chi Vinh Le 6fb2a95bf2 Move query logic to coral-embed-stream 2017-04-19 20:28:14 +07:00
Chi Vinh Le f724353cf0 Fix collapsing UI 2017-04-19 16:38:02 +07:00
Chi Vinh Le 7698bdf930 Fix load more in premod queue 2017-04-19 16:35:53 +07:00
Chi Vinh Le d5d424bfc5 Merge branch 'master' into embed-refactor 2017-04-19 16:16:14 +07:00