 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 |
|
|
Gabriela Rodríguez Berón
|
a33daea5a3
|
Merge branch 'master' into sory-139595043-qbox
|
2017-02-15 11:57:39 -08:00 |
|
|
gaba
|
68c764fd43
|
Rename coral-ui/FormField with TextField.
|
2017-02-15 11:50:21 -08:00 |
|
|
gaba
|
1d1b1b3391
|
Move to use FormField the right way.
|
2017-02-15 11:37:39 -08:00 |
|
|
Belén Curcio
|
5b16df44ed
|
Merge branch 'master' into flags-button
|
2017-02-15 16:33:53 -03:00 |
|
|
Belen Curcio
|
ed105f876e
|
not Accepted ones in the Flagged queue
|
2017-02-15 16:19:31 -03:00 |
|
|
Belen Curcio
|
e59534bf46
|
merge confict
|
2017-02-15 16:09:04 -03:00 |
|
|
David Jay
|
1cad1d36d5
|
Updating asset_id to camelcase.
|
2017-02-15 13:26:56 -05:00 |
|
|
David Jay
|
88843486f1
|
Removing log statement.
|
2017-02-15 13:21:34 -05:00 |
|
|
David Jay
|
79dbe7dcda
|
Updating commentCount on comment post.
|
2017-02-15 13:05:31 -05:00 |
|
|
David Jay
|
904bda86db
|
Fixing error with replies.
|
2017-02-15 12:36:19 -05:00 |
|
|
David Jay
|
a9104b749c
|
Updating comments and replies using updatequeries w/ optimistic updating.
|
2017-02-15 12:19:36 -05:00 |
|
|
Belen Curcio
|
417edc81ca
|
Admin actions for flagged comments
|
2017-02-15 13:40:01 -03:00 |
|
|
gaba
|
d7469d648d
|
Replace element with name instead of id. Add style to textfield from coral-ui.
|
2017-02-14 17:48:10 -08:00 |
|
|
gaba
|
0f074dc034
|
Changes styles for Emma and Sam's design.
|
2017-02-14 17:13:08 -08:00 |
|
|
gaba
|
d3f81353a6
|
Fix TextField for coral-ui and setting configure stream, question box.
|
2017-02-14 16:51:57 -08:00 |
|
|
Wyatt Johnson
|
e640bc2cc0
|
Added edge for metrics, fixed client linting errors
|
2017-02-14 17:02:50 -07:00 |
|
|
David Jay
|
6bc610d2c6
|
Merge branch 'load-more-replies' of github.com:coralproject/talk into load-more-replies
|
2017-02-14 18:59:00 -05:00 |
|