Riley Davis
|
ad0f530fd3
|
don't return unpublished comments in My Comments section. add tests
|
2017-01-12 17:07:35 -07:00 |
|
Riley Davis
|
5136fce4a3
|
Merge branch 'master' into pending-queue-routes
|
2017-01-12 15:34:13 -07:00 |
|
Riley Davis
|
0eefd3364b
|
update tests
|
2017-01-12 15:25:36 -07:00 |
|
Wyatt Johnson
|
6e89734e12
|
Moved errors to errors.js, std error msgs/types
|
2017-01-12 14:08:52 -07:00 |
|
Riley Davis
|
b66efb7f2a
|
return flagged comments
|
2017-01-12 13:44:10 -07:00 |
|
gaba
|
a02ad69568
|
Adds specific fields to the metadata in the action when flagging because suspect word.
|
2017-01-03 09:36:20 -03:00 |
|
Riley Davis
|
9d1d109ec0
|
Merge branch 'master'
Conflicts:
client/coral-admin/src/reducers/index.js
|
2016-12-22 12:28:55 -07:00 |
|
David Jay
|
a3eb4f5c76
|
Merge branch 'add-flag-option' of github.com:coralproject/talk into add-flag-option
|
2016-12-20 11:31:57 -08:00 |
|
David Jay
|
be3d506459
|
Moving action metadata to nested object.
|
2016-12-19 20:10:42 -05:00 |
|
Riley Davis
|
d65f786dcd
|
Merge branch 'master'
Conflicts:
routes/api/comments/index.js
|
2016-12-19 10:28:54 -07:00 |
|
Wyatt Johnson
|
7f12741c13
|
added comments to linter
|
2016-12-16 16:46:15 -07:00 |
|
riley
|
27116b84ce
|
Merged master into suspect-wordlist
|
2016-12-15 16:12:19 -07:00 |
|
Wyatt Johnson
|
9cf2d88ce2
|
Merge branch 'master' into suspect-wordlist
|
2016-12-15 13:51:16 -07:00 |
|
Riley Davis
|
39fdd168fa
|
admins can still view all comment streams
|
2016-12-15 13:18:28 -07:00 |
|
Riley Davis
|
f4ee28c618
|
allow non-admin folks to list their comments
|
2016-12-15 13:05:59 -07:00 |
|
Riley Davis
|
29b6fc08cd
|
hydrate the assets in the comment response
|
2016-12-14 14:41:54 -07:00 |
|
Riley Davis
|
a6fdd2e46b
|
remove redundant endpoint
|
2016-12-14 13:53:07 -07:00 |
|
Riley Davis
|
243bd50894
|
Merged branch master into my-comments
|
2016-12-13 15:01:34 -07:00 |
|
riley
|
2be60b3208
|
Merged master into my-comments
|
2016-12-13 14:33:17 -07:00 |
|
Riley Davis
|
454357fa55
|
Merge branch 'master' into view-char-count
|
2016-12-13 12:09:52 -07:00 |
|
David Jay
|
643373e224
|
Rejecting comments on the server if the character count is too long.
|
2016-12-13 13:36:54 -05:00 |
|
gaba
|
0648b2b1c8
|
More tests.
|
2016-12-12 15:38:28 -08:00 |
|
Wyatt Johnson
|
5284ccc8b7
|
Added support for the suspect wordlist
|
2016-12-12 15:05:19 -07:00 |
|
gaba
|
3b131ce315
|
Removes status field for Asset. Now closedAt and closedMessage are in the settings field.
|
2016-12-12 13:02:39 -08:00 |
|
Riley Davis
|
c016e29290
|
separate route for loading comments per user
|
2016-12-12 13:00:39 -07:00 |
|
gaba
|
5e21102c2f
|
Fix routes and tests for asset status change.
|
2016-12-10 14:01:24 -10:00 |
|
David Jay
|
f5ac576187
|
Merge branch 'master' of github.com:coralproject/talk into flag-username
|
2016-12-09 16:33:06 -05:00 |
|
David Jay
|
90ef16e111
|
Merge branch 'master' of github.com:coralproject/talk into flag-username
|
2016-12-09 15:51:13 -05:00 |
|
Gabriela Rodríguez Berón
|
f29c0a3a09
|
Merge branch 'master' into ban-user
|
2016-12-09 10:43:55 -10:00 |
|
gaba
|
15557c16e2
|
Merge branch 'master' into ban-user
|
2016-12-09 08:28:46 -10:00 |
|
David Jay
|
bf01543a88
|
Merge branch 'master' of github.com:coralproject/talk into flag-username
|
2016-12-09 13:26:48 -05:00 |
|
David Jay
|
e032a5521e
|
Merge branch 'master' of github.com:coralproject/talk into wordlist
|
2016-12-09 13:05:11 -05:00 |
|
Dan Zajdband
|
09ba535d68
|
Merge with master
|
2016-12-09 10:17:55 -05:00 |
|
gaba
|
1eb204f822
|
Merge branch 'master' into ban-user
|
2016-12-08 13:28:12 -10:00 |
|
Wyatt Johnson
|
3d35183e67
|
Add payload filtering and status_history updates
|
2016-12-08 15:56:52 -05:00 |
|
David Jay
|
7f24153b4e
|
Revert "Removing extra commas and collapsing actions into an object in the backend."
This reverts commit 9d28577e9b.
|
2016-12-08 15:47:47 -05:00 |
|
David Jay
|
9d28577e9b
|
Removing extra commas and collapsing actions into an object in the backend.
|
2016-12-08 15:27:49 -05:00 |
|
David Jay
|
6d701ef49e
|
Updating to detect new status format.
|
2016-12-08 13:25:18 -05:00 |
|
gaba
|
23c67b4a49
|
It fix the status change after merging master in.
|
2016-12-07 16:37:11 -10:00 |
|
David Jay
|
713cc0cda1
|
Posting actions to comment and user endpoints.
|
2016-12-07 19:01:02 -05:00 |
|
David Jay
|
507e89a301
|
Merge branch 'master' of github.com:coralproject/talk into flag-username
|
2016-12-06 18:19:45 -05:00 |
|
David Jay
|
13d0dec84a
|
Updating postAction to send reasons to backend.
|
2016-12-06 18:11:44 -05:00 |
|
Wyatt Johnson
|
b82f130454
|
Adds a new closedAt time for assets to prevent new comments from being
created
|
2016-12-06 14:44:15 -05:00 |
|
Wyatt Johnson
|
5298efa89f
|
Adjusting based on PR feedback, added public filter to settings object
|
2016-12-06 11:55:15 -05:00 |
|
Wyatt Johnson
|
d1cdc48e85
|
Merge branch 'master' into status-history
|
2016-12-05 14:20:31 -05:00 |
|
Wyatt Johnson
|
40fd5984a9
|
Added "assigned_by" to status changes
|
2016-12-05 13:49:12 -05:00 |
|
Wyatt Johnson
|
2f7f0249b2
|
Added status changing + history
- Status's for comments is now an array of objects
|
2016-12-05 11:28:27 -05:00 |
|
gaba
|
2dd3359cb6
|
Merge branch 'master' into ban-user
|
2016-11-30 13:31:59 -08:00 |
|
David Jay
|
17b79e1869
|
Adding user and action data to rejected and flagged comments.
|
2016-11-30 13:51:43 -05:00 |
|
gaba
|
67d54be0d9
|
Remove space.
|
2016-11-28 12:11:05 -08:00 |
|