 David Erwin
|
0563b93d39
|
Merge branch 'master' into error_translation_key
|
2017-02-17 20:07:49 -05: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 |
|
|
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 |
|
|
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 |
|
|
Belen Curcio
|
051978a1ee
|
to the configure
|
2017-02-17 14:21:47 -03:00 |
|
|
Belen Curcio
|
761afeaf4f
|
Stream cog, settings
|
2017-02-17 14:15:16 -03:00 |
|
|
Belen Curcio
|
25f366c5f1
|
Comment Count Component
|
2017-02-17 13:55:35 -03:00 |
|
|
Belen Curcio
|
7eca9db63c
|
null assetIDs and old typo
|
2017-02-17 13:53:34 -03:00 |
|
|
gaba
|
dd3435fffe
|
Replace with translation_key to manage error translation.
|
2017-02-17 08:42:48 -08:00 |
|
|
David Jay
|
a35af36ee1
|
Handling premod in optimistic comment updates.
|
2017-02-17 11:26:19 -05:00 |
|
|
Belen Curcio
|
41d0610985
|
PropTypes
|
2017-02-17 13:22:41 -03:00 |
|
|
gaba
|
5370a6f81a
|
A few more changes from display to username.
|
2017-02-17 08:05:32 -08:00 |
|
|
David Erwin
|
8502b43974
|
Updating more displayname to username
|
2017-02-17 10:04:15 -05:00 |
|
|
Belén Curcio
|
e8f711ff9c
|
Merge branch 'master' into update-on-post-comment
|
2017-02-17 02:38:22 -03:00 |
|
|
gaba
|
a903ceb643
|
Merge branch 'master' into displayNameFORALL
|
2017-02-16 16:13:36 -08:00 |
|
|
gaba
|
4765973a58
|
Other small changes and fix bug because displayname instead displayName...
|
2017-02-16 16:07:19 -08:00 |
|
|
Riley Davis
|
f925e6a8ea
|
fix bug when likes or flags were 0 for an article
|
2017-02-16 16:49:14 -07:00 |
|
|
Riley Davis
|
2b4e16edfa
|
fix bug when likes or flags were 0 for an article
|
2017-02-16 16:39:02 -07:00 |
|
|
gaba
|
3166692d4e
|
Rename everywhere to username.
|
2017-02-16 15:16:54 -08:00 |
|
|
David Jay
|
e3e85c5f3b
|
Fixing error when posting comment.
|
2017-02-16 17:18:36 -05:00 |
|
|
Riley Davis
|
1bda098045
|
Merge branch 'master' into the-answer-is-42
|
2017-02-16 13:41:01 -07:00 |
|
|
David Erwin
|
24f052024d
|
Merge branch 'master' into update-on-post-comment
|
2017-02-16 15:40:51 -05:00 |
|
|
Riley Davis
|
c53aa1d93b
|
add a badge to the queues to show the count. proptypes
|
2017-02-16 12:48:36 -07:00 |
|
|
Riley Davis
|
1dcdd4a9c9
|
make Dashboard first tab per Sam. simplify tabs
|
2017-02-16 12:04:24 -07:00 |
|
|
gaba
|
8e14c1986d
|
Adds icon and style to the question box.
|
2017-02-16 10:33:28 -08:00 |
|
|
Belén Curcio
|
501e65f729
|
Merge branch 'master' into update-on-post-comment
|
2017-02-16 13:36:39 -03:00 |
|
|
David Erwin
|
ca1d9a04f6
|
Merge branch 'master' into load-more-replies
|
2017-02-16 11:31:32 -05:00 |
|
|
David Erwin
|
5467d980df
|
Merge branch 'master' into sory-139595043-qbox
|
2017-02-16 11:26:22 -05:00 |
|
|
David Erwin
|
04c0d42278
|
Merge branch 'master' into update-on-post-comment
|
2017-02-16 11:26:11 -05:00 |
|
|
Riley Davis
|
6c141cbce0
|
now with likes
|
2017-02-15 16:52:06 -07:00 |
|
|
Wyatt Johnson
|
56fe8ef08e
|
Merge branch 'master' into flag-widget
|
2017-02-15 16:17:30 -07:00 |
|
|
David Jay
|
80c60c560a
|
Merge branch 'master' into update-on-post-comment
|
2017-02-15 17:56:44 -05:00 |
|
|
David Jay
|
45b419139e
|
Merge branch 'master' of github.com:coralproject/talk into load-more-replies
|
2017-02-15 17:51:30 -05:00 |
|
|
Riley Davis
|
f91607cff9
|
show the author and publication date
|
2017-02-15 15:36:46 -07:00 |
|
|
Riley Davis
|
da1a931a40
|
remove a comma
|
2017-02-15 15:13:54 -07:00 |
|
|
Riley Davis
|
b3b36a245a
|
even more translations en Español
|
2017-02-15 14:23:54 -07:00 |
|
|
riley
|
b26c170a52
|
add some translations and link to mod queue
|
2017-02-15 14:11:44 -07:00 |
|
|
David Erwin
|
8a3309da92
|
Merge branch 'master' into sory-139595043-qbox
|
2017-02-15 15:50:42 -05:00 |
|
|
Belen Curcio
|
1796efd3ba
|
Ádding NONE to the FE
|
2017-02-15 17:34:29 -03:00 |
|
|
Belen Curcio
|
0778b7832f
|
Merge branch 'flags-button' of github.com:coralproject/talk into flags-button
|
2017-02-15 17:33:30 -03:00 |
|
|
Belen Curcio
|
675f823849
|
no comments endpoints in /admin 🎉
|
2017-02-15 17:32:54 -03:00 |
|
|
Riley Davis
|
efb529d7bd
|
Merge branch 'master'
Conflicts:
client/coral-admin/src/AppRouter.js
|
2017-02-15 13:03:19 -07:00 |
|
|
Riley Davis
|
6eda495663
|
display most flagged assets in a table
|
2017-02-15 12:57:51 -07:00 |
|