Commit Graph

4010 Commits

Author SHA1 Message Date
gaba 8dddff25f9 Update es translation and add link to transifex. 2017-05-18 16:01:12 -07:00
gaba 12cb59ce30 Merge branch 'master' into i18n-refactor 2017-05-18 15:44:14 -07:00
Kim Gardner f35a9ec8cd Merge pull request #602 from coralproject/content-type-fix
added fix for chrome + content type negotiation
2017-05-18 18:40:35 -04:00
gaba 1a7ad410f5 Loads timeago translation when loading translations. 2017-05-18 15:38:53 -07:00
Wyatt Johnson 25230f2e9d added fix for chrome + content type negotiation 2017-05-18 16:30:28 -06:00
gaba 3ca22bd101 Fix translation keys. 2017-05-18 15:14:37 -07:00
Kim Gardner f29df23c07 Merge pull request #601 from coralproject/read-only-inputs
handle no-interaction input the correct way
2017-05-18 17:21:12 -04:00
Kim Gardner b3e494d279 Merge branch 'master' into read-only-inputs 2017-05-18 17:14:48 -04:00
Kim Gardner 13376504b5 Merge pull request #598 from gobengo/edit-comment-settings
Edit Comment Window Length Setting
2017-05-18 17:14:29 -04:00
Kim Gardner 12ec058588 Merge branch 'master' into edit-comment-settings 2017-05-18 17:07:37 -04:00
Kim Gardner 5cbe9029aa Merge pull request #596 from gobengo/fix-ignore-user
Ignored user tombstones work again
2017-05-18 16:43:46 -04:00
Riley Davis c772cffc92 handle no-interaction input the correct way 2017-05-18 13:51:48 -06:00
Kim Gardner e80e79f267 Merge branch 'master' into edit-comment-settings 2017-05-18 14:23:14 -04:00
Benjamin Goering 1d322d8c70 Merge branch 'master' into fix-ignore-user 2017-05-18 10:50:00 -07:00
Benjamin Goering aaa2da6c23 Stream container refetch then setCommentCountCache to asset.commentCount instead of silly zero 2017-05-18 10:43:38 -07:00
Wyatt Johnson 5a272413e6 Merge pull request #599 from coralproject/gzip
Added gzip compression to bundle assets
2017-05-18 11:34:05 -06:00
Wyatt Johnson 4dc83aaf63 added middleware wrap 2017-05-18 11:27:28 -06:00
Wyatt Johnson 12713dae86 Removed unused assets 2017-05-18 11:18:08 -06:00
Wyatt Johnson 555c593059 Added gzip compression to bundle assets 2017-05-18 11:08:46 -06:00
Benjamin Goering fb33eefe8e trivial changes requested by review 2017-05-18 08:19:52 -07:00
Benjamin Goering cfc6d4bfea Merge branch 'fix-ignore-user' of github.com:gobengo/talk into fix-ignore-user 2017-05-18 08:12:40 -07:00
Benjamin Goering 6bbeee3a6b StopIgnoringUser does not refetch EmbedQuery 2017-05-18 08:11:39 -07:00
Benjamin Goering 340d3cea62 contains/Stream setCommentCountCache waits for refetch promise 2017-05-18 08:10:20 -07:00
Kim Gardner e8e9dbe3ca Merge branch 'master' into fix-ignore-user 2017-05-18 09:49:54 -04:00
gaba 9e954f0ae3 Fix timeago with lang. 2017-05-17 18:05:41 -07:00
Benjamin Goering cb45f0a8b3 Merge branch 'master' into edit-comment-settings 2017-05-17 15:46:14 -07:00
Benjamin Goering cb1a4ee1cc remove extraneous console.log 2017-05-17 15:40:32 -07:00
Benjamin Goering d93ad38dd1 Admins can change Edit Comment Window length in Moderation Settings 2017-05-17 15:39:19 -07:00
Kim Gardner 0dfec6e619 Merge pull request #597 from coralproject/copy-button-should-work
user detail copy button should work
2017-05-17 17:35:08 -04:00
Riley Davis e343897526 user detail copy button regression 2017-05-17 15:11:00 -06:00
Benjamin Goering 294eb6c81d Merge branch 'master' into fix-ignore-user 2017-05-17 13:57:23 -07:00
Kim Gardner 413eef8834 Merge pull request #564 from coralproject/user-detail-ui
User detail ui
2017-05-17 16:41:00 -04:00
Benjamin Goering 9eac05c8fb Ignored user tombstones work again 2017-05-17 13:18:59 -07:00
gaba 8d492ca4e9 Adds a few missing keys. 2017-05-17 13:18:04 -07:00
gaba 3aceb0dc38 Merge branch 'master' into i18n-refactor 2017-05-17 12:59:24 -07:00
gaba 5bd9bc992b Move i18n into a service 2017-05-17 12:53:36 -07:00
Riley Davis a0f41bb19d show total comments and rejected % 2017-05-17 10:54:14 -06:00
Wyatt Johnson fde4dee52f Resolver cleanup 2017-05-16 17:26:34 -06:00
Wyatt Johnson f4b9191476 Added author_id to comment count query 2017-05-16 14:20:20 -06:00
Riley Davis 4ca5c4bc09 Merge branch 'master' into user-detail-ui 2017-05-16 13:54:13 -06:00
Kiwi c21e500e58 Merge pull request #593 from coralproject/readd-last-comment
Readd lastComment field to asset resolver
2017-05-17 01:35:07 +07:00
Chi Vinh Le 7d858c7b3f Readd lastComment field to asset resolver 2017-05-17 01:25:06 +07:00
Wyatt Johnson e90ce7f4c3 fixed merge issue 2017-05-16 10:20:16 -06:00
Wyatt Johnson 3e2ed222ed Merge branch 'trust-merge' into user-detail-ui 2017-05-16 09:53:35 -06:00
riley 7896b3f33b merge master 2017-05-16 09:43:49 -06:00
Belén Curcio e561819c8d Merge pull request #592 from coralproject/invalidate-old-data
Invalidate old user data
2017-05-16 08:57:32 -03:00
Chi Vinh Le c7e0577708 Merge branch 'master' into invalidate-old-data 2017-05-16 18:17:45 +07:00
Chi Vinh Le 2ab8cc9481 Allow Apollo to invalidate old user data 2017-05-16 18:17:43 +07:00
Kiwi acdc00af18 Merge pull request #591 from coralproject/refetch-profile-only-after-login
Only refetch for login on `My Profile`.
2017-05-16 18:12:54 +07:00
Belén Curcio f9cf5fb744 Merge branch 'master' into refetch-profile-only-after-login 2017-05-16 07:57:20 -03:00