Commit Graph
5861 Commits
Author SHA1 Message Date
Chi Vinh Le 46c031b35d Fix endless interval 2017-08-29 23:53:00 +07:00
Kim GardnerandGitHub 393005fce6 Merge pull request #889 from coralproject/my-comment-reactions
My Comment Reactions
2017-08-29 16:33:00 +01:00
Kim GardnerandGitHub 952b253969 Merge branch 'master' into my-comment-reactions 2017-08-29 16:24:49 +01:00
Kim GardnerandGitHub ad06d5136b Merge pull request #893 from coralproject/email-regex-fix
Changed email verification regex
2017-08-29 16:24:17 +01:00
Kim GardnerandGitHub 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
Kim GardnerandGitHub a76464ea16 Merge branch 'master' into my-comment-reactions 2017-08-29 10:22:58 +01:00
Kim GardnerandGitHub b76f1956dc Merge pull request #892 from coralproject/asset-tests
Added duplicated comments tests
2017-08-29 10:12:52 +01: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 JohnsonandGitHub df6f6a72ef Merge pull request #885 from coralproject/subscriber
Adding new Slot: commentAuthorTags
2017-08-28 16:18:32 -06:00
Wyatt JohnsonandGitHub c09381ff84 Merge branch 'master' into subscriber 2017-08-28 15:40:31 -06:00
Wyatt JohnsonandGitHub a172f5be51 Merge pull request #881 from coralproject/feature/heroku-deploy
Heroku Deploy
2017-08-28 15:39:52 -06:00
Wyatt JohnsonandGitHub 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 GardnerandGitHub 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 JohnsonandGitHub 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
KiwiandGitHub 4f901d0d56 Merge branch 'master' into subscriber 2017-08-28 19:43:54 +02:00
Kim GardnerandGitHub 9af0c5e01a Merge pull request #887 from coralproject/fix-action-type-query
Fix `action_type` query
2017-08-28 18:28:54 +01:00
KiwiandGitHub 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 CurcioandGitHub e14d6007a7 Merge branch 'master' into subscriber 2017-08-28 13:12:19 -03:00
Wyatt JohnsonandGitHub 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 GardnerandGitHub 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
KiwiandGitHub f4365eb848 Merge branch 'master' into load-more-history 2017-08-28 17:27:04 +02:00
Belén CurcioandGitHub 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 GardnerandGitHub 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 CurcioandGitHub 3108f3dac3 Merge branch 'master' into subscriber 2017-08-28 12:22:05 -03:00
Kim GardnerandGitHub 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 GardnerandGitHub 22945d49df Merge pull request #884 from coralproject/rm-semicolon
Remove semicolon
2017-08-28 16:15:07 +01:00
KiwiandGitHub b8c6305939 Merge branch 'master' into rm-semicolon 2017-08-28 17:09:42 +02:00
Chi Vinh Le 7911e366e5 Remove semicolon 2017-08-28 22:04:21 +07:00
Kim GardnerandGitHub 1ba5fd0028 Merge pull request #870 from coralproject/user-sort
Optimizations and User Sort
2017-08-28 15:30:31 +01:00
Chi Vinh Le 7856c9d947 Fix live update false comments in permalink view 2017-08-28 21:05:32 +07:00
Jeff Nelson 7c9e2297df don't hardcode branch 2017-08-28 09:54:20 -04:00
Chi Vinh Le 153c5acce1 Only load my own comments in history 2017-08-28 19:15:29 +07:00
Chi Vinh Le bb42cffc17 Add sort plugins for other reactions 2017-08-28 18:50:01 +07:00
Chi Vinh Le 0dffc15836 Hover styles 2017-08-28 18:22:30 +07:00
Chi Vinh Le e4490e20a7 Merge branch 'master' into user-sort
Conflicts:
	package.json
2017-08-28 18:16:18 +07:00
Chi Vinh Le f9bc5f79ec Don't sort and ignore duplicate comments (embed-stream) 2017-08-28 18:08:33 +07:00
Kim GardnerandGitHub 5ec65c86ce Merge pull request #879 from coralproject/questionbox
Question Box Builder
2017-08-25 20:58:41 +01:00
Wyatt Johnson 8a5db167ff changed sort -> sortOrder 2017-08-25 09:59:37 -06:00