 David Jay
|
0f24ab6b28
|
Merge branch 'master' of github.com:coralproject/talk into moderate-bio
|
2017-01-06 15:56:03 -05:00 |
|
|
Wyatt Johnson
|
4eb7c72ae2
|
Merge branch 'master' into email-confirm
|
2017-01-05 18:45:06 -07:00 |
|
|
Wyatt Johnson
|
be72ebf2a1
|
Added tests + model implementation.
|
2017-01-05 17:01:41 -07:00 |
|
|
David Jay
|
0a064c0e11
|
Merge branch 'master' of github.com:coralproject/talk into moderate-bio
|
2017-01-04 14:33:27 -05:00 |
|
|
Wyatt Johnson
|
a7680ae5d9
|
Initial pass at email confirmation
|
2017-01-03 17:35:58 -07:00 |
|
|
David Jay
|
800382132d
|
Merge branch 'master' of github.com:coralproject/talk into moderate-bio
|
2017-01-03 14:29:05 -05:00 |
|
|
gaba
|
e2a032d4a5
|
Merge branch 'master' into csrf
|
2017-01-03 16:25:05 -03:00 |
|
|
gaba
|
5c6df6d481
|
Fix tests when flagging because suspect word.
|
2017-01-03 09:37:02 -03:00 |
|
|
gaba
|
ec3e9d1cd4
|
Merge branch 'master' into csrf
|
2016-12-22 14:23:01 -08:00 |
|
|
Riley Davis
|
9d1d109ec0
|
Merge branch 'master'
Conflicts:
client/coral-admin/src/reducers/index.js
|
2016-12-22 12:28:55 -07:00 |
|
|
Riley DavisandGitHub
|
c6170f558a
|
Merge branch 'master' into add-flag-option
|
2016-12-22 10:38:34 -07:00 |
|
|
Wyatt Johnson
|
8233937f7a
|
Moved wordlist loading into the middleware
|
2016-12-21 15:55:40 -07:00 |
|
|
David Jay
|
c867ae8eeb
|
Removing Next and Prev from pager and updating tests.
|
2016-12-21 12:11:42 -08:00 |
|
|
gaba
|
29250f2bbc
|
Fixed unpromised rejection in test.
|
2016-12-20 18:01:28 -08:00 |
|
|
gaba
|
9c9597ae8c
|
Persist the session in tests through chai agent.
|
2016-12-20 17:52:55 -08:00 |
|
|
gaba
|
e16bc8f7ad
|
Adds agent to persist session in tests.
|
2016-12-20 12:18:30 -08:00 |
|
|
gaba
|
f49ca9f89a
|
PAss the token around.
|
2016-12-19 18:11:11 -08:00 |
|
|
David Jay
|
20505acfbe
|
Updating tests for pending users endpoint.
|
2016-12-19 20:27:58 -05:00 |
|
|
David Jay
|
be3d506459
|
Moving action metadata to nested object.
|
2016-12-19 20:10:42 -05:00 |
|
|
gaba
|
4172066c94
|
Silly commit.
|
2016-12-16 19:44:01 -08:00 |
|
|
gaba
|
d8d30e512b
|
Only on POST check for CSRF.
|
2016-12-16 16:02:45 -08:00 |
|
|
David Jay
|
8f1a6a777c
|
Merge branch 'master' of github.com:coralproject/talk into admin-asset-list
|
2016-12-16 17:22:32 -05:00 |
|
|
David Jay
|
d4880ff183
|
Adding asset sorting to endpoint.
|
2016-12-16 15:35:15 -05:00 |
|
|
riley
|
27116b84ce
|
Merged master into suspect-wordlist
|
2016-12-15 16:12:19 -07:00 |
|
|
gaba
|
670567b8b3
|
One more expect in the test.
|
2016-12-15 15:08:01 -08:00 |
|
|
Riley Davis
|
64ac1610eb
|
address different comment in result
|
2016-12-15 15:58:56 -07:00 |
|
|
riley
|
833094b6dd
|
check the author_id instead of comment.id
|
2016-12-15 15:53:47 -07:00 |
|
|
riley
|
115d19945b
|
add tests for comment stream for non-admins
|
2016-12-15 15:43:22 -07:00 |
|
|
Wyatt Johnson
|
9cf2d88ce2
|
Merge branch 'master' into suspect-wordlist
|
2016-12-15 13:51:16 -07:00 |
|
|
David JayandGitHub
|
f17564ec36
|
Merge branch 'master' into view-char-count
|
2016-12-13 15:34:58 -05:00 |
|
|
Riley Davis
|
61795fa110
|
tests pass
|
2016-12-13 12:49:45 -07:00 |
|
|
Riley DavisandGitHub
|
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 |
|
|
Wyatt Johnson
|
61128e9c06
|
Updated docs, services, tests.
|
2016-12-13 11:29:48 -07: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 |
|
|
Gabriela Rodríguez BerónandGitHub
|
7fba082c02
|
Merge branch 'master' into asset-status
|
2016-12-11 18:56:07 -10:00 |
|
|
gaba
|
5e21102c2f
|
Fix routes and tests for asset status change.
|
2016-12-10 14:01:24 -10:00 |
|
|
David Jay
|
d229d5a96f
|
Updating route to davidjay.
|
2016-12-09 19:28:19 -05:00 |
|
|
David Jay
|
922fc630a4
|
Addressing null item_id in user flagging.
|
2016-12-09 15:27:11 -05: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
|
b1018823d3
|
Updating tests and removing unecessary log statement.
|
2016-12-09 13:24:36 -05:00 |
|
|
Dan Zajdband
|
09ba535d68
|
Merge with master
|
2016-12-09 10:17:55 -05: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 |
|
|
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
|
91efa60b55
|
Fixed linting error
|
2016-12-05 14:20:47 -05:00 |
|
|
Wyatt Johnson
|
d1cdc48e85
|
Merge branch 'master' into status-history
|
2016-12-05 14:20:31 -05:00 |
|