 David Jay
|
761d0aaa3a
|
Merge branch 'master' into new-comments
|
2017-02-23 16:21:36 -05:00 |
|
|
Kim Gardner
|
498eb63e1a
|
Merge pull request #330 from coralproject/empty-states
Empty states for different lists
|
2017-02-23 16:18:24 -05:00 |
|
|
Kim Gardner
|
532f2d92ca
|
Merge branch 'master' into empty-states
|
2017-02-23 16:15:05 -05:00 |
|
|
Wyatt Johnson
|
58af8ed003
|
Merge pull request #335 from coralproject/suspect-word-flag-reason
Fixed issue related to action create on suspect word match
|
2017-02-23 14:14:46 -07:00 |
|
|
Wyatt Johnson
|
b50808d365
|
Merge branch 'master' into suspect-word-flag-reason
|
2017-02-23 14:11:21 -07:00 |
|
|
David Jay
|
3e2634be76
|
Merge branch 'master' into new-comments
|
2017-02-23 16:11:01 -05:00 |
|
|
David Jay
|
2dda81f257
|
Merge pull request #338 from coralproject/admin-login
show login page instead of communicorn :'(
|
2017-02-23 12:12:21 -05:00 |
|
|
Riley Davis
|
e3b9799d4a
|
nested ternaries hurt me
|
2017-02-23 09:58:31 -07:00 |
|
|
Riley Davis
|
7ae81fd172
|
fixing mixed types
|
2017-02-23 09:43:50 -07:00 |
|
|
Riley Davis
|
953c749bd2
|
show login page instead of communicorn :'(
|
2017-02-22 16:14:14 -07:00 |
|
|
David Jay
|
9d13a95a7c
|
Merge branch 'master' into new-comments
|
2017-02-22 15:20:39 -05:00 |
|
|
David Jay
|
27bd1404b3
|
Adding es translation.
|
2017-02-22 15:13:46 -05:00 |
|
|
David Jay
|
bb0b3f461a
|
Moving polling interval to constant.
|
2017-02-22 15:11:50 -05:00 |
|
|
David Jay
|
6becb88b56
|
Adding style to new comments button.
|
2017-02-22 15:07:32 -05:00 |
|
|
David Jay
|
096bd12df6
|
Loading new comments.
|
2017-02-22 13:45:02 -05:00 |
|
|
Riley Davis
|
2acd099f3f
|
add empty state for asset search
|
2017-02-22 11:15:13 -07:00 |
|
|
David Jay
|
dd09ddf968
|
Adding NewCount component.
|
2017-02-22 13:13:25 -05:00 |
|
|
Wyatt Johnson
|
80706d2fdf
|
fixed issue related to action create on suspect word match
|
2017-02-22 10:33:47 -07:00 |
|
|
Gabriela Rodríguez Berón
|
b29614256b
|
Merge branch 'master' into empty-states
|
2017-02-22 08:13:44 -08:00 |
|
|
Wyatt Johnson
|
07a956e582
|
Merge pull request #333 from coralproject/rest-depreciation
Cleaned up some routes
|
2017-02-22 08:13:02 -07:00 |
|
|
Riley Davis
|
e7c4acde4d
|
small bugfix
|
2017-02-21 16:11:56 -07:00 |
|
|
David Jay
|
ca107afb9b
|
Avoiding new comment button when a comment is posted.
|
2017-02-21 17:29:58 -05:00 |
|
|
Wyatt Johnson
|
d7a6bf9e1f
|
Cleaned up some routes
|
2017-02-21 15:24:44 -07:00 |
|
|
David Jay
|
9149b737f5
|
Retrieving counts and displaying new comments to user.
|
2017-02-21 17:23:09 -05:00 |
|
|
Riley Davis
|
f76befd6ac
|
no comments in user list
|
2017-02-21 12:48:01 -07:00 |
|
|
Riley Davis
|
9000778d8f
|
empty result for users in Community
|
2017-02-21 12:39:29 -07:00 |
|
|
Riley Davis
|
e24a0caa20
|
add EmptyCard component. fix typos. more PropTypes.
|
2017-02-21 12:08:02 -07:00 |
|
|
David Erwin
|
17813e23a9
|
Merge pull request #327 from coralproject/error_translation_key
Error translation key
|
2017-02-17 20:13:11 -05:00 |
|
|
David Erwin
|
0563b93d39
|
Merge branch 'master' into error_translation_key
|
2017-02-17 20:07:49 -05:00 |
|
|
David Erwin
|
df53b101ab
|
Merge pull request #316 from coralproject/update-on-post-comment
Apollo update on post comment
|
2017-02-17 20:07:40 -05:00 |
|
|
David Erwin
|
6f17a84097
|
Merge branch 'master' into update-on-post-comment
|
2017-02-17 20:02:41 -05:00 |
|
|
Wyatt Johnson
|
09513c0e83
|
Merge pull request #329 from coralproject/docker-fixx
Added yarn.lock to Dockerfile
|
2017-02-17 18:02:26 -07:00 |
|
|
Wyatt Johnson
|
301c8e829f
|
Added production flag back
|
2017-02-17 17:56:44 -07:00 |
|
|
Wyatt Johnson
|
afcdacff0d
|
Added yarn.lock to Dockerfile
|
2017-02-17 17:49:59 -07:00 |
|
|
David Erwin
|
a8396481f9
|
Merge pull request #328 from coralproject/graph-tests
Initial graph tests
|
2017-02-17 18:01:17 -05:00 |
|
|
Wyatt Johnson
|
4cccf09a87
|
spelling...
|
2017-02-17 15:53:23 -07:00 |
|
|
Wyatt Johnson
|
3e4dc9c8b2
|
Merge branch 'master' into graph-tests
|
2017-02-17 15:50:21 -07:00 |
|
|
Wyatt Johnson
|
a00befafcb
|
Initial graph tests
|
2017-02-17 15:48:46 -07:00 |
|
|
Gabriela Rodríguez Berón
|
31dda920c6
|
Merge branch 'master' into error_translation_key
|
2017-02-17 14:30:00 -08:00 |
|
|
gaba
|
9f168e627a
|
It uses message and not translation key.
|
2017-02-17 14:19:30 -08:00 |
|
|
Riley Davis
|
2506442453
|
toISOString
|
2017-02-17 14:10:21 -07:00 |
|
|
Riley Davis
|
6eb4725dd9
|
remove ternary from return statement
|
2017-02-17 14:03:37 -07:00 |
|
|
David Erwin
|
5d1bc5fb5a
|
Merge branch 'master' into update-on-post-comment
|
2017-02-17 13:52:25 -05:00 |
|
|
David Erwin
|
62ee81e5a9
|
Merge pull request #326 from coralproject/stream-settings
Stream Settings
|
2017-02-17 13:51:26 -05:00 |
|
|
gaba
|
5a09beb727
|
It has to be translation_key and not message.
|
2017-02-17 10:12:37 -08:00 |
|
|
Belen Curcio
|
2d374fcdab
|
Úsing the db url
|
2017-02-17 15:08:55 -03:00 |
|
|
Belen Curcio
|
54f0705f0f
|
Merge branch 'master' of github.com:coralproject/talk into stream-settings
|
2017-02-17 15:05:17 -03:00 |
|
|
David Erwin
|
c92e336c7f
|
Merge pull request #321 from coralproject/the-answer-is-42
Counts on Mod Queues
|
2017-02-17 13:00:24 -05:00 |
|
|
Belén Curcio
|
98a34892ff
|
Merge branch 'master' into the-answer-is-42
|
2017-02-17 14:42:44 -03:00 |
|
|
David Jay
|
f6a6f443a9
|
Merge branch 'master' into update-on-post-comment
|
2017-02-17 12:30:42 -05:00 |
|