Commit Graph
3657 Commits
Author SHA1 Message Date
Riley Davis ae52ec983e Merge remote-tracking branch 'origin/admin-queue-polish' into admin-queue-polish 2017-05-03 10:55:43 -06:00
Riley Davis c78e00711a remove if statements 2017-05-03 10:54:52 -06:00
Riley DavisandGitHub b8ddade518 Merge branch 'master' into admin-queue-polish 2017-05-03 10:28:52 -06:00
Riley Davis 324e82c070 not pretty, but it works 2017-05-03 10:20:03 -06:00
Kim GardnerandGitHub 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
riley e60bcb9caf make sure load more on approve/reject queues doesn't cause a bug 2017-05-02 15:58:57 -06:00
riley b7d3113677 apparently you can't make a fragment on RootQuery 2017-05-02 15:18:48 -06:00
Kim GardnerandGitHub f6e2caf65f Merge branch 'master' into admin-queue-polish 2017-05-02 12:38:48 -04:00
Kim GardnerandGitHub 9d2b47f02b Merge pull request #549 from coralproject/count-abbr
format mod queue counts
2017-05-02 12:37:34 -04:00
Riley DavisandGitHub da5e8cda99 Merge branch 'master' into admin-queue-polish 2017-05-01 11:13:13 -06:00
Riley Davis 32dd554331 load more comments if the mod has moderated them all and there are more availabile 2017-05-01 10:30:18 -06:00
Riley Davis 8293408c52 pull some custom code out of ActionButton 2017-05-01 10:22:11 -06:00
David ErwinandGitHub a94f6220f9 Merge branch 'master' into count-abbr 2017-05-01 10:40:20 -04:00
Belén CurcioandGitHub f509d29a94 Merge pull request #540 from coralproject/slots-b
Slots
2017-05-01 11:28:02 -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 CurcioandGitHub ed88a59ef1 Merge branch 'master' into slots-b 2017-05-01 10:41:21 -03:00
Kim GardnerandGitHub 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 GardnerandGitHub fd11cc5249 Merge branch 'master' into action-count-fix 2017-04-28 15:09:44 -04:00
Kim GardnerandGitHub 9b155833a1 Merge branch 'master' into count-abbr 2017-04-28 15:07:18 -04:00
Kim GardnerandGitHub 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 GardnerandGitHub 78ea42f34f Merge branch 'master' into load-more-accepted 2017-04-28 15:03:02 -04:00
Kim GardnerandGitHub 3a1e78579a Merge pull request #554 from coralproject/yarn-fix
Updated yarn.lock
2017-04-28 15:02:48 -04:00
Riley DavisandGitHub c85596a9bf Merge branch 'master' into load-more-accepted 2017-04-28 12:59:01 -06:00
David ErwinandGitHub 211a6fd868 Merge branch 'master' into yarn-fix 2017-04-28 14:58:02 -04:00
David ErwinandGitHub 59b048002b Merge pull request #555 from coralproject/fix-more-reply-count
Fix reply count polling
2017-04-28 14:57:50 -04:00
Kim GardnerandGitHub 5506481182 Merge branch 'master' into load-more-accepted 2017-04-28 14:57:07 -04:00
Kim GardnerandGitHub 12e6501d4d Merge branch 'master' into fix-more-reply-count 2017-04-28 14:51:01 -04:00
Kim GardnerandGitHub 7a53cab2f5 Merge branch 'master' into action-count-fix 2017-04-28 14:44:28 -04:00
Kim GardnerandGitHub 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 Davis 41d4bd1012 counts update 2017-04-28 11:52:07 -06:00
riley ace3e2398b enable load more on accepted queue 2017-04-28 11:41:03 -06:00
riley 521082eb3e add new query for counts 2017-04-28 11:39:37 -06:00
Riley DavisandGitHub a6dd03beef Merge branch 'master' into action-count-fix 2017-04-28 10:45:34 -06:00
Riley DavisandGitHub 7246adc467 Merge branch 'master' into count-abbr 2017-04-28 10:45:27 -06:00
Kim GardnerandGitHub 4d0b5b7149 Merge branch 'master' into losowsky-patch-1 2017-04-28 11:24:27 -04:00
KiwiandGitHub 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 LosowskyandGitHub a46c8528e1 tiny typo that was bugging me 2017-04-28 07:19:44 -04:00
riley cd9648b251 format mod queue counts 2017-04-27 15:01:59 -06: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 GardnerandGitHub 78878b4295 Merge pull request #539 from coralproject/approved-comments-queue
Approved comments queue
2017-04-27 15:28:00 -04:00
Riley DavisandGitHub b1d4fff929 Merge branch 'master' into approved-comments-queue 2017-04-27 13:12:40 -06:00