1308 Commits

Author	SHA1	Message	Date
Belén Curcio	740aa88958	Merge branch 'master' into 140895223	2017-03-03 13:30:39 -05:00
Belen Curcio	79102de9d2	Star and Coral UI added :D	2017-03-03 13:21:42 -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 Gardner	b5653eca2d	Merge branch 'master' into keyboard-shortcuts	2017-03-03 09:59:45 -05:00
Belén Curcio	f30275e375	Merge branch 'master' into 138617379_best_comments	2017-03-03 09:51:25 -05:00
Kim Gardner	da6d5d58b3	Merge branch 'master' into bugfix-e2e-permalink	2017-03-02 16:26:54 -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
Riley Davis	a6c7fe85b9	remove querySelector call	2017-03-02 12:34:10 -07:00
Riley Davis	2246728c80	only trigger a re-flow when the height actually changes	2017-03-02 12:27:31 -07: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
Wyatt Johnson	ec09f1ca44	Merge branch 'master' into 138617379_best_comments	2017-03-01 16:47:03 -07:00
Wyatt Johnson	23540cb2c2	Merge branch 'master' into asset-name-fixes	2017-03-01 16:43:25 -07:00
Wyatt Johnson	e08d737a69	Merge branch 'master' into asset-name-fixes	2017-03-01 16:42:37 -07:00
Kim Gardner	ca635a34cc	Merge branch 'master' into move-config-around	2017-03-01 18:39:09 -05:00
Wyatt Johnson	cefe872bf0	Fixed queries	2017-03-01 16:38:27 -07:00
Riley Davis	5aabf2b177	Merge branch 'master' into move-config-around	2017-03-01 16:36:31 -07:00
Riley Davis	a839596c20	Merge branch 'master' into reply-no-reply	2017-03-01 16:34:42 -07:00
Riley Davis	ed0df4b738	make sure reply box works	2017-03-01 16:32:01 -07:00
Riley Davis	fa5a94c4be	add some missing translations	2017-03-01 16:00:42 -07:00
Wyatt Johnson	3d13380fcc	Touched up embed + stream query	2017-03-01 15:49:39 -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 Davis	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 Gardner	285430e1ce	Merge branch 'master' into bugfix-premod-optimistic	2017-03-01 15:40:52 -05:00
David Jay	0085d2bb04	Preventing premod comments from being posted optimistically.	2017-03-01 14:21:03 -05:00
Wyatt Johnson	eb8b733ac7	Merge branch 'master' into 138617379_best_comments	2017-03-01 11:46:04 -07:00
Kim Gardner	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 Gardner	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 Jay	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	69deba245a	Merge branch 'master' into 138617379_best_comments	2017-03-01 10:32:57 -07:00
Wyatt Johnson	79296999c0	Merge branch 'master' into production-mode	2017-03-01 09:52:46 -07:00
Wyatt Johnson	a1e2077ef1	Merge branch 'master' into 138617379_best_comments	2017-03-01 09:43:44 -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