wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-06-30 02:56:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,095 Commits 10 Branches 125 Tags
bd5e272f00a6a84ec5ee73d6d8ddfc0b342971fe
Commit Graph

228 Commits

Author SHA1 Message Date
Chi Vinh Le ee2068f5f1 Merge branch 'master' into auth-flow 
Conflicts:
	client/coral-admin/src/actions/auth.js
 2017-05-27 01:07:19 +07:00
Chi Vinh Le d4569b5f51 Set cookie for facebook login on safari 2017-05-26 21:37:11 +07:00
Chi Vinh Le 6a9f216c0f Detect mobile & desktop safari server side 2017-05-26 20:58:48 +07:00
Belen Curcio 8edc16ed85 Removing logs 2017-05-25 20:06:49 -03:00
Belen Curcio 8171cb53e1 Ádding another extractor 2017-05-25 20:04:32 -03:00
Belen Curcio cbf7cc67f4 Extracting token from cookie if safari 2017-05-25 18:30:01 -03:00
Belen Curcio a8c361e2f7 by hostname 2017-05-25 16:53:12 -03:00
Belen Curcio 75080cfe30 Password reset and valid locations 2017-05-25 16:19:19 -03:00
Belen Curcio e510553d9a Sending cookies if safari 2017-05-25 13:55:03 -03:00
Belen Curcio bb6be9a734 BE implementation 2017-05-25 11:53:40 -03: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 3688d3f970 Gracefully allow user with no email 2017-05-19 17:53:10 +07:00
Chi Vinh Le 1d6455058e Apply review suggestions 2017-05-19 17:51:58 +07:00
Chi Vinh Le 1374217680 Merge branch 'master' into suspend-user 2017-05-19 17:46:06 +07:00
riley 6deee7cb80 add a perms utils file 2017-05-18 14:28:43 -06: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 0040bc4c01 Remove remaining debug msgs 2017-05-19 02:12:27 +07:00
Chi Vinh Le f641a3ec40 Complete suspend user implementation 2017-05-19 01:52:03 +07:00
riley ff75b9474a merge master 2017-05-18 12:18:00 -06:00
Benjamin Goering fb33eefe8e trivial changes requested by review 2017-05-18 08:19:52 -07:00
Benjamin Goering cb1a4ee1cc remove extraneous console.log 2017-05-17 15:40:32 -07: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
Chi Vinh Le 71c743dda7 Extend backend to support new suspend feature 2017-05-17 20:05:18 +07:00
riley 03ce044c53 merge master 2017-05-16 16:33:41 -06:00
Wyatt Johnson 50db2d1dda Initial merge of trust functionality 2017-05-15 15:28:57 -06:00
Belen Curcio b2e5c0452a The merge conficts 2017-05-15 17:13:48 -03:00
Wyatt Johnson 9bee31198e Added logout routes 2017-05-15 10:03:09 -06:00
Belen Curcio 8754ade5a4 merge 2017-05-12 21:52:29 -03:00
Wyatt Johnson ed27209de9 More edit changes 2017-05-12 10:09:25 -06:00
Wyatt Johnson ae5da93730 linting fixes 2017-05-11 17:44:51 -06:00
Wyatt Johnson d497ad3369 initial pagination rewrite, cleanups to comment edit 2017-05-11 17:27:02 -06:00
Riley Davis 14b483d089 create roles helper 2017-05-11 14:23:02 -06:00
Kim Gardner 1314f1972a Merge branch 'master' into edit-comment 2017-05-10 15:25:27 -04:00
Wyatt Johnson a3a8d23797 patched bug with adding action 2017-05-10 12:18:42 -06:00
Wyatt Johnson f8b207e563 Return a meaningful error 2017-05-10 10:29:20 -06:00
Wyatt Johnson 785e5a4ac8 Collected config 2017-05-09 16:49:11 -06:00
Benjamin Goering f37a210479 Only use errors from errors.js for EditWindowHasEnded 2017-05-09 15:02:26 -07:00
Wyatt Johnson 76d0fdfd67 Added docs 2017-05-09 15:32:19 -06:00
Benjamin Goering 096025b72a Add asset_id to editComment mutation to allow mongo query happy path to be atomic 2017-05-08 09:57:52 -07:00
Wyatt Johnson 95f9bac254 Initial migration to JWT 2017-05-05 15:42:34 -06:00
Benjamin Goering b97fa228b1 merge with master after huge coral-embed-stream refactor 2017-05-03 19:19:03 -07:00
Benjamin Goering c3f3ed8a50 Comment edit is no longer extended one ach edit 2017-05-03 14:17:36 -07:00
Benjamin Goering 818c09a9b8 Edit window is now 30s instead of 5min 2017-05-03 14:06:07 -07:00
Benjamin Goering ae3cbe990b Edit Comment UI reflects expired edit comment window 2017-05-03 12:34:22 -07:00
Benjamin Goering b9a3466e2e Edit UI sends editComment mutation, handles errors 2017-05-02 22:07:23 -05:00
Benjamin Goering aa18a433f8 Can't edit comment outside of edit window 2017-05-02 16:47:00 -05:00
Benjamin Goering a46773887f Initial working editComment mutation 2017-05-02 14:27:16 -05:00
Belén Curcio 7d56404e84 Merge branch 'master' into subscriptions 2017-04-24 18:09:34 -03:00