 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 |
|
|
Kim Gardner
|
3e65eac7a0
|
Merge branch 'master' into refactor-global-dependencies
|
2017-08-25 15:18:46 +01:00 |
|
|
Belen Curcio
|
3d0d5df139
|
Markdown Added
|
2017-08-24 18:16:32 -03:00 |
|
|
Chi Vinh Le
|
645aaa09ae
|
Add some docs
|
2017-08-24 18:40:38 +07:00 |
|
|
Chi Vinh Le
|
c2b0a60d8a
|
Remove global dependency on router history
|
2017-08-23 20:02:36 +07: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 |
|
|
Chi Vinh Le
|
1ee7c81675
|
Remove admin store impl
|
2017-08-23 02:24:26 +07:00 |
|
|
Chi Vinh Le
|
a934722672
|
Cleanup
|
2017-08-23 02:23:18 +07:00 |
|
|
Belen Curcio
|
9fa1f3d958
|
Adding auto escape
|
2017-08-22 16:15:41 -03: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 |
|
|
Chi Vinh Le
|
54ea0b1a3f
|
Remove global dependency on store, rest, pym and apollo client
|
2017-08-22 22:04:49 +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
|
74f778aef7
|
Merge branch 'master' into talk-provider
Conflicts:
client/coral-embed-stream/src/containers/Embed.js
plugin-api/beta/client/hocs/withReaction.js
|
2017-08-21 21:38:39 +07:00 |
|
|
Chi Vinh Le
|
9566f83eac
|
Remove coral-framework reducers
Some of them were only related to the embed stream.
Auth code is too convoluted with the embed stream and can't be reused atm.
|
2017-08-21 21:31:54 +07:00 |
|
|
Chi Vinh Le
|
84e4091ea6
|
Implement TalkProvider
|
2017-08-21 21:23:59 +07:00 |
|
|
Chi Vinh Le
|
077bc5ad33
|
Fix typo
|
2017-08-21 17:09:15 +07:00 |
|
|
Chi Vinh Le
|
f49591225f
|
Use UserDetailComment container
|
2017-08-19 00:10:31 +07:00 |
|
|
Chi Vinh Le
|
4b9990e154
|
Merge branch 'master' into optimization
Conflicts:
client/coral-embed-stream/src/components/Comment.js
client/coral-embed-stream/src/components/Stream.js
|
2017-08-18 23:30:28 +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
|
6c19b90652
|
Merge branch 'master' into user-sort
|
2017-08-18 09:14:19 -06:00 |
|
|
Belen Curcio
|
64580696fb
|
Reliability Added
|
2017-08-18 11:42:23 -03:00 |
|
|
Belen Curcio
|
1dcdccecbc
|
UserDetail UI redone and Flagging Reliability added
|
2017-08-18 10:19:10 -03:00 |
|
|
Chi Vinh Le
|
6a5f6e3ce1
|
Adapt loading detection
|
2017-08-18 17:57:32 +07:00 |
|
|
Wyatt Johnson
|
686eb614f7
|
changed cursor to Cursor scalar type, changed SORT_ORDER
|
2017-08-17 16:43:55 -06:00 |
|
|
Belen Curcio
|
ef815005a8
|
Úpdated suspected words
|
2017-08-17 13:12:07 -03:00 |
|
|
Belen Curcio
|
abb8b775b9
|
working banned and suspended words
|
2017-08-17 12:44:20 -03: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
|
c62e7328c5
|
adjustments to top navigation and logo
|
2017-08-09 10:15:52 -05:00 |
|
|
Kiwi
|
528c2a9491
|
Merge branch 'master' into view-more-history
|
2017-08-08 17:55:17 +02: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
|
ddadd6c5d3
|
adjustments/fixes to approved rejected widths
|
2017-08-07 10:26:42 -05:00 |
|