 Chi Vinh Le
|
f9bc5f79ec
|
Don't sort and ignore duplicate comments (embed-stream)
|
2017-08-28 18:08:33 +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 |
|
|
Kim Gardner
|
0ecf1cedc3
|
Merge pull request #874 from coralproject/refactor-global-dependencies
Dependency Management
|
2017-08-25 15:41:53 +01:00 |
|
|
Chi Vinh Le
|
7f899b0440
|
Attach to fragments tree
|
2017-08-25 21:40:57 +07:00 |
|
|
Chi Vinh Le
|
88b2798718
|
Merge branch 'user-sort' of ssh://github.com/coralproject/talk into user-sort
|
2017-08-25 21:30:24 +07:00 |
|
|
Chi Vinh Le
|
e3227322a5
|
Some docs
|
2017-08-25 21:22:48 +07:00 |
|
|
Kim Gardner
|
a767ab73da
|
Update default plugins to include new sorts
|
2017-08-25 15:20:05 +01:00 |
|
|
Kim Gardner
|
3e65eac7a0
|
Merge branch 'master' into refactor-global-dependencies
|
2017-08-25 15:18:46 +01:00 |
|
|
Kim Gardner
|
1b6b0a4b87
|
Merge pull request #878 from coralproject/bump-version-3-3-0
Update version to 3.3.0
|
2017-08-25 15:18:36 +01:00 |
|
|
Chi Vinh Le
|
42951aaf0b
|
Adding proptypes
|
2017-08-25 21:17:15 +07:00 |
|
|
Chi Vinh Le
|
6b96fcfad1
|
Only unsubscribe from newest comments
|
2017-08-25 21:05:30 +07:00 |
|
|
Chi Vinh Le
|
38c290958c
|
Merge branch 'user-sort' of ssh://github.com/coralproject/talk into user-sort
|
2017-08-25 20:22:09 +07:00 |
|
|
Chi Vinh Le
|
e51e8c543f
|
Add more sort options and improve styling
|
2017-08-25 20:15:07 +07:00 |
|
|
Kim Gardner
|
59ddcea592
|
Update version to 3.3.0
|
2017-08-25 13:55:19 +01:00 |
|
|
Chi Vinh Le
|
9e2f6f1f63
|
Use factory
|
2017-08-25 19:40:55 +07:00 |
|
|
Chi Vinh Le
|
6ae68a4f90
|
First working version
|
2017-08-25 19:21:57 +07:00 |
|
|
Chi Vinh Le
|
f0931b4dc6
|
Fix asset.comment resolver
|
2017-08-25 19:21:14 +07:00 |
|
|
Kim Gardner
|
62687f307a
|
Merge pull request #877 from coralproject/own-user-comments
Cleaned up user query logic
|
2017-08-25 12:37:16 +01:00 |
|
|
Kim Gardner
|
a83ea98978
|
Merge branch 'master' into own-user-comments
|
2017-08-25 12:22:53 +01:00 |
|
|
Kim Gardner
|
7aadaa6f8b
|
Merge pull request #873 from coralproject/banned-words
Banned Words / Suspect Words Fix
|
2017-08-25 12:22:28 +01:00 |
|
|
Wyatt Johnson
|
60677e3d2a
|
cleaned up user query logic
|
2017-08-24 13:07:44 -06:00 |
|
|
Wyatt Johnson
|
13796fb268
|
added more test cases
|
2017-08-24 11:18:17 -06:00 |
|
|
Wyatt Johnson
|
308449a67c
|
added more messaging for cli tool
|
2017-08-24 10:24:56 -06:00 |
|
|
Kim Gardner
|
c733b7760d
|
Merge branch 'master' into banned-words
|
2017-08-24 17:22:49 +01:00 |
|
|
Kiwi
|
a56240675d
|
Merge branch 'master' into refactor-global-dependencies
|
2017-08-24 18:17:19 +02:00 |
|
|
Kim Gardner
|
1381395dde
|
Merge pull request #875 from coralproject/moderator-community
Moderator Community
|
2017-08-24 17:14:46 +01:00 |
|
|
Wyatt Johnson
|
9a1374070f
|
small fixes
|
2017-08-24 09:47:27 -06:00 |
|
|
Kim Gardner
|
1e8ff9de7e
|
Merge branch 'master' into moderator-community
|
2017-08-24 15:35:48 +01:00 |
|
|
Chi Vinh Le
|
ddb555e07f
|
Add new sorting variables
|
2017-08-24 21:30:16 +07:00 |
|
|
Chi Vinh Le
|
d1a3a67b35
|
Fix featured comments
|
2017-08-24 20:12:08 +07:00 |
|
|
Chi Vinh Le
|
df60ac4714
|
Merge branch 'master' into user-sort
|
2017-08-24 20:09:44 +07:00 |
|
|
Chi Vinh Le
|
ca31dedca8
|
Make comments query optional
|
2017-08-24 20:07:45 +07:00 |
|
|
Kiwi
|
cb7213ea58
|
Merge branch 'master' into refactor-global-dependencies
|
2017-08-24 13:49:46 +02:00 |
|
|
Kiwi
|
2d7d505913
|
Merge branch 'master' into banned-words
|
2017-08-24 13:49:31 +02:00 |
|
|
Chi Vinh Le
|
a42d668329
|
Merge branch 'refactor-global-dependencies' of ssh://github.com/coralproject/talk into refactor-global-dependencies
|
2017-08-24 18:47:09 +07:00 |
|
|
Chi Vinh Le
|
645aaa09ae
|
Add some docs
|
2017-08-24 18:40:38 +07:00 |
|
|
Kim Gardner
|
8b04da9cf4
|
Merge pull request #876 from coralproject/useful-errors
Added message to Extendable Errors
|
2017-08-24 12:24:42 +01:00 |
|
|
Wyatt Johnson
|
acf792089d
|
added more db optims
|
2017-08-23 15:42:30 -06:00 |
|
|
Wyatt Johnson
|
38469a7e69
|
Added message to Extendable Error's
|
2017-08-23 13:30:23 -06:00 |
|
|
Wyatt Johnson
|
763f753928
|
Merge branch 'master' into refactor-global-dependencies
|
2017-08-23 11:56:35 -06:00 |
|
|
Wyatt Johnson
|
1a27f0e00f
|
Merge branch 'master' into moderator-community
|
2017-08-23 11:56:06 -06:00 |
|
|
Wyatt Johnson
|
6d8185c33e
|
modified middleware to change AND -> OR, added mod to com pages
|
2017-08-23 11:52:02 -06:00 |
|
|
Belén Curcio
|
3f83a8f1a9
|
Merge pull request #868 from coralproject/slot-username
New Slot: commentAuthorName
|
2017-08-23 14:20:41 -03:00 |
|
|
Kiwi
|
f5eac91e0e
|
Merge branch 'master' into refactor-global-dependencies
|
2017-08-23 18:02:17 +02:00 |
|
|
Wyatt Johnson
|
a68513227a
|
adjusted tokenizer to use regex based tokenizer instead
|
2017-08-23 09:54:00 -06:00 |
|
|
Chi Vinh Le
|
ce360a47f8
|
Add slot to fragments in featured comments
|
2017-08-23 22:40:48 +07:00 |
|
|
Chi Vinh Le
|
1bcf31d22d
|
Merge branch 'slot-username' of ssh://github.com/coralproject/talk into slot-username
|
2017-08-23 20:15:44 +07:00 |
|
|
Chi Vinh Le
|
ceba418e28
|
created_at is a Date
|
2017-08-23 20:14:55 +07:00 |
|
|
Belén Curcio
|
0961797f8f
|
Merge branch 'master' into banned-words
|
2017-08-23 10:10:04 -03:00 |
|