1270 Commits

Author	SHA1	Message	Date
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
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	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
Belen Curcio	c33ae1f7f8	Merge branch 'master' of github.com:coralproject/talk into comment-component	2017-03-01 11:08:46 -03:00
Kim Gardner	87dddaf5b3	Merge branch 'master' into admin-login-upgrade	2017-03-01 09:01:15 -05:00
Kim Gardner	945e576ce7	Merge branch 'master' into fix-permalink	2017-03-01 08:57:17 -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
Belen Curcio	1db0a75010	Merge	2017-02-28 20:42:03 -03: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
David Jay	230488117f	Merge branch 'master' into bugfix-user-state	2017-02-28 18:20:00 -05:00
Wyatt Johnson	e6b7098a6c	Merge branch 'master' into production-mode	2017-02-28 16:10:27 -07:00
David Jay	e68358a211	Merge branch 'master' into fix-permalink	2017-02-28 18:07:31 -05:00
Riley Davis	b369fb9101	re-rename	2017-02-28 14:38:19 -07:00
Riley Davis	bb1aea63ba	add a couple of routes	2017-02-28 14:33:57 -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
David Jay	fed28b3eec	Refetching on login and logout.	2017-02-28 16:13:51 -05:00
David Jay	037f5be377	Merge branch 'master' of github.com:coralproject/talk into fix-permalink	2017-02-28 14:28:32 -05:00