wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-06-28 16:47:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,545 Commits 10 Branches 125 Tags
c30d05fd6c19b9be0e97ef0ed3e66d1dc10fbaf2
Commit Graph

128 Commits

Author SHA1 Message Date
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 ec03c6b48c merge master 2017-05-22 13:10: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 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
Chi Vinh Le f641a3ec40 Complete suspend user implementation 2017-05-19 01:52:03 +07:00
Chi Vinh Le 76e87f4c34 Move previous suspendUser feature to rejectUsername 2017-05-18 02:28:01 +07:00
Wyatt Johnson 7a256bdd2b Merge branch 'master' into 142993479-tags 2017-05-17 10:01:58 -06:00
Chi Vinh Le 71c743dda7 Extend backend to support new suspend feature 2017-05-17 20:05:18 +07:00
Wyatt Johnson f4b9191476 Added author_id to comment count query 2017-05-16 14:20:20 -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
Wyatt Johnson 50db2d1dda Initial merge of trust functionality 2017-05-15 15:28:57 -06:00
Wyatt Johnson ed27209de9 More edit changes 2017-05-12 10:09:25 -06:00
Wyatt Johnson f4dfb21e15 reverted pagination work 2017-05-12 09:14:25 -06:00
Wyatt Johnson e6b2ff19b8 fixing graph merge error 2017-05-12 07:51:53 -06:00
Wyatt Johnson e2f6d5989a Merge branch 'master' into 142993479-tags 2017-05-12 07:49:02 -06:00
Wyatt Johnson 47186c4eac some changes to loaders 2017-05-11 17:52:07 -06:00
Wyatt Johnson d497ad3369 initial pagination rewrite, cleanups to comment edit 2017-05-11 17:27:02 -06:00
Wyatt Johnson aeaf809a0f Made queries more generic related to tags 2017-05-11 14:42:06 -06:00
Wyatt Johnson 2e1bc8d75a Adjusted query/tag flow 2017-05-09 15:01:01 -06:00
gaba cb09c50820 Error on duplicate. 2017-05-08 13:11:48 -07: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
Gabriela Rodríguez Berón 28920eb357 Merge branch 'master' into 142993479-tags 2017-05-05 08:44:09 -07:00
riley 57b0b5ec67 add a drawer for the user details 2017-05-04 13:58:43 -06:00
Benjamin Goering b97fa228b1 merge with master after huge coral-embed-stream refactor 2017-05-03 19:19:03 -07:00
Benjamin Goering 0ba973fb44 editComment returns status of comment after edit. UI shows appropriate notifications if PREMOD or REJECTED 2017-05-03 18:05:06 -07:00
riley 26ebdde244 Merge branch 'master' into user-detail-ui 2017-05-03 14:25:40 -06:00
Benjamin Goering ae3cbe990b Edit Comment UI reflects expired edit comment window 2017-05-03 12:34:22 -07:00
riley 4a42436b7b load user via HOC UserDetail 2017-05-03 12:54:02 -06:00
riley 9e1b470cb5 saving my place 2017-05-03 09:32:05 -06:00
Benjamin Goering a46773887f Initial working editComment mutation 2017-05-02 14:27:16 -05:00
Belen Curcio e1929f148a Removing likes from the core graph 2017-05-01 10:58:14 -03:00
Kim Gardner 058aa3f907 Merge branch 'master' into 142993479-tags 2017-04-27 11:59:48 -04:00
gaba c4ffe58f58 Adds privacy type to the methods to add tags. 2017-04-21 14:30:41 -07:00
Wyatt Johnson 1f562c8fad Merge branch 'master' into subscriptions 2017-04-20 15:17:44 -06:00
David Erwin 7c38b9b54f Merge branch 'master' into default-resolve-type 2017-04-20 16:03:38 -04:00
Riley Davis eda15538fe add kiwi's and wyatt's changes 2017-04-20 10:02:09 -06:00
Wyatt Johnson e1c8e75405 Merge branch 'master' into subscriptions 2017-04-18 15:43:25 -06:00
Wyatt Johnson 2eda1cb1e4 Added defaultResolveType 2017-04-18 14:50:57 -06:00
Belen Curcio e729a673a3 Merge branch 'master' of github.com:coralproject/talk into plugin_examples 2017-04-17 14:17:42 -03:00
Wyatt Johnson 7fac8ef073 Merge branch 'master' into subscriptions 2017-04-17 08:03:14 -06:00
Gabriela Rodríguez Berón fb6ba37366 Merge branch 'master' into docs-metrics 2017-04-14 10:40:28 -07:00
gaba 9cf31e0bfa A note on the from/to parameters. 2017-04-14 10:37:05 -07:00
Benjamin Goering 118da885fd Merge branch 'master' of github.com:coralproject/talk into ignore_rb2 2017-04-13 12:12:10 -05:00