 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 |
|
|
Belen Curcio
|
f18191793b
|
fe plugins
|
2017-04-23 13:09:52 -03:00 |
|
|
Riley Davis
|
2743f6faf6
|
return all the known types
|
2017-04-21 16:44:42 -06:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
a41108a53c
|
Merge branch 'master' into shortcut-hint
|
2017-04-21 15:10:42 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
e337a0d18b
|
Merge branch 'master' into subscriptions
|
2017-04-21 14:35:21 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
e9c81f0639
|
Merge branch 'master' into all-comments-queue
|
2017-04-21 14:31:16 -07:00 |
|
|
gaba
|
c4ffe58f58
|
Adds privacy type to the methods to add tags.
|
2017-04-21 14:30:41 -07:00 |
|
|
Wyatt Johnson
|
441ea12a65
|
Added user metadata
|
2017-04-21 15:22:52 -06:00 |
|
|
gaba
|
0a4fd15fa2
|
Merge branch 'master' into 142993479-tags
|
2017-04-21 12:51:05 -07:00 |
|
|
Riley Davis
|
d1ab279f74
|
add a little keyboard shortcut widget
|
2017-04-21 13:26:32 -06:00 |
|
|
Riley DavisandGitHub
|
387e52b510
|
Merge branch 'master' into more-fragment-matcher
|
2017-04-21 12:56:47 -06:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
c68afe9819
|
Merge branch 'master' into status-fix
|
2017-04-21 11:56:44 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
fcf25e0b96
|
Merge pull request #518 from coralproject/flag-action-fix
Added fix for flag actions
|
2017-04-21 11:56:24 -07:00 |
|
|
Riley Davis
|
2a2a069cea
|
more matching on the fragment
|
2017-04-21 12:50:29 -06:00 |
|
|
Wyatt Johnson
|
5048fbb7f0
|
Added fix for flag actions
|
2017-04-21 12:47:21 -06:00 |
|
|
Wyatt Johnson
|
4e060b884b
|
Fixed bug with status changes in the graph
|
2017-04-21 12:12:29 -06:00 |
|
|
gaba
|
b52325f8e9
|
Merge branch 'master' into 142993479-tags
|
2017-04-21 10:36:28 -07:00 |
|
|
gaba
|
91af8c2ece
|
Index on Tag for name, item id, item type.
|
2017-04-21 10:34:57 -07:00 |
|
|
Riley DavisandGitHub
|
f20f0c5d10
|
Merge branch 'master' into all-comments-queue
|
2017-04-21 09:05:38 -06:00 |
|
|
David ErwinandGitHub
|
35f01c2ecc
|
Merge pull request #516 from coralproject/remove-rejected-comments
let ApolloClient know which types are interfaces
v1.5.1
|
2017-04-20 20:08:50 -04:00 |
|
|
Riley DavisandGitHub
|
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 |
|
|
gaba
|
962a9bd6c9
|
That was so so so silly...
|
2017-04-20 14:42:57 -07:00 |
|
|
David ErwinandGitHub
|
0dee09dd93
|
Merge pull request #515 from coralproject/mobilify-login-popup
Mobilify login popup
|
2017-04-20 17:42:00 -04:00 |
|
|
David ErwinandGitHub
|
e8c3bdc5b1
|
Merge branch 'master' into mobilify-login-popup
|
2017-04-20 17:28:54 -04:00 |
|
|
Wyatt Johnson
|
b559b81198
|
Removed some demo code
|
2017-04-20 15:20:07 -06:00 |
|
|
Riley Davis
|
bcf31e5fa9
|
reporting a comment zooms the window
|
2017-04-20 15:19:19 -06:00 |
|
|
Wyatt JohnsonandGitHub
|
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
|
4ae68b4bd3
|
make the login pop-up scale on mobile
|
2017-04-20 15:07:55 -06:00 |
|
|
David ErwinandGitHub
|
267338c851
|
Merge pull request #514 from coralproject/premod-queue-fix
Premod queue fix
|
2017-04-20 16:57:43 -04:00 |
|
|
Riley DavisandGitHub
|
fddd8d63c7
|
Merge branch 'master' into premod-queue-fix
|
2017-04-20 14:53:51 -06:00 |
|
|
David ErwinandGitHub
|
bdd8ec3789
|
Merge pull request #505 from coralproject/default-resolve-type
Added defaultResolveType
|
2017-04-20 16:40:24 -04: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 |
|
|
David ErwinandGitHub
|
1db168df8c
|
Merge branch 'master' into default-resolve-type
|
2017-04-20 16:33:54 -04: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 |
|
|
David ErwinandGitHub
|
1ec30854c2
|
Merge pull request #510 from coralproject/login-popup
Login Popup
|
2017-04-20 16:10:18 -04:00 |
|
|
David ErwinandGitHub
|
7c38b9b54f
|
Merge branch 'master' into default-resolve-type
|
2017-04-20 16:03:38 -04:00 |
|
|
gaba
|
183dab9826
|
Merge branch 'master' into 142993479-tags
|
2017-04-20 12:34:32 -07:00 |
|
|
gaba
|
8458a9aecc
|
fixed lint error.
|
2017-04-20 12:29:21 -07:00 |
|
|
Chi Vinh Le
|
4519a550a2
|
Fix fresh login on profile
|
2017-04-21 02:27:26 +07:00 |
|
|
gaba
|
bd72bfc6ec
|
Fix tests related to tags on comments.
|
2017-04-20 12:24:08 -07:00 |
|
|
David ErwinandGitHub
|
00e24ce88a
|
Merge branch 'master' into login-popup
|
2017-04-20 15:15:51 -04:00 |
|
|
David ErwinandGitHub
|
467a32038e
|
Merge pull request #512 from coralproject/action-summary-fix
Action summary fix - Part Deux
|
2017-04-20 15:15:38 -04:00 |
|
|
Riley DavisandGitHub
|
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 |
|
|
David ErwinandGitHub
|
85e552cf04
|
Merge branch 'master' into action-summary-fix
|
2017-04-20 14:40:16 -04:00 |
|
|
David ErwinandGitHub
|
2c5f46b3ae
|
Merge pull request #513 from coralproject/fix-ignored-user-error
Fix ignored users when not logged in
|
2017-04-20 14:39:24 -04:00 |
|
|
Chi Vinh Le
|
3ff9313b03
|
Fix ignored users when not logged in
|
2017-04-21 01:18:51 +07:00 |
|