Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Traders chat #3165

Merged
merged 35 commits into from Aug 30, 2019
Merged

Traders chat #3165

Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
b5b126c
Refactor Chat out of TraderDisputeView
sqrrm May 23, 2019
390fc44
Send acks when capability found
sqrrm May 25, 2019
b1362a9
Separate most of Chat and arbitration
sqrrm May 25, 2019
1a25678
Move close ticket button creation to arbitration
sqrrm May 25, 2019
2d77f32
Handle Chat message subscription inside Chat
sqrrm May 25, 2019
1b1dce1
Add ChatManager
sqrrm May 30, 2019
b93e7ba
Add trader chat
sqrrm May 25, 2019
3b87045
Make attachments optional
sqrrm Jun 3, 2019
fb71c32
Test trade chat UI
sqrrm Jun 3, 2019
0217c3d
Add comments on BSQ trade fee calculation
sqrrm Jun 5, 2019
2375880
Change message box aid
sqrrm Jun 5, 2019
13f2651
Add basic chat UI
sqrrm Jun 5, 2019
329572c
Merge branch 'master_upstream' into sq-add-trader-chat
chimp1984 Aug 29, 2019
5d338e6
Fix merge issues
chimp1984 Aug 29, 2019
cb67376
Update string
chimp1984 Aug 29, 2019
8e3a351
Add comments, cleanup, fix wrong param name
chimp1984 Aug 29, 2019
2189cba
Show chat in popup instead of tab (WIP)
chimp1984 Aug 29, 2019
bfb111d
Add close handler to popup
chimp1984 Aug 29, 2019
fa43f03
Merge branch 'master_upstream' into sq-add-trader-chat
chimp1984 Aug 29, 2019
29e957a
Apply changes from master
chimp1984 Aug 29, 2019
855cb4f
Add missing allServicesInitialized check
chimp1984 Aug 29, 2019
e0c1a85
Add wasDisplayed field to chatMsg
chimp1984 Aug 29, 2019
81a93b5
Add onAllServicesInitialized call, rename method
chimp1984 Aug 29, 2019
a2cd808
Add missing setWasDisplayed
chimp1984 Aug 29, 2019
6304c9e
Add badge for num new chat msg
chimp1984 Aug 29, 2019
5c1999f
Fix wrong pubkey
chimp1984 Aug 29, 2019
663d859
Add chat rules system msg; cleanups
chimp1984 Aug 29, 2019
5e267fa
Handle nullables
chimp1984 Aug 29, 2019
964ca64
Fix positioning of badge
ripcurlx Aug 30, 2019
8edd261
Use button instead of label to fix tooltip font size, use material de…
ripcurlx Aug 30, 2019
fa30720
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Aug 30, 2019
16d3bc5
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Aug 30, 2019
c615780
Update tradeChat.rules
chimp1984 Aug 30, 2019
57ec0db
Persist chat position. Improve listener handling.
chimp1984 Aug 30, 2019
50baa9b
Close chat window if dispute gets closed
chimp1984 Aug 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/resources/i18n/displayStrings.properties
View file
Open in desktop
Expand Up @@ -617,7 +617,7 @@ tradeChat.rules=You can communicate with your trade peer to resolve potential pr
\t● Do not encourage trading outside of Bisq (no security).\n\
\t● Keep conversation friendly and respectful.\n\
\t● Do not engage in any form of social engineering scam attempts.\n\
\t● Respect if the peer is not responding and prefers to not communicate via the chat.\n\
\t● If a peer is not responding and prefers to not communicate via chat, respect their decision.\n\
\t● Keep conversation scope limited to the trade. This chat is not a messenger replacement or trollbox.

# suppress inspection "UnusedProperty"
Expand Down