 Kim Gardner
|
bf7dfefcdf
|
Merge branch 'master' into asset-graph-api
|
2017-08-29 18:52:17 +01:00 |
|
|
Kim Gardner
|
081cdfa145
|
Merge pull request #897 from coralproject/sort-enhancements
Sort enhancements
|
2017-08-29 18:50:34 +01:00 |
|
|
Kiwi
|
fecfcf91ef
|
Merge branch 'master' into sort-enhancements
|
2017-08-29 19:39:59 +02:00 |
|
|
Chi Vinh Le
|
90a0446afa
|
Move Spinner down to replacing TabContent
|
2017-08-30 00:35:55 +07:00 |
|
|
Kim Gardner
|
ec5c7f32b0
|
Merge pull request #895 from coralproject/my-comment-reactions
My comment reactions
|
2017-08-29 18:32:54 +01:00 |
|
|
Chi Vinh Le
|
21e4cf5865
|
Live update replies on all sort and always refetch
|
2017-08-30 00:27:14 +07:00 |
|
|
Kim Gardner
|
6894060648
|
Merge branch 'master' into my-comment-reactions
|
2017-08-29 18:24:54 +01:00 |
|
|
Kim Gardner
|
95d14fc5a6
|
Merge pull request #896 from coralproject/fix-popup-interval
Fix endless interval
|
2017-08-29 18:11:58 +01:00 |
|
|
Chi Vinh Le
|
46c031b35d
|
Fix endless interval
|
2017-08-29 23:53:00 +07:00 |
|
|
Wyatt Johnson
|
c786805505
|
small bug fix
|
2017-08-29 10:28:30 -06:00 |
|
|
Wyatt Johnson
|
75125993b9
|
Added patch for missing action summary type
|
2017-08-29 10:21:31 -06:00 |
|
|
Kim Gardner
|
393005fce6
|
Merge pull request #889 from coralproject/my-comment-reactions
My Comment Reactions
|
2017-08-29 16:33:00 +01:00 |
|
|
Kim Gardner
|
952b253969
|
Merge branch 'master' into my-comment-reactions
|
2017-08-29 16:24:49 +01:00 |
|
|
Kim Gardner
|
ad06d5136b
|
Merge pull request #893 from coralproject/email-regex-fix
Changed email verification regex
|
2017-08-29 16:24:17 +01:00 |
|
|
Kim Gardner
|
d987724c7d
|
Merge branch 'master' into email-regex-fix
|
2017-08-29 16:18:40 +01:00 |
|
|
Belen Curcio
|
9140688c65
|
Merge branch 'my-comment-reactions' of github.com:coralproject/talk into my-comment-reactions
|
2017-08-29 09:03:02 -03:00 |
|
|
Belen Curcio
|
1053c55d19
|
Adding zero state style for 0 counts
|
2017-08-29 09:01:40 -03:00 |
|
|
Belen Curcio
|
da92a8e7c2
|
Plural and singular translations
|
2017-08-29 08:47:23 -03:00 |
|
|
Kiwi
|
d4c9749133
|
Merge branch 'master' into asset-graph-api
|
2017-08-29 12:59:26 +02:00 |
|
|
Kim Gardner
|
a76464ea16
|
Merge branch 'master' into my-comment-reactions
|
2017-08-29 10:22:58 +01:00 |
|
|
Kim Gardner
|
b76f1956dc
|
Merge pull request #892 from coralproject/asset-tests
Added duplicated comments tests
|
2017-08-29 10:12:52 +01:00 |
|
|
Wyatt Johnson
|
90a8a87eaf
|
Added graph API for assets
|
2017-08-28 18:57:32 -06:00 |
|
|
Wyatt Johnson
|
7823b65c7d
|
Changed email verification regex, fixes #891
|
2017-08-28 16:51:41 -06:00 |
|
|
Wyatt Johnson
|
38f98c7c43
|
Added duplicated comments tests
|
2017-08-28 16:41:58 -06:00 |
|
|
Wyatt Johnson
|
df6f6a72ef
|
Merge pull request #885 from coralproject/subscriber
Adding new Slot: commentAuthorTags
|
2017-08-28 16:18:32 -06:00 |
|
|
Wyatt Johnson
|
c09381ff84
|
Merge branch 'master' into subscriber
|
2017-08-28 15:40:31 -06:00 |
|
|
Wyatt Johnson
|
a172f5be51
|
Merge pull request #881 from coralproject/feature/heroku-deploy
Heroku Deploy
|
2017-08-28 15:39:52 -06:00 |
|
|
Wyatt Johnson
|
2fec9e3c0f
|
Merge branch 'master' into feature/heroku-deploy
|
2017-08-28 15:33:24 -06:00 |
|
|
Belen Curcio
|
e77bdf0b90
|
linting
|
2017-08-28 16:31:46 -03:00 |
|
|
Belen Curcio
|
3e045291ee
|
Translations added
|
2017-08-28 16:30:17 -03:00 |
|
|
Belen Curcio
|
93c1ecd12d
|
My Comment Reactions
|
2017-08-28 16:25:26 -03:00 |
|
|
Kim Gardner
|
a570626787
|
Merge pull request #888 from coralproject/debugging-optim
Increased debugging and optimized a query path
v3.3.0
|
2017-08-28 18:55:07 +01:00 |
|
|
Wyatt Johnson
|
e92f75d4ad
|
Merge branch 'master' into debugging-optim
|
2017-08-28 11:50:02 -06:00 |
|
|
Wyatt Johnson
|
057d8cabd2
|
Increased debugging and optimized a query path
|
2017-08-28 11:47:51 -06:00 |
|
|
Kiwi
|
4f901d0d56
|
Merge branch 'master' into subscriber
|
2017-08-28 19:43:54 +02:00 |
|
|
Kim Gardner
|
9af0c5e01a
|
Merge pull request #887 from coralproject/fix-action-type-query
Fix `action_type` query
|
2017-08-28 18:28:54 +01:00 |
|
|
Kiwi
|
afd3b1b3fe
|
Merge branch 'master' into fix-action-type-query
|
2017-08-28 19:21:19 +02:00 |
|
|
Chi Vinh Le
|
44c6798959
|
Fix action_type query
|
2017-08-29 00:20:36 +07:00 |
|
|
Belén Curcio
|
e14d6007a7
|
Merge branch 'master' into subscriber
|
2017-08-28 13:12:19 -03:00 |
|
|
Wyatt Johnson
|
1aa4f83c89
|
Merge pull request #886 from coralproject/query-fix
Fixed query
|
2017-08-28 09:47:28 -06:00 |
|
|
Wyatt Johnson
|
8cfccb7b00
|
fixed query
|
2017-08-28 09:42:37 -06:00 |
|
|
Kim Gardner
|
c05bee2316
|
Merge pull request #880 from coralproject/load-more-history
Only load my own comments in history
|
2017-08-28 16:37:11 +01:00 |
|
|
Kiwi
|
f4365eb848
|
Merge branch 'master' into load-more-history
|
2017-08-28 17:27:04 +02:00 |
|
|
Belén Curcio
|
96006a0196
|
Merge branch 'master' into subscriber
|
2017-08-28 12:26:08 -03:00 |
|
|
Chi Vinh Le
|
9436188487
|
Merge branch 'master' into load-more-history
Conflicts:
client/coral-settings/containers/ProfileContainer.js
|
2017-08-28 22:25:20 +07:00 |
|
|
Kim Gardner
|
733d8e1eae
|
Merge pull request #882 from coralproject/fix-permalink-liveupdates
Fix live update false comments in permalink view
|
2017-08-28 16:23:57 +01:00 |
|
|
Belén Curcio
|
3108f3dac3
|
Merge branch 'master' into subscriber
|
2017-08-28 12:22:05 -03:00 |
|
|
Kim Gardner
|
1e2c617775
|
Merge branch 'master' into fix-permalink-liveupdates
|
2017-08-28 16:17:40 +01:00 |
|
|
Belen Curcio
|
12d66a49d0
|
Adding commentAuthorTags
|
2017-08-28 12:17:01 -03:00 |
|
|
Kim Gardner
|
22945d49df
|
Merge pull request #884 from coralproject/rm-semicolon
Remove semicolon
|
2017-08-28 16:15:07 +01:00 |
|