Commit Graph

11 Commits (1ced8e348b2e433664426cb213237ac5a62d8d24)

Author SHA1 Message Date
sachaaaaa b5aee4f4be Display "Pair New Device" in menu for non-secondary devices 6 years ago
Maxim Shishmarev d0e73ed7f8 Add a button to paste pubkey from clipboard if valid 6 years ago
Mikunj b8ef6c2cc6 Loki changes
Added friends section in search.

This is because contacts is now used in signal for something else and we don't want to clash meanings.

Styling fixes

Add dropdown options into mainheader

Updated styling

Restore StartNewConversation to the old ui style of loki messenger.

Fix friend search display.

Fix header expand animation.

Hooked up menu actions.

Linting.

More styling changes.

Fix tests.

Added back in the loki logo below the gutter.

Fix toast positioning.

Fix context menu showing incorrectly on virtual lists.

Added tabs.

Linting
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
6 years ago
Scott Nonnenberg b3ac1373fa Move left pane entirely to React 6 years ago
Mikunj 6bd2d3962e Linted files 6 years ago
Mikunj 14ecbc3f35 Moved MainHeader into its own Backbone View. 6 years ago
Mikunj a807b6eacd Show expand icon on main header. 6 years ago
Mikunj 1be63b52b2 Show contact name on main header. 6 years ago
sachaaaaa 639c3e9a4f fix app name from previous merge 7 years ago
Scott Nonnenberg a8e12d0771 Add user's avatar to the top left of the screen 7 years ago