 Wyatt Johnson
|
6e89734e12
|
Moved errors to errors.js, std error msgs/types
|
2017-01-12 14:08:52 -07:00 |
|
|
Riley Davis
|
3285a5ec29
|
add status to Comment. /comments/pending and /comments/rejected ONLY return the respective comments
|
2017-01-12 12:16:13 -07:00 |
|
|
gaba
|
873ec09f62
|
Merge branch 'master' into unique-username
|
2017-01-12 08:46:51 -08:00 |
|
|
David Jay
|
09e3889793
|
Updating action type from to for consistency.
|
2017-01-11 15:42:56 -05:00 |
|
|
David Jay
|
e8dc319a9a
|
Merge branch 'master' of github.com:coralproject/talk into moderate-bio
|
2017-01-11 13:12:07 -05:00 |
|
|
Riley Davis
|
b6eaf210fe
|
don't use regex on existing lists
|
2017-01-09 15:41:47 -07:00 |
|
|
David Jay
|
0f24ab6b28
|
Merge branch 'master' of github.com:coralproject/talk into moderate-bio
|
2017-01-06 15:56:03 -05:00 |
|
|
David Jay
|
d5a82f04c2
|
Fixing issues with e-mail and status update.
|
2017-01-06 15:35:32 -05:00 |
|
|
Riley Davis
|
01db900c40
|
move defined errors into top-level errors.js file
|
2017-01-06 13:00:22 -07:00 |
|
|
Riley Davis
|
6a61f47ddf
|
Merged branch master into bad-words
|
2017-01-06 12:45:41 -07:00 |
|
|
gaba
|
712e436f58
|
Cleans error on email address or name. We need to go through all the errors and manage them better with translations.
|
2017-01-06 16:38:44 -03:00 |
|
|
Riley Davis
|
72cd78da8c
|
use wordlist service
|
2017-01-06 12:35:08 -07:00 |
|
|
gaba
|
8a1eedb0b2
|
Merge branch 'master' into unique-username
|
2017-01-06 14:12:46 -03:00 |
|
|
Wyatt Johnson
|
be72ebf2a1
|
Added tests + model implementation.
|
2017-01-05 17:01:41 -07:00 |
|
|
gaba
|
d9ea5977cd
|
Unique displayName for the User.
|
2017-01-05 18:24:05 -03:00 |
|
|
David Jay
|
890ab810f3
|
Activating SuspendUserModal and updating language for clarity.
|
2017-01-05 14:50:21 -05:00 |
|
|
Riley Davis
|
7e7e8891b4
|
display errors when trying to sign up with a bad username
|
2017-01-05 12:47:39 -07:00 |
|
|
David Jay
|
9ba0176b3c
|
Seperating username and bio flags
|
2017-01-04 16:11:31 -05:00 |
|
|
Wyatt Johnson
|
a7680ae5d9
|
Initial pass at email confirmation
|
2017-01-03 17:35:58 -07:00 |
|
|
David Jay
|
b517adab56
|
Moving commentList to ModerationList
|
2017-01-03 16:57:53 -05:00 |
|
|
David Jay
|
800382132d
|
Merge branch 'master' of github.com:coralproject/talk into moderate-bio
|
2017-01-03 14:29:05 -05:00 |
|
|
Riley Davis
|
9d1d109ec0
|
Merge branch 'master'
Conflicts:
client/coral-admin/src/reducers/index.js
|
2016-12-22 12:28:55 -07:00 |
|
|
David Jay
|
a3eb4f5c76
|
Merge branch 'add-flag-option' of github.com:coralproject/talk into add-flag-option
|
2016-12-20 11:31:57 -08:00 |
|
|
David Jay
|
20505acfbe
|
Updating tests for pending users endpoint.
|
2016-12-19 20:27:58 -05:00 |
|
|
David Jay
|
be3d506459
|
Moving action metadata to nested object.
|
2016-12-19 20:10:42 -05:00 |
|
|
David Jay
|
845d274b9b
|
Creatind endpoint to return pending users and action summaries.
|
2016-12-19 19:54:20 -05:00 |
|
|
Riley Davis
|
d65f786dcd
|
Merge branch 'master'
Conflicts:
routes/api/comments/index.js
|
2016-12-19 10:28:54 -07:00 |
|
|
Gabriela Rodríguez Berón
|
0e0aafeb1c
|
Merge branch 'master' into add-flag-option
|
2016-12-16 17:44:03 -08:00 |
|
|
Wyatt Johnson
|
7f12741c13
|
added comments to linter
|
2016-12-16 16:46:15 -07:00 |
|
|
David Jay
|
871836f636
|
Adding description field to flags.
|
2016-12-16 18:19:05 -05:00 |
|
|
riley
|
27116b84ce
|
Merged master into suspect-wordlist
|
2016-12-15 16:12:19 -07:00 |
|
|
Wyatt Johnson
|
9cf2d88ce2
|
Merge branch 'master' into suspect-wordlist
|
2016-12-15 13:51:16 -07:00 |
|
|
Wyatt Johnson
|
556f58e4eb
|
Merge branch 'master' into login-fix
|
2016-12-15 13:32:18 -07:00 |
|
|
Wyatt Johnson
|
1713b52cb0
|
The current user can see their own roles.
|
2016-12-15 12:14:58 -07:00 |
|
|
Riley Davis
|
755d090289
|
Merged branch master into my-comments
|
2016-12-14 12:01:39 -07:00 |
|
|
Wyatt Johnson
|
3710d23991
|
Fixed the settings cache
|
2016-12-13 16:16:39 -07:00 |
|
|
Wyatt Johnson
|
55bd600d96
|
Removed public function in favor of filterForUser transformer
|
2016-12-13 16:14:49 -07:00 |
|
|
riley
|
2be60b3208
|
Merged master into my-comments
|
2016-12-13 14:33:17 -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 |
|
|
David Jay
|
cb1d12f757
|
Preventing backend from sending banned words to frontend.
|
2016-12-13 14:09:50 -05:00 |
|
|
Wyatt Johnson
|
61128e9c06
|
Updated docs, services, tests.
|
2016-12-13 11:29:48 -07:00 |
|
|
Belén Curcio
|
62d8023a0a
|
Merge branch 'master' into asset-status
|
2016-12-13 14:10:02 -03:00 |
|
|
gaba
|
475c84dfbc
|
Fix date comparision and change article for asset.
|
2016-12-12 22:18:11 -08:00 |
|
|
David Jay
|
bd240923cc
|
Updating default charcount setting.
|
2016-12-12 19:10:54 -05:00 |
|
|
David Jay
|
cd63f49a5e
|
Disabling save button on error and updating translations.
|
2016-12-12 19:08:35 -05:00 |
|
|
gaba
|
0648b2b1c8
|
More tests.
|
2016-12-12 15:38:28 -08:00 |
|
|
Wyatt Johnson
|
5284ccc8b7
|
Added support for the suspect wordlist
|
2016-12-12 15:05:19 -07: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
|
a5b2a4ebc0
|
merge master
|
2016-12-12 11:35:25 -07:00 |
|