wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-06-28 14:13:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,099 Commits 10 Branches 125 Tags
6652368221b993da66052ef7bfdac0e8ece9cbb6
Commit Graph

323 Commits

Author SHA1 Message Date
Chi Vinh Le fc31a2882d Add a comment 2017-07-12 21:05:29 +07:00
Chi Vinh Le 23cc3548d4 Query by tags 2017-07-12 20:55:54 +07:00
Chi Vinh Le db3187cb56 Merge branch 'master' into live-suspension 2017-06-27 20:08:53 +07:00
Chi Vinh Le c90c177b7c Live update on stream when banned user, suspended user or rejected username 2017-06-27 20:06:27 +07:00
Belen Curcio 2745245564 updated 2017-06-26 14:39:10 -03:00
Belen Curcio 59407e99d7 commentCount by asset_url 2017-06-26 09:59:28 -03:00
Kim Gardner b76578b866 Merge branch 'master' into refactor-ban-suspend-actions 2017-06-23 16:17:26 +01:00
Wyatt Johnson 010f0cb0d7 Added support for keep alive websocket frames 2017-06-22 14:32:49 -06:00
Chi Vinh Le 8bb38c5ee5 Refactor and reuse "Actions" in "Moderate" and "Community" 2017-06-22 21:50:19 +07:00
Wyatt Johnson f537b4a772 Merge branch 'master' into pat 2017-06-21 11:34:18 -06:00
Chi Vinh Le 70276c3358 Fix subscription issues 2017-06-20 01:01:39 +07:00
Kim Gardner ba81399707 Merge branch 'master' into pat 2017-06-19 18:03:23 +01:00
Chi Vinh Le fbbd0fa027 Merge branch 'master' into subscribe-mod-actions 
Conflicts:
	client/coral-admin/src/routes/Moderation/components/Moderation.js
	client/coral-admin/src/routes/Moderation/components/styles.css
	client/coral-admin/src/routes/Moderation/containers/Moderation.js
 2017-06-19 23:52:10 +07:00
Belen Curcio 991bdc6089 Updated BE 2017-06-16 16:18:02 -03:00
Belen Curcio 89cf13b4cf Updates 2017-06-16 15:05:22 -03:00
Chi Vinh Le c14c3fbe23 Streamline perm names 2017-06-17 00:03:33 +07:00
Chi Vinh Le 74fbadcc0f Refactor subscriptions 2017-06-16 22:55:22 +07:00
Chi Vinh Le 2625b372e1 Handle comment flags 2017-06-16 20:06:13 +07:00
Chi Vinh Le 5f450adbaf Simplify subscription 2017-06-16 19:19:59 +07:00
Wyatt Johnson b78d4f29ea Added PAT support 2017-06-15 18:12:53 -04:00
Belen Curcio 928e19ed67 Merge branch 'master' of github.com:coralproject/talk into search-stories 2017-06-15 14:14:13 -03:00
Chi Vinh Le 312103098c More mod queue fixes 2017-06-15 23:27:31 +07:00
Chi Vinh Le 303b3ea0f5 Support live comment edit update 2017-06-15 22:46:38 +07:00
Chi Vinh Le 3658a804b0 Implement live updates for mod actions 2017-06-15 01:08:25 +07:00
Chi Vinh Le 7d8f2aa876 More robust reactions 2017-06-13 22:02:54 +07:00
Belen Curcio c902a4b05b Merge branch 'search-stories' of github.com:coralproject/talk into search-stories 2017-06-12 16:31:14 -03:00
Belen Curcio 8a3833ec11 Merge issues 2017-06-12 16:30:59 -03:00
Belén Curcio d45c396013 Merge branch 'master' into search-stories 2017-06-12 16:27:39 -03:00
Chi Vinh Le 70177d3a2c Cleanup 2017-06-12 23:45:46 +07:00
Chi Vinh Le 2a283a9a5a Support live updates 2017-06-12 23:21:27 +07:00
riley c7d5ab935f merge master 2017-06-09 15:27:44 -06:00
Riley Davis de665b3a0d show stories in dropdown 2017-06-09 14:10:21 -06:00
Wyatt Johnson 140f980c14 Merge branch 'master' into subscription-fixes 2017-06-08 15:09:37 -06:00
Wyatt Johnson 32708e9098 submscription fixes 2017-06-08 15:08:18 -06:00
Chi Vinh Le 4e5680577e Include public comments 2017-06-09 01:17:27 +07:00
Belen Curcio 63a35cbceb Merge issues 2017-06-07 16:38:36 -03:00
Chi Vinh Le 6b0cdae183 Subscribe to comments 2017-06-05 20:51:08 +07:00
Riley Davis d981b5a85b Merge branch 'master' into user-comment-history 2017-06-01 10:52:24 -06:00
Chi Vinh Le 5245755d49 Add some comments 2017-06-01 19:41:08 +07:00
Chi Vinh Le 30d4562383 Refactor pagination 2017-06-01 01:18:41 +07:00
Riley Davis 29753a958b show comments on the UserDetail drawer 2017-05-30 15:50:56 -06:00
riley add3cbf7b3 hasRoles is no longer a function 2017-05-22 15:10:56 -06:00
riley ec03c6b48c merge master 2017-05-22 13:10:43 -06:00
Wyatt Johnson 8f219c47a7 Tag server impl 2017-05-19 12:23:53 -06:00
riley 2c620c868d merge master 2017-05-19 11:05:46 -06:00
Kiwi 8cb9945e25 Merge branch 'master' into multiple-roles 2017-05-19 23:26:45 +07:00
Chi Vinh Le 1374217680 Merge branch 'master' into suspend-user 2017-05-19 17:46:06 +07:00
Chi Vinh Le 061c18670b Merge branch 'master' into suspend-user 
Conflicts:
	client/coral-admin/src/constants/moderation.js
	client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
 2017-05-19 02:19:24 +07:00
Chi Vinh Le 859a0b1fbe Make until arg required 2017-05-19 02:03:36 +07:00
Chi Vinh Le d995cdde07 Make email message required 2017-05-19 02:01:47 +07:00