 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 |
|
|
Gabriela Rodríguez Berón
|
bf387af586
|
Merge pull request #325 from coralproject/displayNameFORALL
From displayName to username everywhere
|
2017-02-17 09:24:38 -08: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 |
|
|
Belen Curcio
|
41d0610985
|
PropTypes
|
2017-02-17 13:22:41 -03:00 |
|
|
gaba
|
3bfac591b3
|
An N was missing...
|
2017-02-17 08:20:27 -08: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 |
|
|
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 |
|
|
Wyatt Johnson
|
83f2f7b86b
|
Merge branch 'master' into the-answer-is-42
|
2017-02-16 16:49:46 -07:00 |
|
|
Riley Davis
|
f925e6a8ea
|
fix bug when likes or flags were 0 for an article
|
2017-02-16 16:49:14 -07:00 |
|
|
David Erwin
|
a267397f06
|
Standardizing username
|
2017-02-16 16:49:14 -07:00 |
|
|
Wyatt Johnson
|
84dcf3b3b6
|
Added some comments
|
2017-02-16 16:49:14 -07:00 |
|
|
Wyatt Johnson
|
1e81ec9f4e
|
Added new commentCount edge, added more docs
|
2017-02-16 16:49:14 -07:00 |
|
|
gaba
|
902cd8300d
|
Adds back the timeout to close window.
|
2017-02-16 16:49:14 -07:00 |
|
|
Gabriela Rodríguez Berón
|
e1383293d5
|
Merge pull request #324 from coralproject/summary-bugfix
fix bug when likes or flags were 0 for an article
|
2017-02-16 15:43:36 -08: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 Erwin
|
465de98318
|
Merge pull request #323 from coralproject/more-lingering-displayname-bugs
Standardizing username
|
2017-02-16 18:02:04 -05:00 |
|
|
David Erwin
|
e5512a0e54
|
Standardizing username
|
2017-02-16 17:56:46 -05:00 |
|
|
David Erwin
|
fa597ca04d
|
Merge pull request #322 from coralproject/bug-close-fb-win
Adds back the timeout to close window.
|
2017-02-16 15:42:21 -05:00 |
|
|
Riley Davis
|
1bda098045
|
Merge branch 'master' into the-answer-is-42
|
2017-02-16 13:41:01 -07:00 |
|
|
David Erwin
|
82811b8fae
|
Merge branch 'master' into bug-close-fb-win
|
2017-02-16 15:39:06 -05:00 |
|
|
David Erwin
|
88214a008c
|
Merge pull request #320 from coralproject/add-icon-qbox
Adds icon and style to the question box.
|
2017-02-16 15:38:44 -05:00 |
|
|
Riley Davis
|
c771e72ac3
|
Merge branch 'master' into the-answer-is-42
|
2017-02-16 13:34:31 -07:00 |
|
|
Wyatt Johnson
|
7f11efb648
|
Merge branch 'master' into bug-close-fb-win
|
2017-02-16 13:29:08 -07:00 |
|
|
David Erwin
|
4b2cd1731b
|
Merge branch 'master' into add-icon-qbox
|
2017-02-16 15:28:15 -05:00 |
|
|
David Erwin
|
29b134af87
|
Merge pull request #319 from coralproject/story-139830877-bug-local-user
It changes from displayname to username
|
2017-02-16 15:26:51 -05:00 |
|
|
gaba
|
06d426b72b
|
Adds back the timeout to close window.
|
2017-02-16 12:17:20 -08: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 |
|
|
Gabriela Rodríguez Berón
|
c8870f6097
|
Merge branch 'master' into story-139830877-bug-local-user
|
2017-02-16 08:54:58 -08:00 |
|
|
David Erwin
|
a482d6c4bf
|
Merge pull request #318 from coralproject/flags-button
Added count clearing for status changes
|
2017-02-16 11:41:28 -05:00 |
|
|
David Erwin
|
3c28557736
|
Merge branch 'master' into flags-button
|
2017-02-16 11:36:57 -05:00 |
|
|
David Erwin
|
d54f3103f9
|
Merge pull request #313 from coralproject/load-more-replies
Load more replies
|
2017-02-16 11:35:55 -05:00 |
|
|
David Erwin
|
ca1d9a04f6
|
Merge branch 'master' into load-more-replies
|
2017-02-16 11:31:32 -05:00 |
|
|
David Erwin
|
b6e9e3dcf5
|
Merge pull request #314 from coralproject/sory-139595043-qbox
Story 139595043 Question Box to Comment Stream
|
2017-02-16 11:31:17 -05:00 |
|
|
David Erwin
|
5467d980df
|
Merge branch 'master' into sory-139595043-qbox
|
2017-02-16 11:26:22 -05:00 |
|
|
David Erwin
|
57d11c63d2
|
Merge pull request #317 from coralproject/flag-widget
most flagged assets widget
|
2017-02-16 11:23:08 -05:00 |
|
|
gaba
|
ccb5228a9a
|
Errors when saving the user.
|
2017-02-15 18:28:49 -08:00 |
|
|
Wyatt Johnson
|
3be8ae39c4
|
Removed old TODO's
|
2017-02-15 17:53:13 -07:00 |
|
|
Wyatt Johnson
|
9ab2653054
|
Merge branch 'master' into flags-button
|
2017-02-15 17:51:56 -07:00 |
|