4030 Commits

Author	SHA1	Message	Date
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
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
Benjamin Goering	5cb522c419	Merge branch 'master' into 138617379_best_comments	2017-03-01 20:49:04 +08:00
Benjamin Goering	ab70ac38fd	If fail to addremov best comment tag, show user an error	2017-03-01 16:07:25 +08:00
Benjamin Goering	90730e52be	Make all comment action buttons use cursor:pointer and nowrap (sam said ok)	2017-03-01 15:02:49 +08:00
gaba	6dfd3fc4ef	Fix the people tag.	2017-02-28 22:10:14 -08:00
Benjamin Goering	405dac292c	Only transform-async-to-generator for client code. Allows async to work with mocha tests (if proper node version)	2017-03-01 13:43:39 +08:00
gaba	da3c812dc1	Adds graphql for users flagged in the server and client.	2017-02-28 21:33:01 -08: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
David Jay	62fe63d323	Scrolling to permalinked comment or reply.	2017-02-28 14:27:53 -05:00
David Jay	158f31d603	Highlighting permalinked comment.	2017-02-28 13:55:28 -05:00
Riley Davis	c6885c8f1c	Merge branch 'master' into assets-by-like	2017-02-28 11:16:26 -07:00
Riley Davis	86a6b545cc	create a fragment for asset metrics. add some comments	2017-02-28 11:15:44 -07:00
Gabriela Rodríguez Berón	1db68a12a8	Merge branch 'master' into whizard-whitelist	2017-02-28 09:54:39 -08:00
Riley Davis	65e8e42ae6	remove query from Dashboard component per belen's advice	2017-02-28 10:51:14 -07:00
Kim Gardner	b3b10efbba	Use tú to match other translations	2017-02-28 12:35:20 -05:00
Kim Gardner	3bfde67d58	Copy updates with translations	2017-02-28 12:32:51 -05:00
David Jay	b9297b6079	Merge branch 'master' into mod-queue-sort	2017-02-28 12:11:05 -05:00