 Chi Vinh Le
|
eb9846ba40
|
Merge branch 'master' into query-composition
Conflicts:
client/coral-embed-stream/src/Embed.js
client/coral-embed-stream/src/Stream.js
|
2017-04-26 01:22:14 +07:00 |
|
|
Chi Vinh Le
|
9d7524644c
|
Merge branch 'master' into query-composition
|
2017-04-26 01:11:07 +07:00 |
|
|
Chi Vinh Le
|
f142f3a27f
|
Introduce separateDataAndRoot
|
2017-04-26 01:10:16 +07:00 |
|
|
Chi Vinh Le
|
df2c33ac35
|
Introduce getDefinitionName
|
2017-04-26 01:07:07 +07:00 |
|
|
Chi Vinh Le
|
f79af56468
|
Better API for slot fragments
|
2017-04-26 00:44:02 +07:00 |
|
|
Belén Curcio
|
a4b9f86e29
|
Merge branch 'master' into shortcut-hint
|
2017-04-25 14:38:47 -03:00 |
|
|
Chi Vinh Le
|
15d410ba12
|
Workaround weird Apollo bug
|
2017-04-25 23:20:23 +07:00 |
|
|
Chi Vinh Le
|
54ea71bedf
|
Support fragments in plugins
|
2017-04-25 18:24:25 +07:00 |
|
|
Riley Davis
|
801ce13960
|
my fix did not work.
|
2017-04-24 14:19:01 -06:00 |
|
|
Riley Davis
|
b71b7cc883
|
move the shortcuts note logic into redux state
|
2017-04-24 14:04:57 -06:00 |
|
|
Riley Davis
|
b2428371c7
|
enable character counting on replies
|
2017-04-24 13:09:41 -06:00 |
|
|
Riley Davis
|
aaa5d17ca3
|
Merge branch 'master' into shortcut-hint
|
2017-04-24 12:34:44 -06:00 |
|
|
Kiwi
|
35938bbd38
|
Merge branch 'master' into quick-fix-permalinks
|
2017-04-25 01:10:12 +07:00 |
|
|
Chi Vinh Le
|
ac2a636274
|
Quickfix permalinks
|
2017-04-25 01:04:26 +07:00 |
|
|
Kim Gardner
|
31c6e2f891
|
Merge branch 'master' into comment-box-mobilify
|
2017-04-24 13:44:31 -04:00 |
|
|
Riley Davis
|
76e2066a51
|
reply box is squished on long comments in Firefox
|
2017-04-24 11:12:39 -06:00 |
|
|
Chi Vinh Le
|
027358913d
|
Use container
|
2017-04-24 23:35:49 +07:00 |
|
|
Chi Vinh Le
|
a91db35f91
|
Add comments for filter
|
2017-04-24 23:34:53 +07:00 |
|
|
Riley Davis
|
c60cfebde7
|
add some styles so mobile doesn't zoom the text box
|
2017-04-24 10:19:36 -06:00 |
|
|
Chi Vinh Le
|
c261cdc0c6
|
Compose comment fragments
|
2017-04-24 22:49:52 +07: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
|
d1ab279f74
|
add a little keyboard shortcut widget
|
2017-04-21 13:26:32 -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 |
|
|
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 |
|