 Belen Curcio
|
f9bece468f
|
Merge branch 'master' of github.com:coralproject/talk into featured-comments
|
2017-07-05 12:19:09 -03:00 |
|
|
Kim Gardner
|
c01d1f95bc
|
Merge pull request #735 from coralproject/french-translation
French translations
|
2017-07-05 15:59:36 +01:00 |
|
|
Belen Curcio
|
38e8bed68a
|
Merge branch 'featured-comments' of github.com:coralproject/talk into featured-comments
|
2017-07-05 11:36:26 -03:00 |
|
|
Kim Gardner
|
65d6d3221b
|
Merge branch 'master' into french-translation
|
2017-07-05 15:36:14 +01:00 |
|
|
Belen Curcio
|
3ca62cab65
|
wip
|
2017-07-05 11:36:03 -03:00 |
|
|
Kim Gardner
|
15af61de67
|
Merge pull request #738 from coralproject/threading
Deep Threading Support
|
2017-07-05 15:35:43 +01:00 |
|
|
Kim Gardner
|
1adca208dd
|
Merge branch 'master' into french-translation
|
2017-07-05 15:26:39 +01:00 |
|
|
Kim Gardner
|
935982cb08
|
Merge branch 'master' into threading
|
2017-07-05 15:23:45 +01:00 |
|
|
Belen Curcio
|
da6bd80de0
|
Merge branch 'master' of github.com:coralproject/talk into featured-comments
|
2017-07-05 11:07:42 -03:00 |
|
|
Kim Gardner
|
774e0cc12e
|
Merge branch 'master' into featured-comments
|
2017-07-05 14:29:17 +01:00 |
|
|
Kim Gardner
|
4b9f3390d3
|
Merge pull request #739 from coralproject/bump-version-2-2-1
Update version 2.2.1
v2.2.1
|
2017-07-05 11:57:27 +01:00 |
|
|
Kim Gardner
|
f94c36e9c9
|
Update version 2.2.1
|
2017-07-05 11:43:18 +01:00 |
|
|
Kim Gardner
|
c976ba0ea4
|
Merge branch 'master' into french-translation
|
2017-07-05 09:17:36 +01:00 |
|
|
Chi Vinh Le
|
6d71bcbee9
|
Fix styling issues
|
2017-07-04 22:56:58 +07:00 |
|
|
Chi Vinh Le
|
9be2a520db
|
Merge branch 'master' into threading
|
2017-07-04 22:42:49 +07:00 |
|
|
Chi Vinh Le
|
d155615102
|
Add pending comment
|
2017-07-04 22:41:38 +07:00 |
|
|
Kim Gardner
|
4d71a5a448
|
Merge pull request #737 from coralproject/fix-plugin-slot-logic
Fix isSlotEmpty logic and handle empty plugin_config
|
2017-07-04 16:35:05 +01:00 |
|
|
Chi Vinh Le
|
cfa7a74742
|
Fix isSlotEmpty logic and handle empty plugin_config
|
2017-07-04 22:22:52 +07:00 |
|
|
Chi Vinh Le
|
524be1b869
|
Allow customizing thread levels via TALK_THREADING_LEVEL env
|
2017-07-04 22:10:40 +07:00 |
|
|
Chi Vinh Le
|
31ab54d13c
|
First round styling
|
2017-07-04 21:32:33 +07:00 |
|
|
Belén Curcio
|
dcfbcd287b
|
Merge branch 'master' into featured-comments
|
2017-07-04 10:29:25 -03:00 |
|
|
David Erwin
|
c5203e3460
|
Merge pull request #734 from coralproject/dont-show-popup-when-empty
Don't show popup when empty
|
2017-07-03 14:40:31 -04:00 |
|
|
David Erwin
|
79c1bd9bdd
|
Merge branch 'master' into dont-show-popup-when-empty
|
2017-07-03 14:35:44 -04:00 |
|
|
Belen Curcio
|
4af9c3bee2
|
Merge branch 'featured-comments' of github.com:coralproject/talk into featured-comments
|
2017-07-03 15:32:48 -03:00 |
|
|
Belen Curcio
|
ec559f0f23
|
Merge branch 'master' of github.com:coralproject/talk into featured-comments
|
2017-07-03 15:32:40 -03:00 |
|
|
Belén Curcio
|
b902695cb7
|
Merge branch 'master' into featured-comments
|
2017-07-03 15:32:36 -03:00 |
|
|
David Erwin
|
e2575cb346
|
Merge pull request #733 from coralproject/disable-plugin-components-via-config
Disable plugin components via plugin_config
|
2017-07-03 14:28:54 -04:00 |
|
|
Belen Curcio
|
34dbbb0984
|
Removing Best from the core
|
2017-07-03 15:27:08 -03:00 |
|
|
Chi Vinh Le
|
3a2a4379b8
|
Change to 4 levels
|
2017-07-04 01:09:27 +07:00 |
|
|
Chi Vinh Le
|
f1899f2f4a
|
Threading support
|
2017-07-04 01:09:12 +07:00 |
|
|
Belén Curcio
|
4d821afa6a
|
Merge branch 'master' into disable-plugin-components-via-config
|
2017-07-03 15:08:36 -03:00 |
|
|
Belen Curcio
|
002dc377a6
|
Featured Comments container, and FeaturedComment component
|
2017-07-03 13:31:13 -03:00 |
|
|
Belen Curcio
|
fbdb044551
|
Moving withTags to the plugin api, adding perms to Feature comments
|
2017-07-03 11:55:09 -03:00 |
|
|
Belen Curcio
|
23ebe9f8e3
|
Translations and functionality
|
2017-07-03 11:46:34 -03:00 |
|
|
David Erwin
|
c16278221c
|
Merge pull request #719 from coralproject/docs-contribution-guide
Rewrite contributor's guide
|
2017-07-03 10:24:28 -04:00 |
|
|
David Erwin
|
a50b39091f
|
ABC Always Be Clarifying
|
2017-07-03 10:13:09 -04:00 |
|
|
David Erwin
|
4c7506e4f5
|
Merge branch 'docs-contribution-guide' of https://github.com/coralproject/talk into docs-contribution-guide
|
2017-07-03 10:06:56 -04:00 |
|
|
David Erwin
|
2f06281439
|
Move contributor's guide
|
2017-07-03 10:03:51 -04:00 |
|
|
Belen Curcio
|
e3aecd645e
|
Ádding withTags hoc, and creating withTags buttons
|
2017-07-03 10:16:35 -03:00 |
|
|
Belen Curcio
|
b8020d5347
|
Adding talk-plugins-featured-comments to the default json
|
2017-07-03 10:15:57 -03:00 |
|
|
Chi Vinh Le
|
fd1f8b24c1
|
Don't show popup when empty
|
2017-07-03 19:40:26 +07:00 |
|
|
Belen Curcio
|
95e820e9de
|
Creating Tag Featured
|
2017-07-03 09:25:18 -03:00 |
|
|
Chi Vinh Le
|
270c3b7634
|
Disable plugin components via plugin_config
|
2017-07-03 19:01:17 +07:00 |
|
|
Kim Gardner
|
e4647cab98
|
Merge branch 'master' into docs-contribution-guide
|
2017-07-03 12:12:56 +01:00 |
|
|
Kim Gardner
|
60b4909395
|
Merge pull request #732 from coralproject/update-lockfile
Update yarn.lock
v2.2.0
|
2017-06-30 17:53:57 +01:00 |
|
|
Kim Gardner
|
0973600e68
|
Update yarn.lock
|
2017-06-30 17:45:45 +01:00 |
|
|
Kim Gardner
|
e3ead31964
|
Merge pull request #731 from coralproject/button-states
Support post, reply, edit, load and view more loading states via global css classnames
|
2017-06-30 17:32:47 +01:00 |
|
|
Chi Vinh Le
|
7858ccc45d
|
Switch to prop-types
|
2017-06-30 23:25:11 +07:00 |
|
|
Chi Vinh Le
|
c1807daeaf
|
Correct spanish translation key
|
2017-06-30 21:10:19 +07:00 |
|
|
Chi Vinh Le
|
e244d4a286
|
Merge branch 'master' into button-states
Conflicts:
client/coral-embed-stream/src/components/Stream.js
|
2017-06-30 17:46:17 +07:00 |
|