Commit Graph

3651 Commits

Author SHA1 Message Date
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 1250054fb7 Prettier 2017-05-01 11:45:23 -03:00
Belen Curcio f3980a03b2 Removing like from core action summary 2017-05-01 11:44:24 -03:00
Belen Curcio a90802a046 Coral-Plugin-Like 2017-05-01 11:43:59 -03:00
Belen Curcio 400615cc58 Adding translations 2017-05-01 11:43:40 -03:00
Belén Curcio f509d29a94 Merge pull request #540 from coralproject/slots-b
Slots
2017-05-01 11:28:02 -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 9ee749edb2 Removing LIKE from the core graph 2017-05-01 11:00:37 -03:00
Belen Curcio 5c14ac3f67 Ádding LIKE to the plugin graph 2017-05-01 10:58:29 -03:00
Belen Curcio e1929f148a Removing likes from the core graph 2017-05-01 10:58:14 -03:00
Belen Curcio 717ebf40b7 Adding like plugin to the ignore 2017-05-01 10:56:10 -03:00
Belen Curcio ef40174be9 Adding Coral-Plugin-Like 2017-05-01 10:55:50 -03:00
Belen Curcio 3b819144e0 Merge branch 'slots-b' of github.com:coralproject/talk into slots-b 2017-05-01 10:48:04 -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
Belén Curcio ed88a59ef1 Merge branch 'master' into slots-b 2017-05-01 10:41:21 -03:00
Kim Gardner ffcb1b464f Merge pull request #548 from coralproject/action-count-fix
don't double count no-ops
2017-04-28 15:13:37 -04:00
Kim Gardner fd11cc5249 Merge branch 'master' into action-count-fix 2017-04-28 15:09:44 -04:00
Kim Gardner 2484141ecf Merge pull request #553 from coralproject/load-more-accepted
enable load more on accepted queue
2017-04-28 15:07:06 -04:00
Kim Gardner 78ea42f34f Merge branch 'master' into load-more-accepted 2017-04-28 15:03:02 -04:00
Kim Gardner 3a1e78579a Merge pull request #554 from coralproject/yarn-fix
Updated yarn.lock
2017-04-28 15:02:48 -04:00
Riley Davis c85596a9bf Merge branch 'master' into load-more-accepted 2017-04-28 12:59:01 -06:00
David Erwin 211a6fd868 Merge branch 'master' into yarn-fix 2017-04-28 14:58:02 -04:00
David Erwin 59b048002b Merge pull request #555 from coralproject/fix-more-reply-count
Fix reply count polling
2017-04-28 14:57:50 -04:00
Kim Gardner 5506481182 Merge branch 'master' into load-more-accepted 2017-04-28 14:57:07 -04:00
Kim Gardner 12e6501d4d Merge branch 'master' into fix-more-reply-count 2017-04-28 14:51:01 -04:00
Kim Gardner 7a53cab2f5 Merge branch 'master' into action-count-fix 2017-04-28 14:44:28 -04:00
Kim Gardner cfbff62d1c Merge pull request #550 from coralproject/losowsky-patch-1
tiny typo that was bugging me
2017-04-28 14:43:41 -04:00
Wyatt Johnson 5d4c813800 removed empty gif 2017-04-28 12:03:29 -06:00
Chi Vinh Le e486d48556 postComment should increase replyCount 2017-04-29 01:02:59 +07:00
Chi Vinh Le 8663aa0cb5 Fix polling reply count 2017-04-29 01:02:11 +07:00
Wyatt Johnson f1e70102d0 Updated yarn.lock 2017-04-28 11:55:28 -06:00
riley ace3e2398b enable load more on accepted queue 2017-04-28 11:41:03 -06:00
Riley Davis a6dd03beef Merge branch 'master' into action-count-fix 2017-04-28 10:45:34 -06:00
Kim Gardner 4d0b5b7149 Merge branch 'master' into losowsky-patch-1 2017-04-28 11:24:27 -04:00
Kiwi bfb2eb30e2 Merge pull request #552 from coralproject/fix-empty-slot-fragments
Ret empty string when encountering undefined fragment
2017-04-28 22:04:44 +07:00
Chi Vinh Le 5d26f8e3de Ret empty string when encountering undefined fragment 2017-04-28 21:59:02 +07:00
Andrew Losowsky a46c8528e1 tiny typo that was bugging me 2017-04-28 07:19:44 -04:00
riley 59ddde1856 semi 2017-04-27 14:07:01 -06:00
riley 862355b0cd don't double count no-ops 2017-04-27 14:02:29 -06:00
Kim Gardner 78878b4295 Merge pull request #539 from coralproject/approved-comments-queue
Approved comments queue
2017-04-27 15:28:00 -04:00
Riley Davis b1d4fff929 Merge branch 'master' into approved-comments-queue 2017-04-27 13:12:40 -06:00
riley 8cf11d83c8 Merge branch 'approved-comments-queue' of github.com:coralproject/talk into approved-comments-queue 2017-04-27 13:10:50 -06:00
riley a3ec23c273 mange counts and such for all queue 2017-04-27 13:09:00 -06:00
Kim Gardner af9f143b31 Merge pull request #547 from coralproject/lock-fix
Updated yarn.lock
2017-04-27 15:05:52 -04:00
Wyatt Johnson 48bffdbb3b Updated yarn.lock 2017-04-27 13:00:30 -06:00
Kiwi 8f1448823c Merge pull request #543 from coralproject/no-logic-user-box
Remove embed stream logic from UserBox
2017-04-28 01:07:56 +07:00
Kim Gardner 6a46fb822d Merge branch 'master' into approved-comments-queue 2017-04-27 13:56:15 -04:00