Commit Graph

27 Commits (106a42306e42e9f31498b7e9d056eb5b0944ffed)

Author SHA1 Message Date
Maxim Shishmarev 4dd314c18f Enable profile pictures 6 years ago
Beaudan Brown 685ada5cc5 Merge branch 'clearnet' into prep-merge 6 years ago
sachaaaaa ffd1667964 mainheader: call setstate only when needed for clipboard 6 years ago
Maxim Shishmarev f4ed8b2bf3 Add a feature flag for private group chats 6 years ago
Maxim Shishmarev 0df5214979 Limit small private groups to 10 members 6 years ago
sachaaaaa 65361d33f5 New menu item "show pairing words" for secondary devices 6 years ago
Beaudan Brown d97eced37b Merge branch 'clearnet' into multi-device 6 years ago
Beaudan Brown 5d2f7ddb20 Add messages needed for UI, bit of house work 6 years ago
Beaudan Brown 39fac5fd02 Add initial add server UI skeleton 6 years ago
sachaaaaa 8ecf057386 Display list of paired device in modal 6 years ago
sachaaaaa 0426d85e7a Merge branch 'clearnet' into multi-device
* clearnet: (136 commits)
  Fix more check on deletion.
  Only shorten pubkeys if name is present
  Shorten pubkeys in quotations too
  better guard
  pass serverId back to the server
  Bump version.
  Purge cache on failure.
  Fix unnecessary link preview fetches.
  Review changes. Increase mod time to 30 seconds.
  Undo defaultPublicChatServer change,
  Modified colour of dark mod badge
  Linting.
  Updated design
  Show crown icon for moderators
  Fix last hash all being NULL in database
  Poll for moderators, store them on the conversation and use the list to determine our own mod status
  Make sure we are always updating the last deleted id
  Update ts/components/conversation/FriendRequest.md
  Fix #355 Display timestamp for friend requests
  Fix duplicate detection for sent messages in public chat
  ...

# Conflicts:
#	app/sql.js
#	js/background.js
#	js/models/messages.js
#	js/views/app_view.js
#	libloki/crypto.js
#	libtextsecure/message_receiver.js
6 years ago
sachaaaaa d3c3184405 Search returns primary device when looking up secondary pub key 6 years ago
Mikunj 21dad58537 Linting. 6 years ago
Mikunj 3380500a2d Added QR code viewing. 6 years ago
sachaaaaa 59e1bb48c1
Merge pull request #434 from sachaaaaa/fix_clipboard_redraws
[multi-device] Fix main header being redrawn every 100ms
6 years ago
sachaaaaa 4a35492fe0 Fix main header being redrawn every 100ms 6 years ago
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