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
|
e343a04eea
|
Merge commit '18b5b7c046436f2defab2e20407e22da180bf97b' into signal-1.22
# Conflicts:
# app/sql.js
# background.html
# config/default.json
# js/background.js
# js/models/conversations.js
# js/models/messages.js
# js/modules/data.js
# js/signal_protocol_store.js
# js/views/conversation_search_view.js
# libtextsecure/message_receiver.js
# libtextsecure/sendmessage.js
# main.js
# package.json
# preload.js
# test/index.html
# ts/components/Avatar.tsx
# ts/components/conversation/ConversationHeader.md
# ts/components/conversation/ConversationHeader.tsx
|
7 years ago |
Scott Nonnenberg
|
b3ac1373fa
|
Move left pane entirely to React
|
7 years ago |
|
Scott Nonnenberg
|
a43a78731a
|
Note to Self
|
7 years ago |
|
Mikunj
|
ddfc99a461
|
Added online indicator to conversation header.
|
7 years ago |
|
Mikunj
|
9b382de6da
|
Added online indicator.
Disable selection in contacts.
|
7 years ago |
|
Scott Nonnenberg
|
8f3e3b7aaf
|
Update to new design for avatars: individual/group icons/colors
And two initials.
|
7 years ago |