 Riley Davis
|
9e353eaae8
|
Merge branch 'master' into simplify-community-page
|
2016-12-09 15:06:43 -10:00 |
|
|
Riley Davis
|
116368dcd3
|
Merge pull request #156 from coralproject/update-users-api
Updating user route to users.
|
2016-12-09 15:06:09 -10:00 |
|
|
Riley Davis
|
0f7e4bd239
|
simplify Community page
|
2016-12-09 14:52:17 -10:00 |
|
|
David Jay
|
faca09dbd2
|
Merge branch 'master' of github.com:coralproject/talk into update-users-api
|
2016-12-09 19:35:09 -05:00 |
|
|
Kim Gardner
|
1c670835d1
|
Merge pull request #151 from coralproject/flag-bio
Flag bio
|
2016-12-09 14:30:19 -10:00 |
|
|
David Jay
|
d229d5a96f
|
Updating route to davidjay.
|
2016-12-09 19:28:19 -05:00 |
|
|
Gabriela Rodríguez Berón
|
02015bc5c3
|
Merge branch 'master' into flag-bio
|
2016-12-09 14:26:28 -10:00 |
|
|
Riley Davis
|
2f5505c5f3
|
Merge pull request #152 from coralproject/fix-spelling
Typo
|
2016-12-09 14:24:48 -10:00 |
|
|
gaba
|
ffc2d0c86a
|
Spanish translations.
|
2016-12-09 14:16:27 -10:00 |
|
|
Kim Gardner
|
5279ad3305
|
Typo
|
2016-12-09 13:01:54 -10:00 |
|
|
David Jay
|
c27c379b36
|
Merge branch 'master' into flag-bio
|
2016-12-09 17:50:28 -05:00 |
|
|
David Jay
|
787486bccf
|
Posting bio flags to backend.
|
2016-12-09 17:46:45 -05:00 |
|
|
David Jay
|
be760bd9d7
|
Merge pull request #133 from coralproject/flag-username
Flag username
|
2016-12-09 16:58:50 -05:00 |
|
|
David Jay
|
9375d8b47d
|
Merge branch 'flag-username' into flag-bio
|
2016-12-09 16:46:56 -05:00 |
|
|
David Jay
|
ecbdc5d0b4
|
Making itemType consistent on backend.
|
2016-12-09 16:43:04 -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
|
acd57e4f68
|
Avoiding double-posting.
|
2016-12-09 16:15:33 -05:00 |
|
|
Gabriela Rodríguez Berón
|
403838b983
|
Merge pull request #121 from coralproject/ban-user
Ban user
|
2016-12-09 10:55:45 -10:00 |
|
|
David Jay
|
90ef16e111
|
Merge branch 'master' of github.com:coralproject/talk into flag-username
|
2016-12-09 15:51:13 -05:00 |
|
|
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 |
|
|
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 |
|