Commit Graph

1971 Commits

Author SHA1 Message Date
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
Chi Vinh Le 5d26f8e3de Ret empty string when encountering undefined fragment 2017-04-28 21:59:02 +07: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
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
David Erwin 2756b794ee Merge branch 'master' into more-fragment-matcher 2017-04-26 16:57:37 -04:00
David Erwin 077daeb793 Merge branch 'master' into subscriptions 2017-04-26 16:55:32 -04:00
Riley Davis fc567e8a92 Merge branch 'master' into shortcuts-in-cog 2017-04-26 13:34:13 -06:00
gaba 60d2735fa5 Remove isfetching all together. 2017-04-26 14:26:22 -05:00
gaba 6f58754617 Removing the Loading all together. 2017-04-26 14:26:21 -05:00
Gabriela Rodríguez Berón e935fff8ac Merge branch 'master' into 143530761-remove-loading-when-searching 2017-04-26 12:52:30 -05:00
Gabriela Rodríguez Berón 3ad8d9ffec Merge branch 'master' into 143202319-mod-queue-shortcuts 2017-04-26 12:51:30 -05:00
Riley Davis 0df40c7e35 make the popup not full width like before 2017-04-26 11:50:17 -06:00
Riley Davis a793d63f65 Merge branch 'master' into profanity-verbiage 2017-04-26 11:45:20 -06:00
Riley Davis ccc512cddd if there is no available translation, do not show error.whatever in the UI 2017-04-26 11:43:34 -06:00
David Erwin e20b6e1b25 Merge branch 'master' into fix-case 2017-04-26 13:19:50 -04:00
Riley Davis 4ff37d9063 Merge branch 'master' into approved-comments-queue 2017-04-26 11:01:41 -06:00
Riley Davis cea0b4942a prevent text overflow 2017-04-26 09:32:00 -06:00
Riley Davis 4ddaca7655 español 2017-04-26 09:20:23 -06:00
Riley Davis 03e0c62b72 accepted => approved 2017-04-26 08:45:37 -06:00
Riley Davis a21d73dcad accepted queue 2017-04-26 08:26:29 -06:00
Kiwi b20d8c18a3 Merge branch 'master' into report-popup-fix 2017-04-26 21:22:23 +07:00
David Erwin 85674b3ef5 Merge branch 'master' into query-composition 2017-04-26 10:09:14 -04:00
Chi Vinh Le d56c35ea64 Merge branch 'master' into query-composition 2017-04-26 19:28:46 +07:00
Chi Vinh Le 9ff2ccf1ed Safari IOS ignores width=100% in iframes 2017-04-26 18:52:30 +07:00