wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-18 12:30:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,873 Commits 10 Branches 125 Tags
bf7dfefcdfdfd312acd226af114cdf66d92d2a4c
Commit Graph
204 Commits
Author SHA1 Message Date
Chi Vinh Le e4490e20a7 Merge branch 'master' into user-sort 
Conflicts:
	package.json
 2017-08-28 18:16:18 +07:00
Wyatt Johnson 8a5db167ff changed sort -> sortOrder 2017-08-25 09:59:37 -06:00
Chi Vinh Le 48595a1bbf Merge branch 'master' into user-sort 
Conflicts:
	client/coral-admin/src/reducers/moderation.js
	client/coral-embed-stream/src/actions/stream.js
	client/coral-embed-stream/src/components/Stream.js
	client/coral-framework/components/Slot.js
	plugin-api/beta/client/utils/index.js
	test/server/routes/api/account/index.js
 2017-08-25 21:55:00 +07:00
Belén Curcio ce63942902 Merge branch 'master' into questionbox 2017-08-25 11:52:11 -03:00
Belen Curcio 3d0d5df139 Markdown Added 2017-08-24 18:16:32 -03:00
Chi Vinh Le bf89409f60 Remove global dependency on Storage 2017-08-23 19:53:06 +07:00
Chi Vinh Le 61e601a2a5 Merge branch 'master' into refactor-global-dependencies 2017-08-23 04:05:56 +07:00
Chi Vinh Le a23bad49c6 Remove global dependency on notification on admin 2017-08-23 03:48:20 +07:00
Wyatt Johnson f85480c0ae Merge branch 'master' into user-sort 2017-08-22 13:04:32 -06:00
Chi Vinh Le fccbcce7a8 Remove global dependency on registry and plugins 2017-08-23 01:41:58 +07:00
Belen Curcio cb4d2998f6 Removing logic from ReplyBadge 2017-08-22 09:40:49 -03:00
Belen Curcio c402627280 Adding Reply Badge to User History 2017-08-21 17:27:32 -03:00
Belen Curcio 647b5ed745 Adding Reply Badge 2017-08-21 17:09:26 -03:00
Belen Curcio a540dfe8d4 Adding hasParent on Comment to the Graph 2017-08-21 16:21:39 -03:00
Wyatt Johnson ec2c62a607 Merge branch 'master' into user-sort 2017-08-21 08:48:26 -06:00
Chi Vinh Le 077bc5ad33 Fix typo 2017-08-21 17:09:15 +07:00
Chi Vinh Le 58a5d5eea8 Refactor Moderation Comment a little bit 2017-08-18 23:20:05 +07:00
Chi Vinh Le 0a602b79c3 Enable optimization for more slots 2017-08-18 22:21:51 +07:00
Wyatt Johnson 686eb614f7 changed cursor to Cursor scalar type, changed SORT_ORDER 2017-08-17 16:43:55 -06:00
Kim Gardner 1ca40a3592 Merge branch 'master' into rm-immutable-js 2017-08-15 11:27:45 +01:00
Chi Vinh Le 2e8863285d Rm immutable-js from admin 2017-08-14 16:49:00 +07:00
Chi Vinh Le 45cf72256b Fix dashboard links 2017-08-11 21:11:59 +07:00
Kiwi 0f93d6ce8a Merge branch 'master' into pluggable-modqueues 2017-08-10 18:01:06 +02:00
Chi Vinh Le 6794827a77 Support adding modqueues from plugins 2017-08-10 20:23:31 +07:00
Chi Vinh Le 83ded4bda9 Refactor into queueConfig 2017-08-10 18:37:14 +07:00
Kim Gardner d947e103fc Merge branch 'master' into pre-responsive-admin-cleanup 2017-08-10 10:57:40 +01:00
IAmSamHankins ca422f0109 mod queue nav styling adjust 2017-08-09 10:23:03 -05:00
IAmSamHankins 53cac48e3b resizing of the comment component 2017-08-07 11:53:39 -05:00
IAmSamHankins 27216cbfdb hierarchy for asset search title 2017-08-07 10:32:21 -05:00
IAmSamHankins 76b125f042 adjustments to comment queue counters 2017-08-04 13:42:19 -04:00
Chi Vinh Le 12d3273d3d Support load more in user history 2017-08-04 22:02:44 +07:00
Chi Vinh Le da0d0349dd Implement approve and live updates 2017-08-02 21:34:48 +07:00
Chi Vinh Le b6b7570bcc Remove subscription code 2017-08-02 18:14:52 +07:00
Belen Curcio 145910c4a6 Merge branch 'master' of github.com:coralproject/talk into featured-adm 2017-08-01 18:27:12 -03:00
Belen Curcio 4e5f1528f9 BE Subscription for Featured Comments 2017-08-01 18:27:02 -03:00
Belen Curcio 779260c245 Working featured comments on the admin side 2017-08-01 13:06:21 -03:00
Chi Vinh Le d2c8019408 Change moderate link 2017-08-01 17:28:51 +07:00
Chi Vinh Le 33a30e4f8d Remove unnessecary query fields 2017-08-01 17:24:48 +07:00
Chi Vinh Le 59ea17119d Remove unnessecary arrow function 2017-08-01 17:20:29 +07:00
Belen Curcio 78e74336db Moderator Featured Tag/Button 2017-07-31 18:07:37 -03:00
Belen Curcio 694669bb85 Removing withRouter 2017-07-31 15:51:32 -03:00
Belen Curcio 91d9d65372 Removing logic and adding active tabs 2017-07-31 15:46:06 -03:00
Belen Curcio 344d1840f0 lingin 2017-07-31 13:41:13 -03:00
Belen Curcio 4079a74ab8 Updated componentWillReceiveProps 2017-07-31 13:18:54 -03:00
Belen Curcio 31112b3a20 Passing to the container 2017-07-31 12:36:58 -03:00
Belen Curcio 84391d9d69 Routes taking :id 2017-07-31 10:45:18 -03:00
Belen Curcio 371348ced5 changes 2017-07-31 10:03:58 -03:00
Belen Curcio 4f34827ec8 accepted to approved 2017-07-31 09:38:39 -03:00
Belen Curcio c9df0e5e40 Changes 2017-07-31 09:36:00 -03:00
Belen Curcio 1b583fb945 Reported has priority over premod queue or new queue 2017-07-28 15:51:21 -03:00