 Riley Davis
|
a6fdd2e46b
|
remove redundant endpoint
|
2016-12-14 13:53:07 -07:00 |
|
|
Riley Davis
|
a072601c3e
|
ignore html files
|
2016-12-14 13:35:28 -07:00 |
|
|
Riley Davis
|
eac53a58b4
|
add jsdom. tests pass
|
2016-12-14 13:22:01 -07:00 |
|
|
Riley Davis
|
755d090289
|
Merged branch master into my-comments
|
2016-12-14 12:01:39 -07:00 |
|
|
Riley Davis
|
624eaeee11
|
move tests to tests directory
|
2016-12-14 12:01:32 -07:00 |
|
|
Wyatt Johnson
|
55bd600d96
|
Removed public function in favor of filterForUser transformer
|
2016-12-13 16:14:49 -07:00 |
|
|
Wyatt Johnson
|
9bc81f97e5
|
Merge branch 'master' into build-fix
|
2016-12-13 15:16:57 -07:00 |
|
|
Wyatt Johnson
|
ce17fa8773
|
Updated tests, fixes #166
|
2016-12-13 15:15:08 -07:00 |
|
|
David Jay
|
f17564ec36
|
Merge branch 'master' into view-char-count
|
2016-12-13 15:34:58 -05:00 |
|
|
Gabriela Rodríguez Berón
|
497fbaef25
|
Merge branch 'master' into pluralize-asset
|
2016-12-13 12:00:33 -08:00 |
|
|
Riley Davis
|
61795fa110
|
tests pass
|
2016-12-13 12:49:45 -07:00 |
|
|
Gabriela Rodríguez Berón
|
163fa5fbeb
|
Merge branch 'master' into hide-wordlist-from-fe
|
2016-12-13 11:40:18 -08:00 |
|
|
Riley Davis
|
454357fa55
|
Merge branch 'master' into view-char-count
|
2016-12-13 12:09:52 -07:00 |
|
|
David Jay
|
cb1d12f757
|
Preventing backend from sending banned words to frontend.
|
2016-12-13 14:09:50 -05: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 |
|
|
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ón
|
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
|
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 |
|
|
David Jay
|
922fc630a4
|
Addressing null item_id in user flagging.
|
2016-12-09 15:27:11 -05: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
|
b1018823d3
|
Updating tests and removing unecessary log statement.
|
2016-12-09 13:24:36 -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 |
|
|
Riley Davis
|
500dafbafa
|
riley being anal
|
2016-12-08 12:51:45 -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
|
fc96c1ee91
|
Compressing variables from postAction into single object.
|
2016-12-08 14:27:31 -05:00 |
|
|
David Jay
|
f8923aa283
|
Updating tests.
|
2016-12-07 22:22:23 -05:00 |
|
|
gaba
|
23c67b4a49
|
It fix the status change after merging master in.
|
2016-12-07 16:37:11 -10: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 |
|
|
David Jay
|
bfcb2cdb21
|
Merge branch 'master' into wordlist
|
2016-12-06 12:44:23 -05:00 |
|
|
Wyatt Johnson
|
d2d4640eee
|
Merge branch 'master' into status-history
|
2016-12-06 11:08:00 -05:00 |
|
|
David Jay
|
3562d9f235
|
Merge branch 'master' into wordlist
|
2016-12-05 17:44:23 -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 |
|
|
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 |
|
|
Kim Gardner
|
e528e0678f
|
Merge branch 'master' into stream-e2e
|
2016-12-04 00:49:27 -05:00 |
|
|
gaba
|
eb916099bd
|
Merge
|
2016-12-02 16:52:16 -08:00 |
|