Commit Graph

1214 Commits (d3653e8665ed22ea24efa34fa5b8b58f487719b2)

Author SHA1 Message Date
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 bd16bc5b9b lint 6 years ago
sachaaaaa 6de6b762e6 Ensure the latest contact signed prekey is used 6 years ago
sachaaaaa b10835ffc7 Share contact upon authorising secondary device 6 years ago
sachaaaaa cf3ddf0b03
Merge pull request #466 from sachaaaaa/mnemonic_secret
[multi-device] Show 3 last mnemonic representation of public key
6 years ago
Beaudan Brown 9beea2cbd3 Enforce curlies completely and lint with new settings 6 years ago
Beaudan Brown c4a95218fa Make even smaller 6 years ago
Beaudan Brown 3894f2784e Clean up redundant repetition 6 years ago
Beaudan Brown 66459ac4bd Remove most of the right click and cog menu options for the public chats 6 years ago
sachaaaaa ef6b22f6b9 Simplify and lint 6 years ago
sachaaaaa 35b6182074 Clean up after account registration failure 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 58b0c5ef39 Removed a line 6 years ago
Beaudan Campbell-Brown a6abcaf826
Merge pull request #453 from Mikunj/profile-simplification
Profile simplification
6 years ago
Beaudan Campbell-Brown 43bd167965
Merge pull request #463 from loki-project/public-chat
Public chat
6 years ago
Mikunj 21dad58537 Linting. 6 years ago
Mikunj 831ae09576 Cherry pick "profile simplification" from Mik 6 years ago
Mikunj 3d179909c7 Decrease the correctness level on the QR code. 6 years ago
Mikunj 3380500a2d Added QR code viewing. 6 years ago
Beaudan Brown 351fa09ad6 Only show delete option if have mod status and show different modal for mod deletion 6 years ago
sachaaaaa 3a78f47cd7 Secondary device registration: UX changes (show countdown, disable button, etc.) 6 years ago
Mikunj c4dd10a5cd Simplified profile setting. Renamed functions to be less confusing. Removed storing profile in local storage. 6 years ago
sachaaaaa 661b207245 Various fixes for bugs introduced during reviews 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 24cf1ef3f7
Merge pull request #433 from sachaaaaa/primary_accept_request
[multi-device] UI for accepting pairing request on Primary devices
6 years ago
sachaaaaa 79d842635d fix events registration issues 6 years ago
sachaaaaa 2754969b23 Ensure one listener and one event for 'secondaryDeviceRegistration' 6 years ago
sachaaaaa ac4038e86a Dialogs for device pairing requests - Primary device side 6 years ago
sachaaaaa b5aee4f4be Display "Pair New Device" in menu for non-secondary devices 6 years ago
sachaaaaa 632e35c8a5 Secondary device registration UI 6 years ago
Beaudan Brown 662c64f347 Remove ability to delete some rss conversations 6 years ago
sachaaaaa a7f999aeb1
Merge pull request #391 from sachaaaaa/show_seed_errors
Report mnemonic errors instead of silent failure
6 years ago
sachaaaaa 1f3f63dcc6 Report mnemonic error in a toast instead of silently fail 6 years ago
sachaaaaa 701f6be00c Add missing mnemonic languages 6 years ago
Beaudan f7039080af Remove accidental swapfile, save messages with the id given to them from public server 6 years ago
Beaudan ccfc9046b4 Fix tests 6 years ago
Beaudan 7dd155eb16 Remove empty event trigger, doesn't seem to be required any more but could be wrong 6 years ago
Beaudan 9dae805017 Run lint 6 years ago
Beaudan Campbell-Brown dd7bf1b2bb
Merge pull request #370 from msgmaxim/clipboard
Add a button to paste pubkey from clipboard if valid
6 years ago
Beaudan Campbell-Brown b76f84acc5
Merge pull request #377 from msgmaxim/typing-indicators
Add a toggle option for typing indicators; use short ttl for them
6 years ago
Maxim Shishmarev cdd374a4b2 Add a toggle option for typing indicators; use short ttl for them 6 years ago
Beaudan Campbell-Brown 6a3062860d
Merge pull request #365 from sachaaaaa/beta-disclaimer
Add one-time disclaimer at startup for beta release
6 years ago
Maxim Shishmarev d0e73ed7f8 Add a button to paste pubkey from clipboard if valid 6 years ago
Beaudan 63396669bc Add eslint rule to enforce curlys, run eslint --fix to automatically apply this rule and add swapfiles to gitignore 6 years ago
sachaaaaa 5cb7703ae5 Add one-time disclaimer at startup for beta release 6 years ago
Beaudan 96aaa7851d Send broadcast message instead of empty message to trigger things like session reset and disappearing messages. Also fix small bug where deleting a contact kept the (now removed) conversation open 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 61b862b021 Merge signal 1.24.1 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