 David Jay
|
8e432aad46
|
Adding Done button to last step of flagging menu.
|
2016-12-09 15:47:38 -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
|
8ea61c3a05
|
Merge pull request #122 from coralproject/wordlist
Banned word list
|
2016-12-09 10:29:23 -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 |
|
|
David Jay
|
78448b85c1
|
Updating to reflect new comment api.
|
2016-12-09 15:11:13 -05:00 |
|
|
Gabriela Rodríguez Berón
|
14cd482608
|
Merge pull request #129 from coralproject/asset-comment-settings
Asset comment settings
|
2016-12-09 10:09:51 -10:00 |
|
|
Riley Davis
|
44ae886af7
|
put some space between buttons on the banuserdialog
|
2016-12-09 10:08:55 -10:00 |
|
|
gaba
|
8b850a8d33
|
Fix the message.
|
2016-12-09 09:29:27 -10:00 |
|
|
gaba
|
d9b778fa74
|
A few translations for the spanish for this feature.
|
2016-12-09 09:19:08 -10:00 |
|
|
gaba
|
01dc4e4144
|
fix merge.
|
2016-12-09 08:30:30 -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
|
bfe188eb5c
|
Cleaning up from merge.
|
2016-12-09 13:17:50 -05:00 |
|
|
David Jay
|
e032a5521e
|
Merge branch 'master' of github.com:coralproject/talk into wordlist
|
2016-12-09 13:05:11 -05:00 |
|
|
David Jay
|
ee187469e0
|
Moving FlagComment to seperate file.
|
2016-12-09 12:54:15 -05:00 |
|
|
Belen Curcio
|
3ef8f295c3
|
newConfig update
|
2016-12-09 12:59:17 -03:00 |
|
|
Belen Curcio
|
a3cae4a608
|
Merge branch 'master' of github.com:coralproject/talk into asset-comment-settings
|
2016-12-09 12:55:32 -03:00 |
|
|
Belén Curcio
|
47da346e13
|
Merge pull request #134 from coralproject/close-comments
Close comments
|
2016-12-09 12:55:08 -03: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
|
72ab489e61
|
Merge branch 'close-comments' of github.com:coralproject/talk into close-comments
|
2016-12-09 10:20:06 -05:00 |
|
|
Dan Zajdband
|
09ba535d68
|
Merge with master
|
2016-12-09 10:17:55 -05:00 |
|
|
Kim Gardner
|
c096c61302
|
Merge pull request #146 from coralproject/smtp-madness
don't use well-known email settings
|
2016-12-08 18:39:32 -10:00 |
|
|
Riley Davis
|
dd5c114dc2
|
don't use well-known email settings
|
2016-12-08 18:36:20 -10:00 |
|
|
gaba
|
71d6b90993
|
SMall changes for PR.
|
2016-12-08 18:29:15 -10:00 |
|
|
gaba
|
ecd3f5c347
|
IT removes duplicated code.
|
2016-12-08 18:19:00 -10:00 |
|
|
gaba
|
a46ffe8ea6
|
It removes duplicated code.
|
2016-12-08 18:16:37 -10:00 |
|
|
gaba
|
9bfac3872e
|
Moves banUser to users actions instead of comments actions.
|
2016-12-08 18:16:17 -10:00 |
|
|
gaba
|
0df1b9a498
|
Remove file that is not being used anymore.
|
2016-12-08 16:37:05 -10:00 |
|
|
Kim Gardner
|
82e3d73d2d
|
Merge pull request #143 from coralproject/format-readme
Fix formatting
|
2016-12-08 13:38:03 -10:00 |
|
|
gaba
|
1eb204f822
|
Merge branch 'master' into ban-user
|
2016-12-08 13:28:12 -10:00 |
|
|
Riley Davis
|
0bbefa071e
|
Merge branch 'master' into format-readme
|
2016-12-08 13:17:23 -10:00 |
|
|
Gabriela Rodríguez Berón
|
cfb1b75b39
|
Merge pull request #137 from coralproject/payload-filtering
Add payload filtering and status_history updates
|
2016-12-08 13:08:12 -10:00 |
|
|
Gabriela Rodríguez Berón
|
be632ada47
|
Merge branch 'master' into payload-filtering
|
2016-12-08 13:05:14 -10:00 |
|
|
Kim Gardner
|
7ce44ccd8c
|
More formatting
|
2016-12-08 12:53:39 -10:00 |
|
|
Riley Davis
|
b129d91e9f
|
Merged branch payload-filtering into payload-filtering
|
2016-12-08 12:51:58 -10:00 |
|
|
Riley Davis
|
500dafbafa
|
riley being anal
|
2016-12-08 12:51:45 -10:00 |
|
|
Kim Gardner
|
c8d0fae097
|
Fix formatting
|
2016-12-08 12:50:12 -10:00 |
|
|
Kim Gardner
|
26e3f1d851
|
Merge pull request #136 from coralproject/update-talk-docs
Update config notes
|
2016-12-08 12:41:50 -10:00 |
|
|
Kim Gardner
|
501df52cf8
|
Merge branch 'master' into update-talk-docs
|
2016-12-08 12:37:05 -10:00 |
|
|
Belen Curcio
|
fa4ef2cab0
|
Merge branch 'master' of github.com:coralproject/talk into asset-comment-settings
|
2016-12-08 19:34:10 -03:00 |
|
|
Belen Curcio
|
77ae7f1329
|
Merge branch 'asset-comment-settings' of github.com:coralproject/talk into asset-comment-settings
|
2016-12-08 19:33:39 -03:00 |
|
|
Wyatt Johnson
|
d95d9aa8e3
|
Merge branch 'master' into payload-filtering
|
2016-12-08 17:28:50 -05:00 |
|
|
Jeff Nelson
|
7ee4f3c7cb
|
Merge pull request #142 from coralproject/create-user-w-role
Create user with a role
|
2016-12-08 12:27:45 -10:00 |
|
|
Wyatt Johnson
|
c90c125dbd
|
Merge branch 'master' into create-user-w-role
|
2016-12-08 17:24:47 -05:00 |
|
|
Wyatt Johnson
|
bc88cd1e9d
|
Adjusted promise
|
2016-12-08 17:23:31 -05:00 |
|
|
Riley Davis
|
4572d8e68e
|
filter by premod status
|
2016-12-08 12:20:54 -10:00 |
|