Commit Graph
181 Commits
Author SHA1 Message Date
Riley DavisandGitHub 099cc36b89 Merge branch 'master' into recaptcha-support 2017-03-14 15:33:18 -06:00
Riley Davis 7bbf8abd3d try to just add recaptcha manually
use react-recaptcha

remove recaptcha file
2017-03-14 15:32:16 -06:00
riley 801555e66e button text was wrapping in firefox 2017-03-13 12:08:57 -06:00
David JayandGitHub 542ccc6190 Merge branch 'master' into bugfix-ban-dialog-language 2017-03-09 13:40:44 -05:00
David Jay 377563c798 Hiding rejected note on ban dialog for rejected comments. 2017-03-08 17:02:47 -05:00
David Jay fac3d26c22 Closing ban dialog after ban is complete. 2017-03-08 16:39:53 -05:00
David Jay d203a9afe0 Auto-rejecting comments on ban. 2017-03-08 16:06:34 -05:00
Belen Curcio 5da1af8387 Styles ready! 2017-03-03 13:00:22 -05:00
Kim GardnerandGitHub b5653eca2d Merge branch 'master' into keyboard-shortcuts 2017-03-03 09:59:45 -05:00
David Jay 78be17ec6d Adding keyboard selection of comments. 2017-03-02 15:19:33 -05:00
David Jay 609af767e8 Merge branch 'master' of github.com:coralproject/talk into bugfix-e2e-permalink 2017-03-02 13:04:32 -05:00
David Jay acda388d4e Updating e2e tests. 2017-03-02 13:00:54 -05:00
Riley Davis 4e5bcbc27f even more design updates 2017-03-01 11:42:03 -07:00
Riley Davis 045fa3e2a9 also ignore this 2017-03-01 10:42:01 -07:00
Riley Davis 58870e1630 Merged branch master into admin-login-upgrade 2017-03-01 10:40:51 -07:00
Belen Curcio 453894be80 Merge 2017-03-01 11:46:28 -03:00
Belen Curcio ea0602b7a5 Design Comment Component 2017-03-01 11:42:08 -03:00
Belen Curcio 339aefa72a Merge branch 'master' of github.com:coralproject/talk into comment-component 2017-02-28 21:26:57 -03:00
riley 7ccf77b1ad add reset password link 2017-02-28 17:10:51 -07:00
Riley Davis 1f3eb5f516 Merged branch master into admin-login-upgrade 2017-02-28 16:31:49 -07:00
riley 8f23ca678d add Alert component to coral-ui 2017-02-28 16:31:30 -07:00
Riley Davis b369fb9101 re-rename 2017-02-28 14:38:19 -07:00
Riley Davis e2273f5810 change PermissionRequired to LoginView and create a login form. delete old login page 2017-02-28 14:32:01 -07:00
Riley DavisandGitHub ac3e6a12bd Merge branch 'master' into assets-by-like 2017-02-28 09:27:46 -07:00
Belen Curcio 061efd4734 Comment Component Design 2017-02-28 09:03:19 -03:00
Belen Curcio e8a92b768c logout and version in drawer 2017-02-27 11:52:21 -03:00
Belen Curcio f85a6d4da1 Drawer 2017-02-27 11:49:53 -03:00
Riley Davis 5d1139dbdd Merge branch 'master'
Conflicts:
	client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
2017-02-24 08:49:30 -07:00
Riley Davis bc48496327 add most liked comments widget 2017-02-22 10:47:23 -07:00
Riley Davis 5d94a98305 Like and Flag summaries work again 2017-02-21 14:05:49 -07:00
Riley Davis 9000778d8f empty result for users in Community 2017-02-21 12:39:29 -07:00
Riley Davis e24a0caa20 add EmptyCard component. fix typos. more PropTypes. 2017-02-21 12:08:02 -07:00
Riley Davis 8866366d3c storing my place in case we want to come back to this 2017-02-17 16:07:34 -07:00
Riley DavisandWyatt Johnson f925e6a8ea fix bug when likes or flags were 0 for an article 2017-02-16 16:49:14 -07:00
Riley Davis 1dcdd4a9c9 make Dashboard first tab per Sam. simplify tabs 2017-02-16 12:04:24 -07:00
David ErwinandGitHub 5467d980df Merge branch 'master' into sory-139595043-qbox 2017-02-16 11:26:22 -05:00
Riley Davis 6c141cbce0 now with likes 2017-02-15 16:52:06 -07:00
Riley Davis f91607cff9 show the author and publication date 2017-02-15 15:36:46 -07:00
riley b26c170a52 add some translations and link to mod queue 2017-02-15 14:11:44 -07:00
Riley Davis 6eda495663 display most flagged assets in a table 2017-02-15 12:57:51 -07:00
gaba 68c764fd43 Rename coral-ui/FormField with TextField. 2017-02-15 11:50:21 -08:00
Wyatt Johnson e640bc2cc0 Added edge for metrics, fixed client linting errors 2017-02-14 17:02:50 -07:00
Riley Davis 50e3e733c3 create FlagWidget 2017-02-14 16:12:38 -07:00
Wyatt Johnson d987b33d99 Merge branch 'master' into flag-widget 2017-02-14 09:00:12 -07:00
Belen Curcio 8953182329 merge 2017-02-13 19:14:27 -03:00
Belen Curcio 519298b980 Design Pass 2017-02-13 18:12:37 -03:00
Belen Curcio e2ebac7176 adds new mutations: setCommentStatus 2017-02-13 14:32:48 -03:00
Belen Curcio 90ed1f1056 Ban user with graphql, 100 refactor 2017-02-13 11:50:16 -03:00
Riley Davis d4e68de349 setting up dashboard :) 2017-02-10 15:32:30 -07:00
Belen Curcio 894fec9fb6 adding context for moderation 2017-02-10 17:55:51 -03:00