wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-06-29 08:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,039 Commits 10 Branches 125 Tags
b8d00ec9ceee3b5fd41e809c6400a6cf435d0ee1
Commit Graph

182 Commits

Author SHA1 Message Date
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
Wyatt Johnson f537b4a772 Merge branch 'master' into pat 2017-06-21 11:34:18 -06: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 89cf13b4cf Updates 2017-06-16 15:05:22 -03: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
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
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
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
Chi Vinh Le 30d4562383 Refactor pagination 2017-06-01 01:18:41 +07: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
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
riley ff75b9474a merge master 2017-05-18 12:18:00 -06:00
Benjamin Goering d93ad38dd1 Admins can change Edit Comment Window length in Moderation Settings 2017-05-17 15:39:19 -07:00
Chi Vinh Le 76e87f4c34 Move previous suspendUser feature to rejectUsername 2017-05-18 02:28:01 +07:00
Riley Davis c66e3141e0 actually check permissions 2017-05-17 11:38:43 -06:00
Wyatt Johnson 7a256bdd2b Merge branch 'master' into 142993479-tags 2017-05-17 10:01:58 -06:00
Chi Vinh Le 056ff427a5 Merge branch 'master' into suspend-user 2017-05-17 21:50:28 +07:00
Chi Vinh Le 71c743dda7 Extend backend to support new suspend feature 2017-05-17 20:05:18 +07:00
Wyatt Johnson fde4dee52f Resolver cleanup 2017-05-16 17:26:34 -06:00
riley d081c0c5b5 remove context 2017-05-16 16:34:04 -06:00
riley 03ce044c53 merge master 2017-05-16 16:33:41 -06:00
Wyatt Johnson f4b9191476 Added author_id to comment count query 2017-05-16 14:20:20 -06:00
Riley Davis 4ca5c4bc09 Merge branch 'master' into user-detail-ui 2017-05-16 13:54:13 -06:00
Chi Vinh Le 7d858c7b3f Readd lastComment field to asset resolver 2017-05-17 01:25:06 +07:00
riley c7e9fe3f5f update backend with the can() method 2017-05-16 10:50:09 -06:00
Wyatt Johnson e90ce7f4c3 fixed merge issue 2017-05-16 10:20:16 -06:00
Wyatt Johnson 3e2ed222ed Merge branch 'trust-merge' into user-detail-ui 2017-05-16 09:53:35 -06:00
riley 7896b3f33b merge master 2017-05-16 09:43:49 -06:00
riley 4d3788e4c9 saving my place so i dont have too many threads 2017-05-15 16:25:32 -06:00
Wyatt Johnson 50db2d1dda Initial merge of trust functionality 2017-05-15 15:28:57 -06:00
Belen Curcio c59346eb0a tags, and assignedby nul 2017-05-15 18:13:45 -03:00
Belen Curcio c3d02a14a0 Updated queries and hasRoles 2017-05-15 18:11:14 -03:00
Wyatt Johnson a5c9a8e4b0 cleaned up graph, standardised mutation 2017-05-12 14:04:09 -06:00