 David Erwin
|
f56e30c1a1
|
Updating docs for .env functionality
|
2017-01-13 10:08:35 -05:00 |
|
|
Wyatt Johnson
|
c90230c115
|
Adjusted stream to preserve comment view state
|
2017-01-12 17:55:08 -07:00 |
|
|
Riley Davis
|
ad0f530fd3
|
don't return unpublished comments in My Comments section. add tests
|
2017-01-12 17:07:35 -07:00 |
|
|
Wyatt Johnson
|
281a49dc74
|
Merge branch 'master' into bugfix-flagged-actions
|
2017-01-12 16:29:32 -07:00 |
|
|
Gabriela Rodríguez Berón
|
1cc048d46e
|
Merge branch 'master' into unique-username
|
2017-01-12 14:53:13 -08:00 |
|
|
Riley Davis
|
20f90572f5
|
Merge pull request #228 from coralproject/pending-queue-routes
moderation queue routes
|
2017-01-12 15:49:44 -07:00 |
|
|
gaba
|
536a2165cc
|
Merge branch 'master' into unique-username
|
2017-01-12 14:47:45 -08:00 |
|
|
gaba
|
1027b19a49
|
Added regex to look for the field that is duplicated. Not sure if there is a better way to do it.
|
2017-01-12 14:43:36 -08:00 |
|
|
Riley Davis
|
5136fce4a3
|
Merge branch 'master' into pending-queue-routes
|
2017-01-12 15:34:13 -07:00 |
|
|
David Jay
|
f3f5397459
|
Removing rejected and approved comments from flagged feed.
|
2017-01-12 17:32:48 -05:00 |
|
|
Riley Davis
|
0eefd3364b
|
update tests
|
2017-01-12 15:25:36 -07:00 |
|
|
David Jay
|
361be84562
|
Merge branch 'master' into bug-comment-number
|
2017-01-12 16:49:16 -05:00 |
|
|
David Jay
|
3e0d56b942
|
Keeping hydrated comments in assets in COMMENTS_BY_USER_REQUEST.
|
2017-01-12 16:41:50 -05:00 |
|
|
Wyatt Johnson
|
31b7dac48a
|
Merge pull request #229 from coralproject/topic-220
Standardizes errors for API error returns
|
2017-01-12 14:33:58 -07:00 |
|
|
Belen Curcio
|
ce01389809
|
Ádding Icon to Coral UI Button
|
2017-01-12 18:20:42 -03:00 |
|
|
Wyatt Johnson
|
6e89734e12
|
Moved errors to errors.js, std error msgs/types
|
2017-01-12 14:08:52 -07:00 |
|
|
Riley Davis
|
44b41b031e
|
lint
|
2017-01-12 14:03:58 -07:00 |
|
|
Belen Curcio
|
87b350e3a9
|
Missing tab wrapper
|
2017-01-12 17:56:00 -03:00 |
|
|
David Jay
|
1432cfba4a
|
Updating signing dialog style to render as intended in Firefox.
|
2017-01-12 15:49:23 -05:00 |
|
|
Belen Curcio
|
c375d11e32
|
Coral UI - List and Item
|
2017-01-12 17:47:45 -03:00 |
|
|
Riley Davis
|
b66efb7f2a
|
return flagged comments
|
2017-01-12 13:44:10 -07:00 |
|
|
Riley Davis
|
f1272338cd
|
re-use dispatch function
|
2017-01-12 13:30:53 -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
|
acf3ad5e28
|
Some conflicts were added.
|
2017-01-12 11:10:07 -08:00 |
|
|
gaba
|
15e7ef6368
|
Adds an error const.
|
2017-01-12 10:46:18 -08:00 |
|
|
gaba
|
873ec09f62
|
Merge branch 'master' into unique-username
|
2017-01-12 08:46:51 -08:00 |
|
|
Belen Curcio
|
3d65231db5
|
Progress
|
2017-01-12 13:27:37 -03:00 |
|
|
Belén Curcio
|
b957e75d68
|
Merge branch 'master' into moderate-bio
|
2017-01-12 09:21:02 -03:00 |
|
|
Belen Curcio
|
4a4affad70
|
More Design Tweaks
|
2017-01-12 09:16:23 -03:00 |
|
|
Belen Curcio
|
7101d99187
|
Merge branch 'master' of github.com:coralproject/talk into design-pass-adm
|
2017-01-12 08:09:55 -03:00 |
|
|
David Jay
|
61bc87bafc
|
Adding ALL moderation list.
|
2017-01-11 17:35:09 -05:00 |
|
|
Riley Davis
|
18b35e38a8
|
Merge pull request #227 from coralproject/flagged-queue-bugfix
Fix flagged comment queue bug
|
2017-01-11 14:20:03 -07:00 |
|
|
Wyatt Johnson
|
6ca7e92171
|
Merge branch 'master' into flagged-queue-bugfix
|
2017-01-11 13:48:09 -07:00 |
|
|
David Jay
|
09e3889793
|
Updating action type from to for consistency.
|
2017-01-11 15:42:56 -05:00 |
|
|
David Jay
|
2a1ea01827
|
Merge pull request #226 from coralproject/dev-start
Added dev-start and --config flag
|
2017-01-11 15:14:59 -05:00 |
|
|
Wyatt Johnson
|
10aaa037dc
|
Added dev-start and --config flag
|
2017-01-11 11:37:06 -07:00 |
|
|
David Jay
|
30c7539cde
|
Merge branch 'moderate-bio' of github.com:coralproject/talk into moderate-bio
|
2017-01-11 13:14:44 -05:00 |
|
|
David Jay
|
e8dc319a9a
|
Merge branch 'master' of github.com:coralproject/talk into moderate-bio
|
2017-01-11 13:12:07 -05:00 |
|
|
David Jay
|
98a6ba5f1f
|
Merge branch 'master' into moderate-bio
|
2017-01-11 12:32:25 -05:00 |
|
|
Wyatt Johnson
|
5f215a95f9
|
Merge pull request #222 from coralproject/hide-passwords
Cleaned user auth response
|
2017-01-11 10:22:28 -07:00 |
|
|
David Jay
|
9d7810f48c
|
Merge branch 'master' into moderate-bio
|
2017-01-10 19:48:09 -05:00 |
|
|
Wyatt Johnson
|
7a21879628
|
Merge branch 'master' into hide-passwords
|
2017-01-10 14:53:26 -07:00 |
|
|
Kim Gardner
|
2e4256bf4a
|
Merge pull request #223 from coralproject/users-bug-fix
Making user action item_type 'users' for consistency.
|
2017-01-10 16:11:22 -05:00 |
|
|
David Jay
|
11f18c23cb
|
Merge branch 'master' into users-bug-fix
|
2017-01-10 14:13:31 -05:00 |
|
|
Belen Curcio
|
3a510168d3
|
design progress
|
2017-01-10 16:12:15 -03:00 |
|
|
Wyatt Johnson
|
8519d07c67
|
Cleaned user auth response
|
2017-01-10 12:00:06 -07:00 |
|
|
David Jay
|
d9147da8fc
|
Making user action item_type 'users' for consistency.
|
2017-01-10 13:59:36 -05:00 |
|
|
Kim Gardner
|
e87a471eb9
|
Merge pull request #201 from coralproject/frontenddocs
Frontend Docs
|
2017-01-10 11:44:03 -05:00 |
|
|
Kim Gardner
|
6cf4011cde
|
Merge branch 'master' into frontenddocs
|
2017-01-10 11:40:03 -05:00 |
|
|
Belen Curcio
|
ca369dcb4a
|
Header version
|
2017-01-10 12:01:48 -03:00 |
|