515 Commits

Author	SHA1	Message	Date
Riley Davis	bbf70aedab	put it back to 5 minutes	2017-03-01 10:47:31 -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	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
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	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	95a9259c06	Fixing bug with mod queue sorting.	2017-02-28 12:06:27 -05:00
Riley Davis	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	95876fa0e8	Merge branch 'master' of github.com:coralproject/talk into whizard-whitelist	2017-02-27 17:19:54 -03:00
Belen Curcio	555faa02f5	new translations for configure	2017-02-27 17:18:37 -03:00
Belen Curcio	1234a99a0d	copy for install permitted domains updated	2017-02-27 17:16:19 -03:00
Belen Curcio	b9e9d3e7fa	status	2017-02-27 17:06:22 -03:00
Belen Curcio	628e8844f3	final translations	2017-02-27 17:04:14 -03:00
Belen Curcio	b47fd35437	add user translations	2017-02-27 16:58:16 -03:00
Belen Curcio	7341fdff4e	add Organization translations	2017-02-27 16:54:03 -03:00
Belen Curcio	1e52c579cc	Ínitial translations	2017-02-27 16:50:04 -03:00
Belen Curcio	013625df27	no validation for domains	2017-02-27 16:39:52 -03:00
Belen Curcio	9305853502	Renamed to PermittedDomains	2017-02-27 15:50:07 -03:00
Belen Curcio	b1ec512721	Adding whitelist step, sending whitelist	2017-02-27 14:42:57 -03:00
David Jay	491f254206	Merge branch 'mod-queue-sort' of github.com:coralproject/talk into mod-queue-sort	2017-02-27 12:30:04 -05:00
David Jay	2b22ce076c	Merge branch 'master' into mod-queue-sort	2017-02-27 12:29:42 -05:00
David Jay	37b08fd4e4	Displaying oldest first by default.	2017-02-27 12:28:13 -05: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
David Jay	66a890458c	Adding sort to moderation queue.	2017-02-24 17:42:29 -05:00
Riley Davis	aefcb29877	remove comment count from results	2017-02-24 12:58:06 -07:00
Riley Davis	1058bff8ad	remove logs	2017-02-24 11:30:59 -07:00
Riley Davis	38e093aac3	remove most liked comments widget	2017-02-24 11:26:23 -07:00
Riley Davis	886240a7bc	translations. remove console.log on frontend. remove notification on POST moderation	2017-02-24 11:11:18 -07:00
Riley Davis	c283f193de	remove console.log	2017-02-24 09:07:03 -07:00
riley	c8c3c4acaf	lint	2017-02-24 08:59:23 -07:00
Riley Davis	dc5f95ec7f	simplify moderationqueue	2017-02-24 08:50:52 -07: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	be25d6f56d	"works"	2017-02-23 15:46:44 -07:00
Riley Davis	2f314c6937	omg, a bunch of UI madness	2017-02-23 14:29:51 -07:00
Kim Gardner	532f2d92ca	Merge branch 'master' into empty-states	2017-02-23 16:15:05 -05:00
Riley Davis	953c749bd2	show login page instead of communicorn :'(	2017-02-22 16:14:14 -07:00