Commit Graph

693 Commits (a8f45b527e0f661f1411b1150c12d37c158ff058)

Author SHA1 Message Date
Audric Ackermann 55e39a02b3 Add our custom SessionInput component and use it in the registration page 5 years ago
Audric Ackermann 2813e92ad2 update enum types to be capitalized 5 years ago
Audric Ackermann c5dd87bd4f add and use wasa font 5 years ago
Audric Ackermann 30c31260ac fixlint 5 years ago
Audric Ackermann cc97d9284b add first chunck of our SessionRegistrationView 5 years ago
Audric Ackermann 75c35633ab add clickhandler to SessionButton and the AccentText component 5 years ago
Vincent 94f6ee3f3b Inital toast UI 5 years ago
Vincent 02d23e972c Optimisations and SASS simplifcation 5 years ago
Vincent 2bdc0579c3 Message deletion moderator check and toast. 5 years ago
Vincent fc235d6057 Completed message selection 5 years ago
Vincent 0c4f57e57d Added session button types and session button colors 5 years ago
Vincent 98b4b18583 Added message selection inital functionality and added to buttons 5 years ago
Vincent c2c084920a Namespacing 5 years ago
Vincent c9887f7bc3 Exports simplification and message selection 5 years ago
Vincent 10676f5573 Improved file structuring 5 years ago
Vincent 4d105f5c66 Simplified icons object 5 years ago
Vincent a17964beb7 Using singular enum names rather than plural 5 years ago
Vincent 19f8e85786 Prop destructuring 5 years ago
Vincent 35e85dc2bc Merged 5 years ago
Vincent 141c0135fb Fixed styling 5 years ago
Vincent d62f1c6e22 Inital conversation restructuring 5 years ago
vincentbavitz 64d4a7e28f
Made IconButton purely compositional for generalisability 5 years ago
vincentbavitz d3e6494c36
iconRotation not necessary as class. 5 years ago
vincentbavitz 11915614b5
Update SessionIcon.tsx 5 years ago
Vincent fa8f310b02 Switched IconButton to fully compositional format for generalisation 5 years ago
vincentbavitz 20f379e0c2
Removed redundant artifact 5 years ago
Vincent 3a03591e00 Built generalised Icon component as superclass to IconButton 5 years ago
Vincent d866e0ca2d Updated recommended changes and made simplifications 5 years ago
Vincent 08bf89bdd1 Updated recommended changes and made simplifications 5 years ago
Vincent f7fde304ab Fixed syntax & linted 5 years ago
Vincent 533ec4eedc Fixed syntax & linted 5 years ago
Vincent a6fb54233a Created generalised icon button component 5 years ago
Audric Ackermann 24e24681a6 add a custom session button 5 years ago
Ryan Tharp a3abf3b14a
Merge pull request #661 from sachaaaaa/encrypted_avatar
Encrypted profile pic
5 years ago
sachaaaaa 25f0c3f700 Hide 'edit profile' on secondary devices 5 years ago
Vince 44ff75cc88 Fixed multi select by preventing select on clicking audio element in message list. 5 years ago
Maxim Shishmarev 1020f54b60
Merge pull request #662 from Bilb/655-clickable-profile
clickable profile
5 years ago
vincentbavitz 2e83881373
Merge pull request #652 from vincentbavitz/public-ban
Public ban
5 years ago
Vince a7a2f9289c Updated references to hasModPerms to isModerator for code consistency 5 years ago
Audric Ackermann 061556bb7d trigger showUserDetails on message's avatar clicks 5 years ago
Vince e9068d56ce Updated isModerator to senderIsModerator and fixed logic of isModerator function 5 years ago
Audric Ackermann acea116d4f Revert "Message: click on avatar show userDetailModal"
This reverts commit 2c914c554d.
5 years ago
Audric Ackermann be5f932c08 fix lint 5 years ago
Audric Ackermann bd7f587aa7 Center avatar and display name in UserDetailsDialog 5 years ago
Audric Ackermann c61249e5e0 put event in the avatar element and trigger it in conversation header 5 years ago
Audric Ackermann 2c914c554d Message: click on avatar show userDetailModal
Disable the click on avatar because before it selected the message.
OnClick on avatar -> trigger event to show the UserDetails modal with this pubkey.
5 years ago
Audric Ackermann 9992a3da1d Add a showUserDetails modal to display user's details
Relates #655
5 years ago
Maxim Shishmarev 5a4ea93594
Merge pull request #653 from Bilb/clearnet
Fix the conversation horizontal scrollbar when only few conversations #560
5 years ago
Audric Ackermann 2c789c8b0e fix lint 5 years ago
Audric Ackermann 0b15fa467b Fix the conversation scrollbar when only few conversations #560 5 years ago
Maxim Shishmarev 07c39523e9 Show appropriate message in group invitation dialog on no friends 5 years ago
Beaudan Brown 43a91ab672 Linted 5 years ago
Maxim Shishmarev 2ab0d084f1
Merge pull request #645 from msgmaxim/group-invites
Public chat invitations
5 years ago
Beaudan Brown a3d171884d Added ban user right click functionality 5 years ago
Ryan Tharp 6cde9aa263
Merge pull request #638 from neuroscr/multidevice-publicchat
Public Chat - home server refactor / read public chat avatars from home server
5 years ago
Maxim Shishmarev 89e5e919f2 Address more review comments 5 years ago
Maxim Shishmarev a5fce17d8c public chat invitations 6 years ago
Maxim Shishmarev 9d50c21b29
Merge pull request #635 from msgmaxim/context-menu-select
Don't select messages when context menu is shown
6 years ago
Ryan Tharp f245007a8b convert findMember to async 6 years ago
Maxim Shishmarev 8cd8c8d4f9
Merge pull request #610 from msgmaxim/profile-pictures
Enable custom profile pictures
6 years ago
Maxim Shishmarev e738e07d3e Add missing margin to typing indicator bubbles 6 years ago
Maxim Shishmarev 8b2876dadc Disable context menu and message selection for RSS feed 6 years ago
Maxim Shishmarev 2262b41cd7 Prevent hiding the context menu by clicking away to also potentially select messages 6 years ago
Maxim Shishmarev 2990c95e40 Fix incorrect margins for public messages and friend request bubbles 6 years ago
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
sachaaaaa 006f817faa make linter happy 6 years ago
sachaaaaa c9e3757381 dial the logging down a notch 6 years ago
Maxim Shishmarev 7c96990119 Correctly handle server errors in multi-deletion 6 years ago
Maxim Shishmarev 8677fb15a0 Select multiple messages and bulk deletion 6 years ago
Maxim Shishmarev f4ed8b2bf3 Add a feature flag for private group chats 6 years ago
Maxim Shishmarev 395daf3aba Use Array.includes in place of Array.indexOf 6 years ago
Maxim Shishmarev a2f836c690 Address review comments 6 years ago
Maxim Shishmarev 7c05939f55 Add group admins and the ability to remove members from private groups 6 years ago
Maxim Shishmarev 0df5214979 Limit small private groups to 10 members 6 years ago
Maxim Shishmarev 0490e5c668 Clean up conversation options for groups 6 years ago
Maxim Shishmarev 9f81f67460 Can leave private group chats 6 years ago
Maxim Shishmarev f5e9a870f7 Add support for mentions in private group chats 6 years ago
Maxim Shishmarev 90f1d4a6aa Display error messages when creating/updating group chats 6 years ago
Maxim Shishmarev cf18572049 Adding new group members; establishing sessions between non-friends 6 years ago
Maxim Shishmarev 0d19b708f9 Creating private group chats between friends 6 years ago
Maxim Shishmarev 6c08852118
Merge pull request #593 from msgmaxim/not-friends
Fix incorrectly showing friend request as pending
6 years ago
sachaaaaa 65361d33f5 New menu item "show pairing words" for secondary devices 6 years ago
Maxim Shishmarev e64ccbdd2b Clean up RSS conversation 6 years ago
Maxim Shishmarev 9e6f6d5a01 Fix incorrectly showing friend request as pending 6 years ago
Beaudan Brown 08ad913105 Add explicit isSecondary flag to conversation list items so they can remain hidden in the menu after they become friends etc 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
Beaudan Brown 8d6fee4aec Merge branch 'clearnet' into multi-device 6 years ago
Maxim Shishmarev 8be1c61f4c Highlight conversations with unread mentions of the user 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
sachaaaaa b13a4f3e56
Merge pull request #520 from msgmaxim/mentions2
Custom message rendering of mentions
6 years ago
Maxim Shishmarev 16692696e0 address reviews 6 years ago
sachaaaaa 155a3b8f17
Merge pull request #512 from neuroscr/desktop-analytics
Desktop Analytics
6 years ago
Maxim Shishmarev 687e9db77b Custom message rendering of mentions 6 years ago
Maxim Shishmarev 1496a368e9 Add UI elements for searching and selecting members in a group chat 6 years ago
Ryan Tharp 88b44390bf Desktop Analytics 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
Maxim Shishmarev 0d9e4bbf45 Only shorten pubkeys if name is present 6 years ago
Maxim Shishmarev 08cab426c5 Shorten pubkeys in quotations too 6 years ago
sachaaaaa d3c3184405 Search returns primary device when looking up secondary pub key 6 years ago
Mikunj 0b898612d9 Linting. 6 years ago
Mikunj 0883b1b650 Updated styles.
Merge commit clearnet into mod-badges
6 years ago
Mikunj Varsani c48ae80468
Merge pull request #486 from Mikunj/profile-icons
Profile icons
6 years ago
Beaudan Brown e9a2b57d37 Show crown icon for moderators 6 years ago
Beaudan Brown 72b3d02b52 Poll for moderators, store them on the conversation and use the list to determine our own mod status 6 years ago
sachaaaaa 700c835782 Update ts/components/conversation/FriendRequest.md
Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>
6 years ago
sachaaaaa e5eab74b1b Fix #355 Display timestamp for friend requests 6 years ago
Mikunj 5dc52f0858 Fix incorrect hue shifting 6 years ago
Mikunj aa216d7a5d Added minor comment. 6 years ago
Mikunj a9189979e1 Added JazzIcon 6 years ago
Beaudan Brown 5247bc56b7 Address review 6 years ago
Beaudan Brown 870dc7f904 Fix tests, refactor menu items to please linter and lint 6 years ago
Beaudan Brown 66459ac4bd Remove most of the right click and cog menu options for the public chats 6 years ago
Beaudan Brown a2cda31f1a Remove delete option from more info 6 years ago
Beaudan Campbell-Brown 48b6bf54c1
Merge pull request #461 from Mikunj/qr-code
Pubkey QR code
6 years ago
Beaudan Campbell-Brown 3c6b374428
Merge pull request #424 from Mikunj/timestamp-fix
Don't show relative timestamp.
6 years ago
Mikunj 21dad58537 Linting. 6 years ago
Mikunj 3380500a2d Added QR code viewing. 6 years ago
Beaudan 616e952f8e Add right click option to public chat messages to copy pubkey of sender 6 years ago
Beaudan Campbell-Brown f4e76f0576
Merge pull request #455 from neuroscr/public-delete
Public delete
6 years ago
Beaudan Brown ba72f55b03 Fix missing react key error 6 years ago
Beaudan Brown 351fa09ad6 Only show delete option if have mod status and show different modal for mod deletion 6 years ago
Beaudan Brown e4ecc5b389 A prepare for message deletion 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
Beaudan Brown 662c64f347 Remove ability to delete some rss conversations 6 years ago
Ryan Tharp 9bd6b7a364 lint 6 years ago
Ryan Tharp a0e7ba252c strip style and improving stripping regex 6 years ago
Ryan Tharp c57571fdfd loki.network rss feed 6 years ago
Mikunj 92c3e19865 Don't show relative timestamp. 6 years ago
Beaudan fce4d0ce79 Review cleanup 6 years ago
Beaudan 86e55e5dc6 Clean up bold check 6 years ago
Beaudan 3ea3a394e7 Only bold the profile name for messages 6 years ago
Beaudan 958766dc65 Bold the profile name and truncate the pubkey 6 years ago
Beaudan 3a5e6e2fd3 Lint 6 years ago
Beaudan 1fc2173d9b Update header template to display group names properly and update migration to only store name for public chat 6 years ago
Beaudan 1d0067e6e5 Forgot to add this part 6 years ago
Maxim Shishmarev d0e73ed7f8 Add a button to paste pubkey from clipboard if valid 6 years ago
Beaudan 47ac247f83 Comment out the show all media button 6 years ago
Mikunj a8a959b326 Merge branch 'development' into signal-1.24 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
sachaaaaa ce4105f529 Fix node tests 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
Mikunj 3152f92e30 Merge signal 1.23.2
# Conflicts:
#	app/sql.js
#	js/conversation_controller.js
#	package.json
6 years ago
Mikunj 42c501e7f8 Merge v1.23.1
# Conflicts:
#	package.json
6 years ago
Mikunj 3a8111020e Merge v1.23.0
# Conflicts:
#	background.html
#	package.json
#	yarn.lock
6 years ago
Mikunj 7387e88c97 Add showing friends in search. 6 years ago
Mikunj 1f03e04d8c Merge commit 'c75a756b2a58bd4a79890e34673d95d9f17f3f01' into signal-1.23
# Conflicts:
#	js/views/conversation_view.js
#	package.json
#	ts/components/ConversationListItem.tsx
#	ts/components/conversation/ConversationHeader.tsx
6 years ago
Scott Nonnenberg fca40cb548 Disable keyboard shortcut for conversation archive 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
Mikunj 48c4ed1a29 Partial Merge commit 'bf904ddd129ceba8fa363ccf6d10ecd256c65f63' into signal-1.23
# Conflicts:
#	_locales/en/messages.json
#	app/sql.js
#	js/background.js
#	js/conversation_controller.js
#	js/models/conversations.js
#	js/views/inbox_view.js
#	main.js
6 years ago
Mikunj 57195017f9 Linting 6 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
6 years ago
Scott Nonnenberg 22f7a352f9 updateLastMessage: If we don't update last text, clear it 6 years ago
Scott Nonnenberg 0ffda78ecb Update libphonenumber dependency 6 years ago
Scott Nonnenberg 5a50786e7a Lint fixes 6 years ago
Scott Nonnenberg a450cdf528 Lint fixes for recent PRs 6 years ago
Derek Meer 7727dc093e Hides the "Hide menu bar" option on MacOS (#2903)
The "Hide menu bar" option is only applicable to Windows and some Linux distros,
where the menu bar is attached to the Signal window. Therefore, this commit
ensures that it doesn't show up on MacOS. It includes a setting,
isHideMenuBarSupported(), to control the option's appearance. This
commit also includes the tests to make sure isHideMenuBarSupported()
works correctly.

Fixes #2705
6 years ago
sha-265 3e16ea7b32 Add RTL support for author name in quote (#2594) 6 years ago
Buck Doyle 1a76f1dae3 Make manual emoji text entry case-insensitive (#2353) 6 years ago
Scott Nonnenberg eae7660074 Downgrade to electron-builder@20.39.0 due to windows install bug
https://github.com/electron-userland/electron-builder/issues/3813
6 years ago
Scott Nonnenberg c8ea2e9463 Download and install updates without the help of electron-updater 6 years ago
Scott Nonnenberg a2fca80759 Conversation.updateLastMessage: Properly clear timestamp/status 6 years ago
Scott Nonnenberg 81de5f9a76 Introduce CTRL-E shortcut for archiving a conversation 6 years ago
Scott Nonnenberg 613d0ddd12 Lint fixes 6 years ago
Scott Nonnenberg d251282da1 Upgrade electron-builder and electron-updater 6 years ago
Scott Nonnenberg 8833cd7de4 Skip URLs that include the @ symbol when generating links
Thanks to mcsim for the bug report.
6 years ago
Scott Nonnenberg c1b680eeb4 Skip URLs that include the @ symbol when generating links
Thanks to mcsim for the bug report.
6 years ago
Scott Nonnenberg 230c6dc284 Fix vertical sizing of left pane when switching inbox<->archive 6 years ago
Scott Nonnenberg 8c4d90df07 Send long text as an attachment instead of inline
Remove Android length warning

Handle incoming long message attachments

Show long download pending status in message bubble

Fix the width of the smallest spinner

Remove Android length warning from HTML templates
6 years ago
Scott Nonnenberg ba461eb44a Update electron-updater to fix its handling of node_module pkging 6 years ago
Scott Nonnenberg 1c48db7df0 Update electron-builder/updater to fix build error on MacOS 6 years ago
Scott Nonnenberg b3ac1373fa Move left pane entirely to React 6 years ago
Scott Nonnenberg bf904ddd12 On attachment save include date, include album index 6 years ago
Scott Nonnenberg 768007a269 Message Detail: Ensure that quotes are not clickable 6 years ago
Scott Nonnenberg e980e3cd22 Lint fixes 6 years ago
Scott Nonnenberg 6ffbc0ac06 Archive Conversation 6 years ago
Scott Nonnenberg d72f89d776 Render only visible conversations in left pane 6 years ago
Scott Nonnenberg 031b64a476 Disable full-text search until we can go to arbitrary messages 6 years ago
Scott Nonnenberg ae161c6cf6 Update to Electron 4.x 6 years ago
Scott Nonnenberg ae2db9f09a Improve handling for URLs composed of mixed character sets 6 years ago
Beaudan 14367620d9 lint 6 years ago
Beaudan d0d57ea8c7 Add more functionality to the conversation right click menu, add right click for messages, change some of the ways toasts/confirmation dialogs are created, auto focus text input for nickname, clean up some stuff 6 years ago
Beaudan df93c97b48 Added ability to delete contacts and destroy all sessions with them. Added right click menu to contacts/conversations in list which can block, delete messages and delete contact 6 years ago
Mikunj 9ac76e7e62 Linting 6 years ago
Mikunj 06be1da40d Added p2p message styling 6 years ago
Scott Nonnenberg d574c2a1e4 Lint fixes 6 years ago
Scott Nonnenberg ca0c0133e9 Lint fixes 6 years ago
Scott Nonnenberg e12e120355 Lint fixes 6 years ago
Scott Nonnenberg 3f8223ff48 Revert electron-builder upgrade due to bugs
This reverts commit 8a3acc6b7e
6 years ago
Scott Nonnenberg 9c540ab977 Add cache support to Signal Protocol Store 6 years ago
Scott Nonnenberg 1d2c3ae23c Download attachments in separate queue from message processing 6 years ago
Scott Nonnenberg a43a78731a Note to Self 6 years ago
sachaaaaa a0f67c22da Merge branch 'textsecure/master' into merge_1_21_0
* textsecure/master: (26 commits)
  v1.21.0
  v1.21.0-beta.4
  Dark Theme: Preserve blue background on app loading screen
  Localization updates
  Fix width of audio player when window is very narrow
  A number of small fixes for Link Previews
  Get rid of the white flash when the app starts up (#3083)
  v1.21.0-beta.3
  Lint fixes
  Introduce new language: NB
  Fail over to all numbers in retry if errors don't have numbers
  Use the proper method for pulling attachments off disk for retry
  Fix rendering bug with verified state in updateVerified()
  Update electron-builder and electron-updater
  Ensure that dialog pops up when permissions denied for voice note
  Lint fixes
  Large update to localization strings
  Link Previews
  Ensure that blocked messages are dropped even after sealed sender
  Don't linkify quoted message contents
  ...

# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	_locales/cs/messages.json
#	background.html
#	config/default.json
#	index.html
#	js/models/conversations.js
#	js/modules/web_api.js
#	js/settings_start.js
#	js/views/conversation_view.js
#	js/views/settings_view.js
#	package.json
#	protos/SignalService.proto
#	stylesheets/_index.scss
#	stylesheets/_settings.scss
6 years ago