Commit Graph

3675 Commits

Author SHA1 Message Date
Belén Curcio 64c79cf5f2 Merge branch 'master' into config-embed 2017-05-03 16:52:30 -03:00
Riley Davis f03c87c26d Merge pull request #561 from coralproject/like-fix
Removed LikeAction from core typeName interface resolver
2017-05-03 13:42:01 -06:00
Wyatt Johnson d9a4653484 Removed LikeAction from core typeName interface resolver 2017-05-03 13:31:57 -06:00
Belén Curcio 15afce516c Merge pull request #556 from coralproject/coral-plugin-like
Coral Plugin Like
2017-05-03 15:50:09 -03:00
Belen Curcio 99b3d0021a Linting 2017-05-03 15:45:31 -03:00
Belén Curcio 6716362b08 Merge branch 'master' into config-embed 2017-05-03 15:40:27 -03:00
Belen Curcio 13a6ee67e9 Merge branch 'coral-plugin-like' of github.com:coralproject/talk into coral-plugin-like 2017-05-03 15:39:41 -03:00
Belen Curcio 32fb0714ce updated tests 2017-05-03 15:37:56 -03:00
Belén Curcio 7cc8176cc4 Merge branch 'master' into coral-plugin-like 2017-05-03 15:31:04 -03:00
Kim Gardner e6651086d5 Merge pull request #560 from coralproject/bump-version-1-6-0
Bump version to 1.6.0
2017-05-03 12:17:51 -04:00
Kim Gardner 28ea498df2 Bump version to 1.6.0 2017-05-03 12:12:25 -04:00
Belén Curcio ea7888809e Merge branch 'master' into config-embed 2017-05-02 15:47:23 -03:00
Belen Curcio cc0a23c295 Deconstruct plugin config 2017-05-02 15:40:37 -03:00
Belen Curcio b444316e1c Adding debug plugins 2017-05-02 15:31:58 -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
Kim Gardner cdc1835f72 Merge branch 'master' into coral-plugin-like 2017-05-02 12:37:55 -04:00
Kim Gardner 9d2b47f02b Merge pull request #549 from coralproject/count-abbr
format mod queue counts
2017-05-02 12:37:34 -04:00
Belen Curcio 23a5b236a2 Linting 2017-05-01 12:05:45 -03:00
Belen Curcio b02088e329 Like color 2017-05-01 12:04:14 -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 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
David Erwin a94f6220f9 Merge branch 'master' into count-abbr 2017-05-01 10:40:20 -04: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 9b155833a1 Merge branch 'master' into count-abbr 2017-04-28 15:07:18 -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