 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 |
|
|
Riley Davis
|
5db9ea6520
|
Merge pull request #520 from coralproject/shortcut-hint
add a little keyboard shortcut hint widget
|
2017-04-25 11:44:18 -06: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
|
3a7b17750e
|
Use unique name for fragment
|
2017-04-25 23:00:11 +07:00 |
|
|
Chi Vinh Le
|
4bacc2b0c2
|
Update Apollo
|
2017-04-25 22:31:59 +07:00 |
|
|
Chi Vinh Le
|
3d10534da1
|
RespectPlugin use fat query
|
2017-04-25 19:54:54 +07:00 |
|
|
Chi Vinh Le
|
54ea71bedf
|
Support fragments in plugins
|
2017-04-25 18:24:25 +07:00 |
|
|
Kim Gardner
|
c74de328f2
|
Merge pull request #529 from coralproject/undo-mobile-fix-attempt
reset the button css fixes
v1.5.2
|
2017-04-24 16:38:39 -04: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 |
|
|
Kim Gardner
|
78ef98bc8c
|
Merge pull request #528 from coralproject/reply-char-count
enable character counting on replies
|
2017-04-24 15:52:35 -04:00 |
|
|
Riley Davis
|
b2428371c7
|
enable character counting on replies
|
2017-04-24 13:09:41 -06:00 |
|
|
Kim Gardner
|
bb4f660bb6
|
Merge pull request #527 from coralproject/quick-fix-permalinks
Quickfix permalinks
|
2017-04-24 14:40:13 -04:00 |
|
|
Riley Davis
|
aaa5d17ca3
|
Merge branch 'master' into shortcut-hint
|
2017-04-24 12:34:44 -06:00 |
|
|
Kim Gardner
|
f6938271f6
|
Merge branch 'master' into quick-fix-permalinks
|
2017-04-24 14:34:03 -04:00 |
|
|
Kim Gardner
|
54b5dcb244
|
Merge pull request #517 from coralproject/status-fix
Fixed bug with status changes in the graph
|
2017-04-24 14:33:37 -04: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
|
56e2f70ebb
|
Merge branch 'master' into status-fix
|
2017-04-24 13:52:39 -04:00 |
|
|
Kim Gardner
|
188db361ac
|
Merge pull request #524 from coralproject/comment-box-mobilify
add some styles so mobile doesn't zoom the text box
|
2017-04-24 13:48:45 -04:00 |
|
|
Kim Gardner
|
31c6e2f891
|
Merge branch 'master' into comment-box-mobilify
|
2017-04-24 13:44:31 -04:00 |
|
|
Kim Gardner
|
a8a32ef36f
|
Merge pull request #525 from coralproject/reply-length
reply box is squished on long comments in Firefox
|
2017-04-24 13:44:21 -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 |
|
|
Gabriela Rodríguez Berón
|
a41108a53c
|
Merge branch 'master' into shortcut-hint
|
2017-04-21 15:10:42 -07:00 |
|
|
Riley Davis
|
d1ab279f74
|
add a little keyboard shortcut widget
|
2017-04-21 13:26:32 -06:00 |
|
|
Gabriela Rodríguez Berón
|
c68afe9819
|
Merge branch 'master' into status-fix
|
2017-04-21 11:56:44 -07:00 |
|
|
Gabriela Rodríguez Berón
|
fcf25e0b96
|
Merge pull request #518 from coralproject/flag-action-fix
Added fix for flag actions
|
2017-04-21 11:56:24 -07: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 |
|
|
David Erwin
|
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 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
|
0dee09dd93
|
Merge pull request #515 from coralproject/mobilify-login-popup
Mobilify login popup
|
2017-04-20 17:42:00 -04: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
|
4ae68b4bd3
|
make the login pop-up scale on mobile
|
2017-04-20 15:07:55 -06:00 |
|
|
David Erwin
|
267338c851
|
Merge pull request #514 from coralproject/premod-queue-fix
Premod queue fix
|
2017-04-20 16:57:43 -04:00 |
|
|
Riley Davis
|
fddd8d63c7
|
Merge branch 'master' into premod-queue-fix
|
2017-04-20 14:53:51 -06:00 |
|