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 and GitHub
f29c0a3a09
Merge branch 'master' into ban-user
2016-12-09 10:43:55 -10:00
Gabriela Rodríguez Berón and GitHub
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 and GitHub
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
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
Belen Curcio
8036b4790d
Notifications
2016-12-06 14:09:36 -03: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 and GitHub
d2d4640eee
Merge branch 'master' into status-history
2016-12-06 11:08:00 -05:00
Belen Curcio
03b6ec4fe4
Lint
2016-12-05 19:18:29 -03:00
Dan Zajdband
62cc489c21
Merge with master
2016-12-05 16:39:00 -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
Dan Zajdband
4be258c63d
Added simple open/close flow
2016-12-05 11:02:39 -05:00
gaba
eb916099bd
Merge
2016-12-02 16:52:16 -08:00
David Jay
8dad90104d
Returning infobox data in stream.
2016-12-02 12:26:31 -05:00
gaba
da7f39c9e9
Merge branch 'master' into ban-user
2016-12-02 07:58:46 -08:00
gaba
443cd031d5
Ban button.
2016-11-30 19:20:07 -08:00
Belen Curcio
c38c556002
merge
2016-11-30 20:11:22 -03:00
gaba
2dd3359cb6
Merge branch 'master' into ban-user
2016-11-30 13:31:59 -08:00
gaba
a30388682e
Merge branch 'master' into ban-user
2016-11-30 11:26:44 -08:00
gaba
ba47250933
Understanding reducers
2016-11-30 11:12:09 -08:00
David Jay
17b79e1869
Adding user and action data to rejected and flagged comments.
2016-11-30 13:51:43 -05:00
David Jay
94d9f42aa5
Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix
2016-11-30 12:50:44 -05:00
Belen Curcio
6e7926ab30
Working bios
2016-11-30 12:41:50 -03:00
Belen Curcio
2607c608f5
D
...
ividing userData from userAuth
2016-11-30 10:20:03 -03:00
Riley Davis and Dan Zajdband
ef172cabfc
Scroll to comment ( #92 )
...
* host pym locally
* host pym. fix some permalink styles
* get url from parent document
* reset copy dialog timeout
* use pym.parentUrl instead of depending on the parent document
* use a simpler method to find the url
* add some horrible setInterval code
* add some awesome polling
* merge master
* bail out of comment look up after 10 seconds
* re-update permalink attrs
* re-add my listeners to article.ejs
* allow for overriding the talk db name in an environment var
2016-11-29 17:19:56 -05:00
David Jay