 Riley Davis
|
0892996be0
|
remove this route until someone is actually using it
|
2016-12-15 10:41:34 -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
|
755d090289
|
Merged branch master into my-comments
|
2016-12-14 12:01:39 -07:00 |
|
|
Wyatt Johnson
|
55bd600d96
|
Removed public function in favor of filterForUser transformer
|
2016-12-13 16:14:49 -07:00 |
|
|
Riley Davis
|
5962037c21
|
display list of comments with asset url
|
2016-12-13 16:03:50 -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 |
|
|
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
|
52771fc82c
|
pluralize asset endpoints
|
2016-12-13 12:45:58 -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
|
37d8c3ad38
|
try to request a list of assets and fail
|
2016-12-13 12:40:06 -07: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 |
|
|
gaba
|
387e20309a
|
We already have the default for closedMessage to be null in the model. Removing the passing of a blank closedMEssage.
|
2016-12-13 10:42:30 -08: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
|
475c84dfbc
|
Fix date comparision and change article for asset.
|
2016-12-12 22:18:11 -08: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 |
|
|
Riley Davis
|
c016e29290
|
separate route for loading comments per user
|
2016-12-12 13:00:39 -07: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 |
|
|
Gabriela Rodríguez Berón
|
ba169147e7
|
Merge branch 'master' into ban-user
|
2016-12-09 10:28:32 -10:00 |
|
|
David Jay
|
922fc630a4
|
Addressing null item_id in user flagging.
|
2016-12-09 15:27:11 -05:00 |
|
|
Gabriela Rodríguez Berón
|
1fefd3c8b4
|
Merge branch 'master' into wordlist
|
2016-12-09 10:26:39 -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
|
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 |
|
|
Belen Curcio
|
b33713e723
|
Changes to master
|
2016-12-09 12:32:59 -03:00 |
|
|
Belen Curcio
|
e4df3bcafc
|
Merge branch 'master' of github.com:coralproject/talk into asset-comment-settings
|
2016-12-09 12:28:40 -03:00 |
|
|
Dan Zajdband
|
09ba535d68
|
Merge with master
|
2016-12-09 10:17:55 -05:00 |
|
|
gaba
|
71d6b90993
|
SMall changes for PR.
|
2016-12-08 18:29:15 -10: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 |
|
|
Belen Curcio
|
be721b85c6
|
204 response
|
2016-12-08 14:39:05 -03:00 |
|
|
Belen Curcio
|
c1ba2d432e
|
Replacing res.send by res.json
|
2016-12-08 13:43:21 -03: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 |
|
|
Belen Curcio
|
ebf9754287
|
merge
|
2016-12-07 10:58:30 -03:00 |
|
|
David Jay
|
507e89a301
|
Merge branch 'master' of github.com:coralproject/talk into flag-username
|
2016-12-06 18:19:45 -05:00 |
|