 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 |
|
|
Kim Gardner
|
3bb994c562
|
Merge branch 'master' into profanity-verbiage
|
2017-04-27 11:35:47 -04:00 |
|
|
Chi Vinh Le
|
794cc0fc6c
|
Support login on all IOS browsers
|
2017-04-27 19:28:54 +07:00 |
|
|
David Erwin
|
5eb26946cb
|
Merge branch 'master' into profanity-verbiage
|
2017-04-26 17:21:34 -04:00 |
|
|
David Erwin
|
077daeb793
|
Merge branch 'master' into subscriptions
|
2017-04-26 16:55:32 -04:00 |
|
|
Riley Davis
|
a793d63f65
|
Merge branch 'master' into profanity-verbiage
|
2017-04-26 11:45:20 -06:00 |
|
|
Riley Davis
|
ccc512cddd
|
if there is no available translation, do not show error.whatever in the UI
|
2017-04-26 11:43:34 -06:00 |
|
|
Chi Vinh Le
|
cb5228a423
|
Document getSlotFragments
|
2017-04-26 01:58: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
|
54ea71bedf
|
Support fragments in plugins
|
2017-04-25 18:24:25 +07:00 |
|
|
Chi Vinh Le
|
a91db35f91
|
Add comments for filter
|
2017-04-24 23:34:53 +07: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 |
|
|
Wyatt Johnson
|
1f562c8fad
|
Merge branch 'master' into subscriptions
|
2017-04-20 15:17:44 -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 |
|
|
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
|
f3f1cc53fe
|
Fix safari popup resizing
|
2017-04-21 00:27:26 +07: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
|
3bf2187688
|
Fix crashing admin when using framework
|
2017-04-20 18:45:55 +07:00 |
|
|
Riley Davis
|
ffdec225c7
|
fix RespectButton component code
|
2017-04-19 22:02:57 -06: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
|
6fb2a95bf2
|
Move query logic to coral-embed-stream
|
2017-04-19 20:28:14 +07:00 |
|
|
Chi Vinh Le
|
d5d424bfc5
|
Merge branch 'master' into embed-refactor
|
2017-04-19 16:16:14 +07:00 |
|
|
Wyatt Johnson
|
ecbb66e270
|
Fix linting
|
2017-04-18 15:53:15 -06:00 |
|
|
Wyatt Johnson
|
45094fd176
|
Optimized sub model
|
2017-04-18 15:48:33 -06:00 |
|
|
Wyatt Johnson
|
e1c8e75405
|
Merge branch 'master' into subscriptions
|
2017-04-18 15:43:25 -06:00 |
|
|
Chi Vinh Le
|
4ce4c74fd9
|
Return a value for notification actions
|
2017-04-19 01:09:59 +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 |
|
|
Belén Curcio
|
ad15b38a5d
|
Merge branch 'master' into plugin_examples
|
2017-04-18 13:46:44 -03:00 |
|
|
Chi Vinh Le
|
af5be0469f
|
Refactor embed
|
2017-04-18 23:20:39 +07:00 |
|
|
gaba
|
f66e12be18
|
Merge branch 'master' into 143520971-stream-settings
|
2017-04-17 12:07:19 -07:00 |
|
|
Belen Curcio
|
e729a673a3
|
Merge branch 'master' of github.com:coralproject/talk into plugin_examples
|
2017-04-17 14:17:42 -03:00 |
|
|
Wyatt Johnson
|
7fac8ef073
|
Merge branch 'master' into subscriptions
|
2017-04-17 08:03:14 -06: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 |
|
|
Belen Curcio
|
78286d3374
|
Running CommentBox reducers and triggering actions from Plugins!
|
2017-04-12 20:51:18 -03:00 |
|
|
Belen Curcio
|
7424fc9774
|
Create comments with Tags
|
2017-04-12 19:42:39 -03:00 |
|
|
Belen Curcio
|
7fca451263
|
Immutable plugins
|
2017-04-12 19:21:55 -03:00 |
|