 gaba
|
8e14c1986d
|
Adds icon and style to the question box.
|
2017-02-16 10:33:28 -08: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 |
|
|
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
|
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 |
|
|
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 |
|
|
David Jay
|
fbf543727b
|
Moving load more limit to constant.
|
2017-02-14 18:54:51 -05:00 |
|
|
David Jay
|
bab2acc557
|
Merge branch 'master' into load-more-replies
|
2017-02-14 18:36:15 -05:00 |
|
|
gaba
|
52a1ebe82a
|
Merge branch 'master' into sory-139595043-qbox
|
2017-02-14 15:35:43 -08:00 |
|
|
gaba
|
b1d90dfd87
|
Fix TextField for the Configure Stream.
|
2017-02-14 15:31:12 -08:00 |
|
|
David Jay
|
00c2305ff7
|
Adding view more button to replies.
|
2017-02-14 18:29:59 -05:00 |
|
|
Riley Davis
|
50e3e733c3
|
create FlagWidget
|
2017-02-14 16:12:38 -07:00 |
|
|
Riley Davis
|
63982aa241
|
add PropTypes to LoadMore component
|
2017-02-14 15:27:36 -07:00 |
|
|
Riley Davis
|
0bef413a3a
|
saving my place
|
2017-02-14 15:20:28 -07:00 |
|
|
David Jay
|
e95372373c
|
Merge branch 'master' into load-more-comments
|
2017-02-14 16:35:44 -05:00 |
|
|
David Jay
|
b497dc2286
|
Merge branch 'master' of github.com:coralproject/talk into load-more-comments
|
2017-02-14 15:42:32 -05:00 |
|
|
Belén Curcio
|
023ba74c8f
|
Merge branch 'master' into all-flag
|
2017-02-14 16:34:44 -03:00 |
|
|
Belen Curcio
|
41a1eeda26
|
Removing all code
|
2017-02-14 16:10:08 -03:00 |
|
|
Belen Curcio
|
bbb82b6a77
|
New static routes <3 for global and single assets, also, deprecating the all view
|
2017-02-14 16:06:13 -03:00 |
|
|
Riley Davis
|
5e2c1a9d4f
|
Merge branch 'master'
Conflicts:
client/coral-admin/src/translations.json
|
2017-02-14 12:03:54 -07:00 |
|
|
David Erwin
|
ce2213549b
|
Merge branch 'master' into external-css-file
|
2017-02-14 13:40:22 -05:00 |
|
|
Riley Davis
|
53e3147290
|
properly save settings to server
|
2017-02-14 11:29:40 -07:00 |
|
|
Riley Davis
|
fe1aaba9ed
|
revert state shape to what it was before
|
2017-02-14 11:05:39 -07:00 |
|
|
David Jay
|
330c37ef86
|
Merge branch 'load-more-comments' of github.com:coralproject/talk into load-more-comments
|
2017-02-14 12:27:17 -05:00 |
|
|
David Jay
|
03a198a867
|
Adding View More translation.
|
2017-02-14 12:25:39 -05:00 |
|
|
David Jay
|
6b4ea14ce2
|
Merge branch 'master' into load-more-comments
|
2017-02-14 12:00:12 -05:00 |
|