Maxim Shishmarev
|
2990c95e40
|
Fix incorrect margins for public messages and friend request bubbles
|
6 years ago |
sachaaaaa
|
e5eab74b1b
|
Fix #355 Display timestamp for friend requests
|
6 years ago |
Mikunj
|
12ce0140de
|
Left pane changes.
Merge commit 'b3ac1373fa64117fe2a9ccfddf3712f1826c06d9' into signal-1.23
# Conflicts:
# _locales/en/messages.json
# background.html
# js/background.js
# js/conversation_controller.js
# js/models/conversations.js
# js/models/messages.js
# js/views/conversation_list_item_view.js
# js/views/conversation_list_view.js
# js/views/conversation_search_view.js
# js/views/inbox_view.js
# libtextsecure/account_manager.js
# package.json
# stylesheets/_global.scss
# stylesheets/_index.scss
# stylesheets/_modules.scss
# test/_test.js
# test/index.html
# test/models/conversations_test.js
# test/views/conversation_search_view_test.js
# ts/components/ConversationListItem.tsx
# ts/components/MainHeader.tsx
# ts/components/conversation/ConversationHeader.tsx
# ts/components/conversation/ResetSessionNotification.tsx
|
7 years ago |
|
Mikunj
|
6bd2d3962e
|
Linted files
|
7 years ago |
sachaaaaa
|
dbdd52b4eb
|
Merge pull request #50 from Mikunj/fix/friend-request
Friend request fixes
|
7 years ago |
|
Mikunj
|
484efd34a3
|
Added friend request message expiration.
|
7 years ago |
|
Mikunj
|
a82999818a
|
Added blocking/unblocking from friend request.
Fixed incoming messages being deleted.
|
7 years ago |
|
Mikunj
|
557fed11f3
|
Only display retry send button if the request is pending.
|
7 years ago |
|
Mikunj
|
4d08a74d53
|
Updated FriendRequest to be more consistent with the other typescript components.
|
7 years ago |
|
Mikunj
|
f45e0030c4
|
Added status display and retry send to friend request.
|
7 years ago |
|
Mikunj
|
fc3cb9c46d
|
Replace old pending messages with new one when adding a new incoming friend request.
More refactoring.
|
7 years ago |
|
Mikunj
|
0a23888875
|
Fix up friend request message layout
|
7 years ago |
|
Mikunj
|
0cf616328e
|
Fixed saving prekey bundle once friend request is accepted.
Added option to delete conversation after it is declined.
|
7 years ago |
|
Mikunj
|
9dc19044b9
|
Handle the case where the user is sending a friend request.
Fix up styling for outgoing message.
|
7 years ago |
|
Mikunj
|
08ca779fe1
|
Fixed up friend request message display
|
7 years ago |
|
Mikunj
|
5626cfe47d
|
Added FriendRequest message
|
7 years ago |