Commit Graph

1633 Commits

Author SHA1 Message Date
Wyatt Johnson 45c7cbad9e Merge branch 'master' into subscriptions 2017-04-05 08:08:56 -06:00
Chi Vinh Le 528f5738c8 Implement apollo reporter middleware 2017-04-05 11:18:45 +07:00
Wyatt Johnson 75c88df8f1 Fix for build 2017-04-04 10:12:25 -06:00
Wyatt Johnson 07d1f9d3cf Merge branch 'master' into subscriptions 2017-04-04 09:58:50 -06:00
Wyatt Johnson 1b8489165b Merge branch 'master' into docker-plugins 2017-03-31 16:41:34 -06:00
Riley Davis 8196cb9c24 load all the replies in one go 2017-03-31 13:37:28 -06:00
riley ba4f39aecd Merge branch 'master' into change-permalink-behavior 2017-03-31 10:10:34 -06:00
Wyatt Johnson e5da8354d6 Added frozen lockfile support 2017-03-31 09:34:38 -06:00
Riley Davis 093c13c103 add polling to permalink page 2017-03-31 09:16:21 -06:00
Riley Davis 72c1774cf3 prevent Talk from collapsing when a height is set to the body on the parent page 2017-03-31 09:12:09 -06:00
Riley Davis a1bb0cd55f Merge branch 'master' into change-permalink-behavior 2017-03-30 12:59:06 -06:00
Riley Davis fd968b2070 position permalink popup given different comment scenarios 2017-03-30 10:50:58 -06:00
Chi Vinh Le 4c79f45556 Support Markdown in Infobox 2017-03-30 22:19:02 +07:00
Chi Vinh Le 4d89db931e Integrate MarkdownEditor 2017-03-30 20:49:18 +07:00
Chi Vinh Le 2d0208046b Implement MarkdownEditor 2017-03-30 20:49:18 +07:00
Riley Davis f37c768662 only highlight the actual comment permalinked 2017-03-29 15:21:41 -06:00
Riley Davis 3007ba68f8 load more replies on a permalinked comment 2017-03-29 15:12:33 -06:00
Riley Davis f11a11cf67 show view more button on a permalinked comment if applicable 2017-03-29 13:04:28 -06:00
riley 3e00a4e842 Merge branch 'master' into change-permalink-behavior 2017-03-29 12:27:52 -06:00
Kim Gardner 9d59c95cdf Merge branch 'master' into total-counts 2017-03-29 13:55:21 -04:00
Riley Davis 184b6c00a6 Merge branch 'master' into total-counts 2017-03-29 10:06:41 -06:00
Wyatt Johnson ffbe976760 working websockets 2017-03-29 09:35:56 -06:00
Chi Vinh Le d80ed467f1 Remove duplicate material.css 2017-03-29 21:41:22 +07:00
Pablo Cúbico 5092b849b3 Found some typos on the spanish side :) 2017-03-28 23:22:12 -03:00
Riley Davis daa6ce60ab show the total comment count instead of the parent count 2017-03-28 15:41:27 -06:00
Riley Davis b7ce669cfc add translations 2017-03-28 14:46:01 -06:00
Riley Davis e75663f5b9 Merge branch 'master' into change-permalink-behavior 2017-03-28 14:31:53 -06:00
Riley Davis 4e60689fa4 view a permalink thread in isolation 2017-03-28 14:31:43 -06:00
Gabriela Rodríguez Berón 155be523ff Merge branch 'master' into community-flags 2017-03-28 07:14:30 -07:00
Kim Gardner 68584cf2cf Fix typo 2017-03-27 13:59:45 -04:00
Kim Gardner 542a261e5e Merge branch 'master' into dep-upgrade 2017-03-27 11:15:11 -04:00
Belén Curcio a4dabd0308 Merge branch 'master' into dep-upgrade 2017-03-27 08:41:17 -03:00
Riley Davis c35043f799 Merge branch 'master' into auto-close-comment-toggle 2017-03-24 16:50:47 -06:00
gaba a6fa9a22c3 It refresh the page after editing name. 2017-03-24 13:57:10 -07:00
gaba a2551a499f Adds a few more font-sizes. 2017-03-24 12:58:45 -07:00
gaba 680919dd0e Making more sense. 2017-03-24 11:53:51 -07:00
Gabriela Rodríguez Berón c51a4ff228 Merge branch 'master' into translations 2017-03-24 11:33:16 -07:00
gaba b5d86a3380 Merge branch 'master' into community-flags 2017-03-24 11:19:30 -07:00
gaba 9eaed90318 Revert "Revert "Story 138187767 - Moderate Flag User Names""
This reverts commit 903aa23f19.
2017-03-24 11:15:42 -07:00
Riley Davis 2b90f2f588 Merge branch 'master' into auto-close-comment-toggle 2017-03-24 11:33:17 -06:00
Wyatt Johnson 228fdeac4d Removed root .babelrc file, upgrades
- Upgraded packages
- Fixed sourcemaps
- Moved .babelrc config into client folder
- Created .babelrc in tests folder for client tests
2017-03-24 11:12:57 -06:00
Kim Gardner 67da144391 Merge branch 'master' into highlighter-wordz 2017-03-24 12:58:24 -04:00
riley 701994f8f7 pass lint 2017-03-24 10:42:31 -06:00
riley 5d5ad2585d autoclose an article toggle 2017-03-24 10:40:12 -06:00
gaba 323749915a CSS alignments 2017-03-24 08:59:43 -07:00
gaba 84f1d3ece2 Use findONeAndUpdate and the moderation queue for account flags should only give back pending accounts. 2017-03-23 16:02:25 -07:00
riley 6b6d3d8bbb highlight suspect, banned words and links 2017-03-23 16:09:36 -06:00
gaba b9c816285d Fix params for moduserflaggedquery. 2017-03-23 14:48:15 -07:00
Riley Davis 7f1b993ea6 always show moderation link to admins 2017-03-23 13:04:37 -06:00
Wyatt Johnson 63ef49d595 Initial subscription impl 2017-03-23 11:09:14 -06:00