 David Erwin
|
06378209a2
|
Merge branch 'master' into optimise-initial-query
|
2017-04-27 13:49:12 -04:00 |
|
|
Chi Vinh Le
|
8c53bc2d22
|
Postpone first query until checked login
|
2017-04-27 22:55:36 +07:00 |
|
|
Riley Davis
|
ea8e469c1c
|
Merge branch 'master' into report-popup-fix
|
2017-04-27 09:28:00 -06:00 |
|
|
Chi Vinh Le
|
20b4c4e2d0
|
Only query once during initial render
|
2017-04-27 17:30:43 +07:00 |
|
|
Chi Vinh Le
|
d56c35ea64
|
Merge branch 'master' into query-composition
|
2017-04-26 19:28:46 +07:00 |
|
|
Riley Davis
|
7db5e4d68b
|
Merge branch 'master' into report-popup-fix
|
2017-04-25 16:14:56 -06:00 |
|
|
riley
|
f3822d09b2
|
position the reporting popup in a more reliable way
|
2017-04-25 15:54:18 -06:00 |
|
|
David Erwin
|
d4c4b5a3e9
|
Merge branch 'master' into fix-view-more
|
2017-04-25 15:26:20 -04:00 |
|
|
Belen Curcio
|
9c448d5143
|
View More working with asset_id
|
2017-04-25 16:17:10 -03:00 |
|
|
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 |
|
|
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
|
b2428371c7
|
enable character counting on replies
|
2017-04-24 13:09:41 -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 |
|
|
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
|
bcf31e5fa9
|
reporting a comment zooms the window
|
2017-04-20 15:19:19 -06: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
|
6df2103da3
|
Remove obsolete offset and styling
|
2017-04-21 00:45:00 +07:00 |
|
|
Chi Vinh Le
|
5b7750f7a5
|
Reuse same store and action flows
|
2017-04-20 23:48:30 +07:00 |
|
|
Chi Vinh Le
|
b12d4ef4a2
|
WIP
|
2017-04-20 21:30:24 +07:00 |
|
|
Chi Vinh Le
|
3bf2187688
|
Fix crashing admin when using framework
|
2017-04-20 18:45:55 +07: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 |
|
|
Chi Vinh Le
|
34fee9439f
|
Move active tab to redux
|
2017-04-19 23:26:26 +07: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
|
d3b81dff35
|
Merge branch 'master' into embed-refactor
Conflicts:
client/coral-plugin-commentbox/CommentBox.js
|
2017-04-19 00:18:50 +07:00 |
|
|
Chi Vinh Le
|
af5be0469f
|
Refactor embed
|
2017-04-18 23:20:39 +07:00 |
|
|
Chi Vinh Le
|
b40eed4751
|
Move to components folder
|
2017-04-18 23:14:28 +07:00 |
|
|
Belen Curcio
|
e729a673a3
|
Merge branch 'master' of github.com:coralproject/talk into plugin_examples
|
2017-04-17 14:17:42 -03:00 |
|
|
Benjamin Goering
|
118da885fd
|
Merge branch 'master' of github.com:coralproject/talk into ignore_rb2
|
2017-04-13 12:12:10 -05:00 |
|
|
Belen Curcio
|
7969985f59
|
Merge branch 'master' of github.com:coralproject/talk into plugin_examples
|
2017-04-12 22:27:46 -03:00 |
|
|
Kim Gardner
|
d892d1327d
|
Merge branch 'master' into fix-more-buttons
|
2017-04-12 15:12:27 -04:00 |
|