1991 Commits

Author	SHA1	Message	Date
David Erwin	a94f6220f9	Merge branch 'master' into count-abbr	2017-05-01 10:40:20 -04:00
Belen Curcio	c58813cf48	merge	2017-05-01 10:47:56 -03:00
Belen Curcio	d14b965f54	Adding fragment slots	2017-05-01 10:46:37 -03:00
Kim Gardner	fd11cc5249	Merge branch 'master' into action-count-fix	2017-04-28 15:09:44 -04:00
Kim Gardner	9b155833a1	Merge branch 'master' into count-abbr	2017-04-28 15:07:18 -04:00
Riley Davis	c85596a9bf	Merge branch 'master' into load-more-accepted	2017-04-28 12:59:01 -06:00
Chi Vinh Le	e486d48556	postComment should increase replyCount	2017-04-29 01:02:59 +07:00
Chi Vinh Le	8663aa0cb5	Fix polling reply count	2017-04-29 01:02:11 +07:00
riley	ace3e2398b	enable load more on accepted queue	2017-04-28 11:41:03 -06:00
Riley Davis	a6dd03beef	Merge branch 'master' into action-count-fix	2017-04-28 10:45:34 -06:00
Riley Davis	7246adc467	Merge branch 'master' into count-abbr	2017-04-28 10:45:27 -06:00
Chi Vinh Le	5d26f8e3de	Ret empty string when encountering undefined fragment	2017-04-28 21:59:02 +07:00
riley	cd9648b251	format mod queue counts	2017-04-27 15:01:59 -06:00
riley	59ddde1856	semi	2017-04-27 14:07:01 -06:00
riley	862355b0cd	don't double count no-ops	2017-04-27 14:02:29 -06:00
Riley Davis	b1d4fff929	Merge branch 'master' into approved-comments-queue	2017-04-27 13:12:40 -06:00
riley	8cf11d83c8	Merge branch 'approved-comments-queue' of github.com:coralproject/talk into approved-comments-queue	2017-04-27 13:10:50 -06:00
riley	a3ec23c273	mange counts and such for all queue	2017-04-27 13:09:00 -06:00
Kim Gardner	6a46fb822d	Merge branch 'master' into approved-comments-queue	2017-04-27 13:56:15 -04:00
Kiwi	b186a74199	Merge branch 'master' into no-logic-user-box	2017-04-28 00:55:50 +07:00
David Erwin	06378209a2	Merge branch 'master' into optimise-initial-query	2017-04-27 13:49:12 -04:00
riley	f6cede3fda	add accepted to propTypes	2017-04-27 11:23:27 -06:00
riley	d5b800f590	add accepted rejected aciton buttons	2017-04-27 11:17:53 -06:00
Kim Gardner	af80c4d8ad	Merge branch 'master' into approved-comments-queue	2017-04-27 11:59:30 -04:00
Kim Gardner	663bce2875	Merge branch 'master' into no-logic-user-box	2017-04-27 11:59:08 -04:00
Chi Vinh Le	8c53bc2d22	Postpone first query until checked login	2017-04-27 22:55:36 +07:00
Kim Gardner	f47bd269e5	Merge branch 'master' into report-popup-fix	2017-04-27 11:48:17 -04:00
Riley Davis	6330d69649	Merge branch 'master' into approved-comments-queue	2017-04-27 09:42:28 -06:00
Kim Gardner	6e98d176e7	Merge branch 'master' into 143530761-remove-loading-when-searching	2017-04-27 11:41:51 -04:00
Riley Davis	40b7669ed8	Merge branch 'master' into approved-comments-queue	2017-04-27 09:40:30 -06:00
Kim Gardner	3bb994c562	Merge branch 'master' into profanity-verbiage	2017-04-27 11:35:47 -04:00
Riley Davis	ea8e469c1c	Merge branch 'master' into report-popup-fix	2017-04-27 09:28:00 -06:00
Belén Curcio	f779c5fe01	Merge branch 'master' into no-logic-user-box	2017-04-27 11:12:55 -03:00
David Erwin	6972b87b0b	Merge branch 'master' into more-fragment-matcher	2017-04-27 10:10:19 -04:00
Belén Curcio	8c320d09da	Merge branch 'master' into optimise-initial-query	2017-04-27 11:04:11 -03:00
Chi Vinh Le	794cc0fc6c	Support login on all IOS browsers	2017-04-27 19:28:54 +07:00
Chi Vinh Le	7b16a71e9b	Remove embed stream logic from UserBox	2017-04-27 18:20:55 +07:00
Chi Vinh Le	20b4c4e2d0	Only query once during initial render	2017-04-27 17:30:43 +07:00
Belen Curcio	37e093f60a	Linting	2017-04-26 23:15:40 -03:00
Belen Curcio	de6492a26d	Ádding reactions, commentContent and updating current Slot	2017-04-26 23:06:09 -03:00
Belen Curcio	c60db41047	Updating slot name	2017-04-26 23:04:22 -03:00
Belen Curcio	00fe4b7c83	Úpdating slot names	2017-04-26 23:03:51 -03:00
Belen Curcio	3dd2da96e8	Adding Slots to QuestionBox, ref	2017-04-26 22:35:30 -03:00
Belen Curcio	1fea1405ef	Adding Slots, CommentBox ref	2017-04-26 22:34:38 -03:00
Belen Curcio	9fa3e361b5	Ref Stream	2017-04-26 22:34:17 -03:00
Belen Curcio	06ba5a53c1	Stateless Slot	2017-04-26 22:33:49 -03:00
David Erwin	5eb26946cb	Merge branch 'master' into profanity-verbiage	2017-04-26 17:21:34 -04:00
David Erwin	81680442f0	Merge branch 'master' into shortcuts-in-cog	2017-04-26 17:20:37 -04:00
David Erwin	1b3868edec	Merge branch 'master' into 143202319-mod-queue-shortcuts	2017-04-26 17:13:46 -04:00
David Erwin	5c4696ed61	Merge branch 'master' into fix-case	2017-04-26 17:08:56 -04:00