 Gabriela Rodríguez Berón
|
04a4918fd5
|
Update ConfigureStreamContainer.js
|
2017-04-17 12:35:29 -07:00 |
|
|
gaba
|
f66e12be18
|
Merge branch 'master' into 143520971-stream-settings
|
2017-04-17 12:07:19 -07:00 |
|
|
gaba
|
fb010bfa67
|
Rename settings of the state to dirtySettings and add TO DO item to be sure we refactor this next time we do a refactor.
|
2017-04-17 11:51:24 -07:00 |
|
|
Kim Gardner
|
71e1c01552
|
Merge branch 'master' into add_translations
|
2017-04-13 20:10:19 -04:00 |
|
|
Kim Gardner
|
193ed8c863
|
Merge branch 'master' into ignore
|
2017-04-13 20:00:59 -04:00 |
|
|
gaba
|
d9c8882d8f
|
More translations in the configuration.
|
2017-04-13 16:19:21 -07:00 |
|
|
gaba
|
902071c0fe
|
Adds title of most flagged in dashboard.
|
2017-04-13 16:11:25 -07:00 |
|
|
gaba
|
c395bc8849
|
Adds closedAt to state... and check that closedTimeout settings exists for the Asset.
|
2017-04-13 14:21:45 -07:00 |
|
|
gaba
|
fa72a661ad
|
Going back to previous setting state as I do not want it to re-render.
|
2017-04-13 12:43:24 -07:00 |
|
|
gaba
|
9dae72dd8a
|
Good catch. Use setState.
|
2017-04-13 11:44:08 -07:00 |
|
|
Benjamin Goering
|
118da885fd
|
Merge branch 'master' of github.com:coralproject/talk into ignore_rb2
|
2017-04-13 12:12:10 -05:00 |
|
|
gaba
|
abc7aa7b30
|
Uh... wrong element.
|
2017-04-12 18:39:56 -07:00 |
|
|
Gabriela Rodríguez Berón
|
42a1026f9c
|
Merge branch 'master' into 143520971-stream-settings
|
2017-04-12 14:12:15 -07:00 |
|
|
gaba
|
e04f0f7070
|
Moves settings into the state for the stream. Adds premodlinks to the query.
|
2017-04-12 14:08:55 -07:00 |
|
|
Kim Gardner
|
29fe5e2901
|
Fix broken links to Stories page
|
2017-04-12 15:40:34 -04:00 |
|
|
Kim Gardner
|
d892d1327d
|
Merge branch 'master' into fix-more-buttons
|
2017-04-12 15:12:27 -04:00 |
|
|
gaba
|
cbde4cc8bc
|
Removes handleClick as it is working now with the changeTab (as the viewAllComments was added). /cc @kiwi
|
2017-04-12 11:58:41 -07:00 |
|
|
Chi Vinh Le
|
81bd983f0b
|
Handle empty stream case
|
2017-04-13 01:34:27 +07:00 |
|
|
Chi Vinh Le
|
92205a2c6f
|
Fix load more buttons
|
2017-04-13 01:17:46 +07:00 |
|
|
gaba
|
48795b29bf
|
Removes isAdmin for refetching when changing tabs.
|
2017-04-12 10:41:15 -07:00 |
|
|
gaba
|
f4f8e5053f
|
Remove the binding in the constructor.
|
2017-04-12 10:12:00 -07:00 |
|
|
Gabriela Rodríguez Berón
|
51774323de
|
Merge branch 'master' into 143520139-permalink-show-all
|
2017-04-12 10:10:17 -07:00 |
|
|
Kim Gardner
|
a19d6544a7
|
Don't need to escape single quotes within double quotes
|
2017-04-12 10:05:21 -04:00 |
|
|
Kim Gardner
|
d74cdd938f
|
Double quotes should be single
|
2017-04-12 09:51:32 -04:00 |
|
|
Kim Gardner
|
143ce795c3
|
Merge branch 'master' into 143520139-permalink-show-all
|
2017-04-12 08:14:39 -04:00 |
|
|
Belen Curcio
|
1a678a0cb3
|
Removing username -- with lintin
|
2017-04-12 08:21:39 -03:00 |
|
|
Belen Curcio
|
cc0f757746
|
Removing username
|
2017-04-12 08:16:02 -03:00 |
|
|
Belen Curcio
|
2e3021e66b
|
Linting
|
2017-04-11 22:17:04 -03:00 |
|
|
Belen Curcio
|
63b630833a
|
Fake Comment Style
|
2017-04-11 22:12:10 -03:00 |
|
|
Belen Curcio
|
e4aa98b87a
|
Hidding login as
|
2017-04-11 22:00:55 -03:00 |
|
|
gaba
|
f900727455
|
Move the method to the class, changes name and removes wrapper.
|
2017-04-11 17:57:56 -07:00 |
|
|
Belen Curcio
|
3c6ce7a80f
|
QuestionBox
|
2017-04-11 21:56:43 -03:00 |
|
|
Gabriela Rodríguez Berón
|
f44798361e
|
Merge branch 'master' into 143520139-permalink-show-all
|
2017-04-11 15:06:22 -07:00 |
|
|
gaba
|
56dedb551f
|
Adds click to showAll and refresh query to the '# comments' tab.
|
2017-04-11 15:02:04 -07:00 |
|
|
Benjamin Goering
|
fbcea2de6d
|
Merge branch 'master' into ignore
|
2017-04-11 14:49:56 -07:00 |
|
|
Benjamin Goering
|
247583b858
|
Merge branch 'ignore' of github.com:gobengo/talk into ignore
|
2017-04-11 14:33:10 -07:00 |
|
|
Benjamin Goering
|
8cf2130e25
|
Update spanish translation for commentIsIgnored
|
2017-04-11 14:31:46 -07:00 |
|
|
Gabriela Rodríguez Berón
|
295f4ddec2
|
Merge branch 'master' into ignore
|
2017-04-11 14:26:53 -07:00 |
|
|
Kim Gardner
|
7ab8dbf3c6
|
Merge branch 'master' into flash-messages
|
2017-04-11 17:22:02 -04:00 |
|
|
Benjamin Goering
|
a7be2772c3
|
IgnoredCommentTombstone body text is more i18n
|
2017-04-11 14:20:39 -07:00 |
|
|
Benjamin Goering
|
847ad2263b
|
Split IgnoreUserWizard into own file
|
2017-04-11 14:20:39 -07:00 |
|
|
Benjamin Goering
|
eb1c1db09b
|
Ignore users queries are excludeIgnored: Boolean instead of notIgnoredBy: String
|
2017-04-11 14:20:39 -07:00 |
|
|
Benjamin Goering
|
12e383ef13
|
refetch streamQuery on stopIgnoringUser
|
2017-04-11 14:20:39 -07:00 |
|
|
Benjamin Goering
|
a43e713ac0
|
Move TopRightMenu down 5px
|
2017-04-11 14:20:38 -07:00 |
|
|
Benjamin Goering
|
0dff670b70
|
Slot component wraps in inline element, not block (which can affect other styles)
|
2017-04-11 14:20:38 -07:00 |
|
|
Benjamin Goering
|
58ffd61884
|
Move TopRightMenu component out of Comment and into own file
|
2017-04-11 14:20:38 -07:00 |
|
|
Benjamin Goering
|
4d2e5ed81f
|
Comments by logged in user dont show TopRightMenu + IgnoreUserWizard
|
2017-04-11 14:20:38 -07:00 |
|
|
Benjamin Goering
|
58736586e4
|
Asset commentCount and totalCommentCount can be personalized by notIgnoredBy
|
2017-04-11 14:20:37 -07:00 |
|
|
Benjamin Goering
|
b561e9f643
|
Comment replyCount edge can now be filtered by notIgnoredBy
|
2017-04-11 14:20:37 -07:00 |
|
|
Benjamin Goering
|
873da1cea9
|
Embed doesn't show comments from ignored users
|
2017-04-11 14:20:37 -07:00 |
|