 Belen Curcio
|
927a3fcd83
|
Updating package.json and nightwatch package
|
2016-12-17 10:50:47 -03:00 |
|
|
Belen Curcio
|
72d36713e9
|
Merge branch 'master' of github.com:coralproject/talk into e2e-tests
|
2016-12-17 10:48:37 -03:00 |
|
|
Belen Curcio
|
0548b5faf1
|
Adding Actions
|
2016-12-17 10:48:26 -03:00 |
|
|
Belen Curcio
|
d36a471780
|
Updating package.json and nightwatch package
|
2016-12-17 10:45:53 -03:00 |
|
|
Belen Curcio
|
8eea656b96
|
Updated Nightwatch conf with Integration Enviroment
|
2016-12-17 10:45:24 -03:00 |
|
|
Belen Curcio
|
e5620fb718
|
eslint update
|
2016-12-17 10:44:59 -03:00 |
|
|
Kim Gardner
|
2324ae2d20
|
Merge pull request #187 from coralproject/issue-186
It needed to have the Moderation Modal inside a tab container too.
|
2016-12-16 21:27:55 -05:00 |
|
|
gaba
|
ee6c4bb831
|
Merge branch 'master' into issue-186
|
2016-12-16 17:55:21 -08:00 |
|
|
Gabriela Rodríguez Berón
|
d707110e17
|
Merge pull request #183 from coralproject/fix-config-warnings
fix some config warnings
|
2016-12-16 17:48:23 -08:00 |
|
|
Gabriela Rodríguez Berón
|
4f0c0d2e42
|
Merge branch 'master' into fix-config-warnings
|
2016-12-16 17:44:21 -08:00 |
|
|
Gabriela Rodríguez Berón
|
c824591c3b
|
Merge pull request #185 from coralproject/linting
Added comments to linter
|
2016-12-16 17:43:51 -08:00 |
|
|
gaba
|
3266934fc8
|
It needed to have the Moderation Modal inside a tab container too.
|
2016-12-16 17:39:22 -08:00 |
|
|
Wyatt Johnson
|
7f12741c13
|
added comments to linter
|
2016-12-16 16:46:15 -07:00 |
|
|
Riley Davis
|
13994686e4
|
fix some config warnings
|
2016-12-16 15:20:02 -07:00 |
|
|
Kim Gardner
|
f6a794f886
|
Merge pull request #181 from coralproject/fix-closed-at
Fixed closing at
|
2016-12-16 16:42:25 -05:00 |
|
|
Dan Zajdband
|
ad084847e5
|
Lint
|
2016-12-16 16:35:39 -05:00 |
|
|
Dan Zajdband
|
6ddece4717
|
Fixed closing at
|
2016-12-16 16:16:48 -05:00 |
|
|
Kim Gardner
|
0f36f1a5c4
|
Merge pull request #179 from coralproject/my-comments-designs
my comments design tweaks
|
2016-12-16 15:13:11 -05:00 |
|
|
Riley Davis
|
5d96ff9d63
|
Merge branch 'master' into my-comments-designs
|
2016-12-16 12:29:38 -07:00 |
|
|
Riley Davis
|
0aa7a216be
|
update tests
|
2016-12-16 12:29:27 -07:00 |
|
|
Riley Davis
|
647d62969d
|
design tweaks per kim
|
2016-12-16 12:24:32 -07:00 |
|
|
Dan Zajdband
|
decdfad39b
|
Adding show shortcuts button and minor fixes (#177)
* Adding show shortcuts button and minor fixes
* Lint
* Unwrapping the showComments method
|
2016-12-16 12:32:09 -05:00 |
|
|
Dan Zajdband
|
9e9291ba64
|
Lint
|
2016-12-16 12:07:54 -05:00 |
|
|
Dan Zajdband
|
8631c3bd9b
|
Adding show shortcuts button and minor fixes
|
2016-12-16 12:03:37 -05:00 |
|
|
Gabriela Rodríguez Berón
|
d6936cdf25
|
Merge pull request #172 from coralproject/login-fix
The current user can see their own roles.
|
2016-12-15 15:10:55 -08:00 |
|
|
Gabriela Rodríguez Berón
|
1d652442d0
|
Merge branch 'master' into login-fix
|
2016-12-15 15:07:37 -08:00 |
|
|
Riley Davis
|
4b746c1c32
|
Merge pull request #176 from coralproject/add-tests-for-comment-endpoint
add tests for comment stream for non-admins
|
2016-12-15 16:02:42 -07:00 |
|
|
Riley Davis
|
64ac1610eb
|
address different comment in result
|
2016-12-15 15:58:56 -07:00 |
|
|
riley
|
833094b6dd
|
check the author_id instead of comment.id
|
2016-12-15 15:53:47 -07:00 |
|
|
riley
|
115d19945b
|
add tests for comment stream for non-admins
|
2016-12-15 15:43:22 -07:00 |
|
|
Gabriela Rodríguez Berón
|
e157de8697
|
Merge pull request #175 from coralproject/fixing-my-fixing-fix
Fixing my fixing fix
|
2016-12-15 14:24:41 -08:00 |
|
|
riley
|
c7d4bb6961
|
add a newline so lint doesn't complain
|
2016-12-15 15:20:50 -07:00 |
|
|
riley
|
632956e084
|
failed to update tests. working now
|
2016-12-15 15:20:02 -07:00 |
|
|
Gabriela Rodríguez Berón
|
459dda5b26
|
Merge pull request #174 from coralproject/fix-embed-pathing
comments not showing on embed page
|
2016-12-15 13:53:42 -08:00 |
|
|
Gabriela Rodríguez Berón
|
70ef071464
|
Merge branch 'master' into fix-embed-pathing
|
2016-12-15 13:50:41 -08:00 |
|
|
Gabriela Rodríguez Berón
|
a309c8939d
|
Merge pull request #173 from coralproject/my-comments-fix
allow non-admin folks to list their comments
|
2016-12-15 13:44:26 -08:00 |
|
|
Riley Davis
|
181e558b28
|
comments not showing on embed page
|
2016-12-15 14:36:14 -07:00 |
|
|
Riley Davis
|
203d35e6d1
|
link to comment instead of article
|
2016-12-15 14:33:33 -07:00 |
|
|
Riley Davis
|
6f0de84144
|
fix lint
|
2016-12-15 14:03:54 -07:00 |
|
|
Gabriela Rodríguez Berón
|
5ffc575fae
|
Merge branch 'master' into my-comments-fix
|
2016-12-15 12:52:26 -08:00 |
|
|
Gabriela Rodríguez Berón
|
ecfedabc28
|
Merge branch 'master' into login-fix
|
2016-12-15 12:51:31 -08:00 |
|
|
Dan Zajdband
|
fcb107aefe
|
Global comment stream close setting (#171)
* Added basic ui
* Added functionality
* Linted code
* using named params instead of props
* lint
* fixed missing merge
|
2016-12-15 15:50:19 -05:00 |
|
|
Riley Davis
|
1ea284d428
|
remove fromJS call
|
2016-12-15 13:43:06 -07:00 |
|
|
Wyatt Johnson
|
556f58e4eb
|
Merge branch 'master' into login-fix
|
2016-12-15 13:32:18 -07:00 |
|
|
Riley Davis
|
39fdd168fa
|
admins can still view all comment streams
|
2016-12-15 13:18:28 -07:00 |
|
|
Riley Davis
|
f4ee28c618
|
allow non-admin folks to list their comments
|
2016-12-15 13:05:59 -07:00 |
|
|
Kim Gardner
|
d64c848baa
|
Merge pull request #163 from coralproject/my-comments
My comments
|
2016-12-15 14:24:21 -05:00 |
|
|
Wyatt Johnson
|
1713b52cb0
|
The current user can see their own roles.
|
2016-12-15 12:14:58 -07:00 |
|
|
Riley Davis
|
d599a65c05
|
file not being used anywhere
|
2016-12-15 10:44:20 -07:00 |
|
|
Riley Davis
|
0892996be0
|
remove this route until someone is actually using it
|
2016-12-15 10:41:34 -07:00 |
|