Commit Graph

453 Commits (9992a3da1d5fd2c9a1c2bf1691e60b7ad510ad0b)

Author SHA1 Message Date
Audric Ackermann 9992a3da1d Add a showUserDetails modal to display user's details
Relates #655
5 years ago
Maxim Shishmarev 2ab0d084f1
Merge pull request #645 from msgmaxim/group-invites
Public chat invitations
5 years ago
Maxim Shishmarev a5fce17d8c public chat invitations 5 years ago
sachaaaaa 94dd331cb1 Show pubkey QR code in pairing dialog (as primary) 5 years ago
Maxim Shishmarev 4dd314c18f Enable profile pictures 5 years ago
Beaudan Brown 685ada5cc5 Merge branch 'clearnet' into prep-merge 5 years ago
sachaaaaa 86168ef870 lower case variable 5 years ago
sachaaaaa 497f42165a Allow unpairing device 5 years ago
Maxim Shishmarev 8677fb15a0 Select multiple messages and bulk deletion 5 years ago
sachaaaaa 13572c3524
Merge branch 'multi-device' into paired_device_alias 5 years ago
sachaaaaa 46613de846 lint 6 years ago
sachaaaaa b324421534 Allow primary device to assign local aliases to paired devices 6 years ago
Maxim Shishmarev 0d19b708f9 Creating private group chats between friends 6 years ago
sachaaaaa 65361d33f5 New menu item "show pairing words" for secondary devices 6 years ago
Beaudan Brown 0defebc484 Final change 6 years ago
Beaudan Brown d97eced37b Merge branch 'clearnet' into multi-device 6 years ago
Beaudan Brown a3635216db Enable sending audio recordings 6 years ago
Beaudan Brown 22df66c08f Fix missing await, fix undefined bug 6 years ago
Beaudan Brown 3bdbf03658 Enforce display name 6 years ago
Beaudan Brown b66abca17d Disable files for friend requests 6 years ago
Beaudan Brown f0c198c7b7 Split uploadData to public and private 6 years ago
Beaudan Campbell-Brown c9b11814a6
Merge pull request #567 from BeaudanBrown/name-restriction
Display name restrictions 2
6 years ago
Beaudan Campbell-Brown ac80ef0d4e
Merge pull request #557 from BeaudanBrown/add-server
Add server
6 years ago
Beaudan Brown 602ec1ccaf Also block displayname characters in the edit display name menu and change spaces to underscores 6 years ago
Beaudan Brown f538aeea50 Remove old link preview system 6 years ago
Beaudan Brown 4e85435bf7 Update attachment pipeline to upload and download from loki fileserver 6 years ago
Beaudan Brown 39fac5fd02 Add initial add server UI skeleton 6 years ago
Beaudan Brown 8d6fee4aec Merge branch 'clearnet' into multi-device 6 years ago
sachaaaaa c4728cf4f3 Provide a cancel button instead of a timeout for secondary registration 6 years ago
Beaudan Brown 7b0f40535f QoL with auto focus display name box and enter/esc key functionality on profile screen. Restrict display name characters to alphanumeric (easy to work around) 6 years ago
sachaaaaa b63d8ec84f Merge branch 'clearnet' into multi-device
* clearnet: (35 commits)
  yarn lint
  return early if signature is not a string
  lint pass 2
  lint pass 1
  make sure versioning on write can't get out of sync
  Update js/modules/loki_public_chat_api.js
  Handle annotations omit correctly
  fix typo CI found
  refactor
  pollOnceForMessages() move lastGot up, address Sacha's review
  Update js/modules/loki_public_chat_api.js
  address review
  address reviews
  Custom message rendering of mentions
  fix method
  separate out new/open, more lint/cleanup
  separate out note to self
  create window.mixpanel here
  use window.mixpanel, remove eventEmitter
  lint and remove unneeded params
  ...
6 years ago
Maxim Shishmarev 1496a368e9 Add UI elements for searching and selecting members in a group chat 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
Beaudan Brown a2cda31f1a Remove delete option from more info 6 years ago
sachaaaaa e50a29ffa5 Show 3 last mnemonic representation of public key instead of public key during pairing 6 years ago
Beaudan Campbell-Brown 48b6bf54c1
Merge pull request #461 from Mikunj/qr-code
Pubkey QR code
6 years ago
Mikunj 831ae09576 Cherry pick "profile simplification" from Mik 6 years ago
Mikunj 3380500a2d Added QR code viewing. 6 years ago
sachaaaaa 3a78f47cd7 Secondary device registration: UX changes (show countdown, disable button, etc.) 6 years ago
sachaaaaa 06d60fd68e
Merge pull request #431 from sachaaaaa/secondary_device_registration_view
[multi-device] Secondary device registration UI
6 years ago
sachaaaaa ac4038e86a Dialogs for device pairing requests - Primary device side 6 years ago
sachaaaaa 632e35c8a5 Secondary device registration UI 6 years ago
sachaaaaa 1f3f63dcc6 Report mnemonic error in a toast instead of silently fail 6 years ago
sachaaaaa 5cb7703ae5 Add one-time disclaimer at startup for beta release 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 8808100796 Merge signal-1.24.0
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	background.html
#	config/default.json
#	config/production.json
#	js/models/conversations.js
#	js/models/messages.js
#	js/views/conversation_view.js
#	js/views/inbox_view.js
#	js/views/settings_view.js
#	main.js
#	package.json
#	test/index.html
#	ts/components/conversation/ContactName.tsx
#	yarn.lock
6 years ago
Mikunj 3a8111020e Merge v1.23.0
# Conflicts:
#	background.html
#	package.json
#	yarn.lock
6 years ago
Mikunj 5d916748ae Fix styling 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