561 Commits

Include renames

Author	SHA1	Message	Date
Belen Curcio	cceeafadec	Indent	2017-03-07 16:53:42 -05:00
Belen Curcio	af4a69a677	Changing icon and link	2017-03-07 16:50:36 -05:00
Belen Curcio	f563bcf119	Adding fix for long text	2017-03-07 16:35:01 -05:00
Riley Davis	37dad96fee	Merge branch 'master' ... Conflicts: client/coral-admin/src/containers/Configure/StreamSettings.js	2017-03-07 11:23:22 -07:00
Riley Davis	09556c9bef	indention	2017-03-06 14:06:32 -07:00
Belen Curcio	e80d6e7b0a	Configure UX Style Polish!	2017-03-06 12:12:26 -05:00
David JayandGitHub	3280ed9ae5	Merge branch 'master' into premod-links	2017-03-03 16:17:40 -05:00
David Jay	b9488dc36c	Updating moderation.	2017-03-03 16:09:34 -05:00
David Jay	b912b60428	Removing unecessary log statement.	2017-03-03 16:01:53 -05:00
Belen Curcio	1f0d102115	new components!! textarea stuff and configure bugs	2017-03-03 15:53:53 -05:00
David Jay	2e5d453ea7	Updating link search and adding settings in admin panel.	2017-03-03 15:44:03 -05:00
Belen Curcio	a1a45a7969	Styles and disable and enable things	2017-03-03 15:10:15 -05:00
Belen Curcio	5da1af8387	Styles ready!	2017-03-03 13:00:22 -05:00
Belen Curcio	d218979ee6	Show Story, show and hide Moderate	2017-03-03 11:46:09 -05:00
Kim GardnerandGitHub	b5653eca2d	Merge branch 'master' into keyboard-shortcuts	2017-03-03 09:59:45 -05:00
David Jay	57a7000e59	Animating transition in mod queue.	2017-03-02 16:08:24 -05:00
David Jay	d554bf5211	Adding single view and restyling selected comment.	2017-03-02 16:03:18 -05:00
David Jay	1146f22613	Accepting and rejecting comments w/ keystrokes.	2017-03-02 15:41:51 -05:00
David Jay	78be17ec6d	Adding keyboard selection of comments.	2017-03-02 15:19:33 -05:00
David Jay	7be3b05f22	Re-enabling keyboard shortcut menu.	2017-03-02 14:51:51 -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 DavisandGitHub	5aabf2b177	Merge branch 'master' into move-config-around	2017-03-01 16:36:31 -07:00
Riley Davis	fa5a94c4be	add some missing translations	2017-03-01 16:00:42 -07:00
riley	c4edbd4db4	removing dead code	2017-03-01 15:28:44 -07:00
Riley Davis	0c89dd6d98	sam's feedback	2017-03-01 15:23:17 -07:00
Riley DavisandGitHub	97496f8b3d	Merge branch 'master' into move-config-around	2017-03-01 14:44:27 -07:00
Riley Davis	62793f5947	keepin' it DRY	2017-03-01 14:40:10 -07:00
Kim GardnerandGitHub	e56a04abf1	Merge branch 'master' into admin-login-upgrade	2017-03-01 13:42:56 -05:00
Riley Davis	4e5bcbc27f	even more design updates	2017-03-01 11:42:03 -07:00
Kim GardnerandGitHub	70c69e3752	Merge branch 'master' into make-links-less-linky	2017-03-01 13:27:13 -05:00
riley	b346083d11	Merged master into admin-login-upgrade	2017-03-01 11:19:48 -07:00
Riley Davis	00b2bf37ee	fix height of the table	2017-03-01 11:14:13 -07:00
David JayandGitHub	3b04dab0d5	Merge branch 'master' into bugfix-user-state	2017-03-01 12:57:40 -05:00
Riley Davis	bbf70aedab	put it back to 5 minutes	2017-03-01 10:47:31 -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
Riley Davis	04ab00d053	ignore this	2017-03-01 10:40:40 -07:00
Riley Davis	1f70a2d3eb	Merged branch master into make-links-less-linky	2017-03-01 10:37:50 -07:00
Riley Davis	674585adeb	design updates	2017-03-01 10:37:39 -07:00
Wyatt Johnson	79296999c0	Merge branch 'master' into production-mode	2017-03-01 09:52:46 -07:00
Belen Curcio	6cd0c12ba4	tweaks	2017-03-01 12:35:59 -03:00
Belen Curcio	545410b27e	renaming duplicate statement	2017-03-01 11:50:05 -03: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
Kim GardnerandGitHub	87dddaf5b3	Merge branch 'master' into admin-login-upgrade	2017-03-01 09:01:15 -05:00
Belen Curcio	42b380b942	Flag box	2017-02-28 22:35:37 -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
Belen Curcio	dc81ec1e80	Merge branch 'whizard-whitelist' of github.com:coralproject/talk into whizard-whitelist	2017-02-28 20:44:55 -03:00