 Belén CurcioandGitHub
|
64c79cf5f2
|
Merge branch 'master' into config-embed
|
2017-05-03 16:52:30 -03:00 |
|
Belen Curcio
|
17128e9a47
|
Adds redux to handle external config data
|
2017-05-02 15:18:04 -03:00 |
|
Belen Curcio
|
f0c846493a
|
Passing data from script tag, into Talk
|
2017-05-02 14:51:09 -03:00 |
|
Belen Curcio
|
1a50b6cc85
|
Ádding like as a reaction
|
2017-05-01 12:00:44 -03:00 |
|
Belen Curcio
|
f1bebaa627
|
Merge
|
2017-05-01 11:54:00 -03:00 |
|
Belen Curcio
|
8bed64373e
|
Removing LIKE from talk
|
2017-05-01 11:15:53 -03:00 |
|
Belen Curcio
|
322434f751
|
Removing LIKE from talk
|
2017-05-01 11:13:35 -03:00 |
|
Belen Curcio
|
c58813cf48
|
merge
|
2017-05-01 10:47:56 -03:00 |
|
Belen Curcio
|
d14b965f54
|
Adding fragment slots
|
2017-05-01 10:46:37 -03:00 |
|
Chi Vinh Le
|
8663aa0cb5
|
Fix polling reply count
|
2017-04-29 01:02:11 +07:00 |
|
 KiwiandGitHub
|
b186a74199
|
Merge branch 'master' into no-logic-user-box
|
2017-04-28 00:55:50 +07:00 |
|
 David ErwinandGitHub
|
06378209a2
|
Merge branch 'master' into optimise-initial-query
|
2017-04-27 13:49:12 -04:00 |
|
 Kim GardnerandGitHub
|
663bce2875
|
Merge branch 'master' into no-logic-user-box
|
2017-04-27 11:59:08 -04:00 |
|
Chi Vinh Le
|
8c53bc2d22
|
Postpone first query until checked login
|
2017-04-27 22:55:36 +07:00 |
|
 Riley DavisandGitHub
|
ea8e469c1c
|
Merge branch 'master' into report-popup-fix
|
2017-04-27 09:28:00 -06:00 |
|
Chi Vinh Le
|
7b16a71e9b
|
Remove embed stream logic from UserBox
|
2017-04-27 18:20:55 +07:00 |
|
Chi Vinh Le
|
20b4c4e2d0
|
Only query once during initial render
|
2017-04-27 17:30:43 +07:00 |
|
Belen Curcio
|
37e093f60a
|
Linting
|
2017-04-26 23:15:40 -03:00 |
|
Belen Curcio
|
de6492a26d
|
Ádding reactions, commentContent and updating current Slot
|
2017-04-26 23:06:09 -03:00 |
|
Belen Curcio
|
c60db41047
|
Updating slot name
|
2017-04-26 23:04:22 -03:00 |
|
Belen Curcio
|
9fa3e361b5
|
Ref Stream
|
2017-04-26 22:34:17 -03:00 |
|
Chi Vinh Le
|
d56c35ea64
|
Merge branch 'master' into query-composition
|
2017-04-26 19:28:46 +07:00 |
|
 Riley DavisandGitHub
|
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 ErwinandGitHub
|
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 |
|
 KiwiandGitHub
|
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 GardnerandGitHub
|
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 ErwinandGitHub
|
00e24ce88a
|
Merge branch 'master' into login-popup
|
2017-04-20 15:15:51 -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 |
|
 Belén CurcioandGitHub
|
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 |
|