Commit graph

764 commits

Author SHA1 Message Date
Audric Ackermann fa853538d0
LINT after prettier upgrade 2020-05-29 16:25:15 +10:00
Vincent fe7b22dbc3 Groups not friends 2020-05-28 16:26:54 +10:00
Vincent 07e7afeb31 Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into lns-map 2020-05-28 15:40:55 +10:00
Audric Ackermann 12b396ce7e
add option to send a message to a single device, or to all device except one 2020-05-27 16:10:12 +10:00
Audric Ackermann f46c885fdf
merge fix-closed-group to clearnet 2020-05-15 12:53:49 +10:00
Vincent 8a80ccc044 Merge branch 'contacts-sorting' of https://github.com/vincentbavitz/session-desktop into contacts-sorting 2020-05-07 16:47:22 +10:00
Vincent 711112d076 Remove channels 2020-05-07 13:51:39 +10:00
Vincent 1fa7ee25f7 leftpane settings 2020-04-30 17:39:58 +10:00
Vincent cf05d4ff6c revivify 2020-04-24 12:18:43 +10:00
Vincent 2fde4d7e80 messages.json fixup 2020-04-22 17:19:29 +10:00
Vincent 99200bb725 Message unsendability 2020-04-07 16:43:53 +10:00
Vincent 6cda163b27 upgrade typescript 2020-04-06 13:36:15 +10:00
Audric Ackermann 0d0439cacc
Merge pull request #1020 from Bilb/spell-check-fixes
fix spell checker using the electron one
2020-03-30 16:16:37 +11:00
Audric Ackermann 9afee14749
Merge pull request #1022 from vincentbavitz/notifications-icon-numeration
Notifications icon numeration
2020-03-30 16:02:15 +11:00
Vincent 85c9576b45 fractional centering 2020-03-30 07:38:43 +11:00
Audric Ackermann 9ff16d7e60
move to electron spellchecker 2020-03-27 17:25:59 +11:00
Vincent 8d1fec36b7 final ref 2020-03-27 14:59:13 +11:00
Vincent 1a3ecf10df Device pairing copy 2020-03-27 14:33:37 +11:00
Audric Ackermann c81fca5d90
disnle link option on secondary device 2020-03-26 15:46:54 +11:00
Vincent c7c72e50bb lint 2020-03-25 14:46:14 +11:00
Vincent d6a48b9f6d Password paste 2020-03-25 14:16:45 +11:00
Vincent d8a12aab0f conv tinkering 2020-03-25 10:01:36 +11:00
Audric Ackermann b3d895caf3
Toast on device pairing request received but in device pairing mode 2020-03-23 14:50:48 +11:00
Vincent 9a6aafe99c Pull from clearnet 2020-03-13 11:44:00 +11:00
Vincent 7235ccff88 Emoji quick styling 2020-03-13 11:10:27 +11:00
Mikunj d10a8f0a6f Added setting to disable checking for auto updates. 2020-03-10 14:22:07 +11:00
Mikunj 9e9b2a12d6 Fix translations 2020-03-05 15:39:43 +11:00
Mikunj 4eef73c0a2 Converted updating into a 2 step process.
First it will ask the user about downloading the new update.
Then it will download the update and ask the user to restart the application.

This was done so that if the company was forced to put out comprimised binaries, all our users won't be automatically updated to them.
2020-03-05 15:39:43 +11:00
Vincent 2dc5885c88 Microphone timer 2020-03-05 10:43:48 +11:00
Vincent 74142fab28 Waveform dividing across fullwidth 2020-03-03 15:07:48 +11:00
Vince 67e3846787
Merge pull request #905 from jian10au/scaleslider
Zoom factor slider
2020-03-02 11:48:43 +11:00
Audric Ackermann 370467a127
Merge pull request #878 from Bilb/group-profile-image
Group profile image upload
2020-02-27 04:43:48 +00:00
Ryan Tharp 33f820120c
Merge pull request #922 from neuroscr/update
convert more Signal references to Session
2020-02-25 15:37:11 -08:00
Ryan Tharp 8e0f280724 convert more Signal references to Session 2020-02-24 15:41:09 -08:00
Brian Jian Zhao a80c6e30e2 add slider title to message.json 2020-02-21 10:53:57 +11:00
Audric Ackermann 15738c3525
display continue session signin with seed 2020-02-20 13:14:12 +11:00
Audric Ackermann e0ff1755ac
lint 2020-02-20 09:24:07 +11:00
Audric Ackermann 790085bea1
disable profile image upload for closed group 2020-02-19 16:24:55 +11:00
Audric Ackermann 6d5aed7de8
make upload of group picture work 2020-02-19 11:27:42 +11:00
Audric Ackermann b4f1afe720
do not add new members if closed group size >= 10 2020-02-17 11:09:09 +11:00
Audric Ackermann b4c3dad4c9
show errors on closed group creation with invalid name or members 2020-02-17 10:52:14 +11:00
Audric Ackermann a67a409150
Merge pull request #842 from Bilb/clearnet
separate update group name and group members dialog (add and remove m…
2020-02-14 03:55:20 +00:00
Vincent 513e5e34df Styles 2020-02-14 14:12:03 +11:00
Vincent 4d65fe76ab Updating tos & privacy links 2020-02-14 11:41:59 +11:00
Audric Ackermann ff10637a5a
separate update group name and group members dialog
(add and remove members are separated)
2020-02-13 16:21:52 +11:00
Vincent 30ccb81d3d Disappearing messages in Channel Settings panel 2020-02-13 15:35:09 +11:00
Vincent d288c7bd03 secretPrompt fix 2020-02-12 17:40:56 +11:00
Vincent 582bc71b99 Contacts section reformatting 2020-02-12 15:50:23 +11:00
Mikunj Varsani beb4cdbed8 Closed group fixes. (#816)
* Fix group updates not syning

* Fix leaving closed groups

* Fix incorrect members being shown on create group dialog

* Linting

* Fix create closed group showing our own conversation
2020-02-10 15:03:34 +11:00
Mikunj Varsani 21e982e5c2 Fix open group joining. 2020-02-06 11:58:37 +11:00
Ryan Tharp 8aa7682bc4 Merge branch 'clearnet' of https://github.com/loki-project/loki-messenger into tls-fix 2020-02-05 03:45:22 -08:00
Ryan Tharp 2486cc7eb2 Catch a stray loki messenger 2020-02-05 02:51:58 -08:00
Ryan Tharp c696b37edd not designed to have a period at the end of titleIsNow 2020-02-05 02:35:15 -08:00
Vincent 821cf00b65 Closed group update message stylgin 2020-02-05 14:19:01 +11:00
Vincent b341ceaf76 Closed group joining completed w/o backend 2020-02-05 11:12:50 +11:00
Vincent 4fd2126fbe Fileserver update 2020-02-05 10:08:55 +11:00
Vincent 250a3ad6c1 Closed groups overlay integration 2020-02-05 09:59:55 +11:00
Maxim Shishmarev a3aa104f00 Remove more references to signal.org 2020-02-04 16:25:47 +11:00
Ryan Tharp e16cafb7d6 lint 2020-02-03 18:58:42 -08:00
Vincent de4edf9252 CLosed groups ui initial listprops 2020-02-04 11:55:01 +11:00
Vince 5bbd136493
Merge pull request #758 from neuroscr/version-check
Version check, de-signal.org-ification
2020-02-03 17:11:17 +11:00
Vincent c0a33a630f Join channel generalisation 2020-02-03 15:50:38 +11:00
Vincent 4350b73724 Messages.json amendments 2020-02-03 14:23:48 +11:00
Vincent cb417d3665 Link preview warning on setting toggle 2020-02-03 14:20:18 +11:00
Vincent 2d4bf2b3e2 Complete conditional message onboarding 2020-02-03 11:49:04 +11:00
Vincent 156f0d4127 various touchups 2020-01-31 14:47:30 +11:00
Vincent bd034df8db linter 2020-01-31 13:47:19 +11:00
Vincent aeb04a3a44 onboarding messageview 2020-01-31 13:31:25 +11:00
Audric Ackermann cc1451fae8
Merge pull request #761 from Bilb/fix-session-header-name
fix header sessions message section
2020-01-30 03:31:43 +00:00
Vincent 9dcc851ebd Updated all icon references 2020-01-30 14:19:07 +11:00
Vincent cf46548761 Simplification of keyup 2020-01-30 13:24:20 +11:00
Audric Ackermann 2e1cc7bddb
fix header sessions message section 2020-01-30 10:47:37 +11:00
Vincent b69b8bffbd conflict resolution 2020-01-30 09:40:37 +11:00
Vincent 0a6a035750 Constants rework 2020-01-30 09:34:24 +11:00
Ryan Tharp 3c120f5071 designalify 2020-01-29 02:53:29 -08:00
Vince 6515487a48
Update messages.json 2020-01-29 12:49:10 +11:00
Audric Ackermann 7867f4dceb
Merge branch 'clearnet' into brand-redesign 2020-01-29 11:55:26 +11:00
Vincent e73c4e5301 Resolving Bilb revisions 2020-01-28 16:51:27 +11:00
Vincent 4a7e2dece7 Password lock screen and delete data screen 2020-01-28 16:43:39 +11:00
Audric Ackermann 191c3b1f54
add back typing indicator and read receipt setting under privacy 2020-01-28 16:00:14 +11:00
Vincent 4a6ed12992 Solidification of minor changes w appview injections 2020-01-28 09:39:58 +11:00
Vincent 4d690768a6 Scrolling button updated and animations to modals 2020-01-24 15:24:27 +11:00
Vincent a0a5a61b29 Various changes suggested by redesign overview 2020-01-24 14:16:33 +11:00
Vincent 3dd18a0c9c Profile picture upload, fixes and copy 2020-01-24 12:26:15 +11:00
Audric Ackermann d13efafad2
"Leave {Closed|Open} Group" button depending on group opened 2020-01-23 15:31:12 +11:00
Audric Ackermann 293eca0509 Merge branch 'brand-redesign' into clearnet 2020-01-22 17:59:08 +11:00
Vincent 56b1bcac01 Partial copy updates 2020-01-22 17:17:15 +11:00
Vincent c369b0c553 Edit user profile complete 2020-01-22 14:09:34 +11:00
Vincent a1a582d7ea Session branding fixes 2020-01-21 15:18:05 +11:00
Vincent 5fbbdc33c3 Signal branding 2020-01-21 14:59:18 +11:00
Audric Ackermann 25344685a2 merge 2020-01-21 14:49:14 +11:00
Vincent 79aa9c65a2 Merge branch 'brand-redesign' of https://github.com/loki-project/loki-messenger into brand-redesign 2020-01-21 13:23:28 +11:00
Vince 989f09e472
Merge branch 'brand-redesign' into brand-redesign 2020-01-21 12:12:14 +10:00
Audric Ackermann cf6b09e7ef add same link for terms and conditions than privacy policy 2020-01-21 11:22:13 +11:00
Vincent 69dc15ad70 Settings lock view; logic WIP 2020-01-21 11:17:45 +11:00
Audric Ackermann 411b343e6a add unpairing of device from settings 2020-01-21 10:32:27 +11:00
Audric Ackermann 4d950f859b add back link device in settings in a dialog 2020-01-21 10:11:50 +11:00
Vincent d0a8b933e9 Add friends to server Session'isation 2020-01-20 15:40:24 +11:00
Vincent 010cf045cb optimisation of ternary & binary expr. 2020-01-20 14:36:46 +11:00
Vincent e065cc404f Password set, change and remove complete 2020-01-20 14:10:28 +11:00
Vincent 35d59c75eb Password set, change and remove complete 2020-01-20 14:10:22 +11:00
Vincent a64a34edcb Disclaimer modal and settings view cleanup 2020-01-16 14:13:46 +11:00
Audric Ackermann ddaf62a499 add group settings page with media downladable and docs only 2020-01-16 11:27:29 +11:00
Audric Ackermann 902e678a64 fix lint 2020-01-16 11:27:29 +11:00
Audric Ackermann c44437f62c add channel section and refactor closableOverlay 2020-01-16 11:26:25 +11:00
Audric Ackermann 94ae4127b5 add link to our privacy policy 2020-01-16 11:17:59 +11:00
Audric Ackermann 84c315449f show nb of members on group chat when members.length>0 2020-01-16 11:17:06 +11:00
Audric Ackermann b49e85ad08 add the you have friend request title on contact section 2020-01-16 11:01:20 +11:00
Audric Ackermann 214679dece add registration errors show to user 2020-01-16 11:01:20 +11:00
Vincent d217c76647 mergable settingsview 2020-01-15 13:49:07 +11:00
Vincent b0658ba7ed settings toggling abstraction 2020-01-15 12:26:14 +11:00
Vincent 5360968a91 Add public server modal to message pane 2020-01-13 16:10:19 +11:00
Vincent e7d3bc6d35 Settings view modals and categories 2020-01-08 17:21:39 +11:00
Vincent 589f77a85f Completed left panel for settings 2020-01-07 17:47:48 +11:00
Vincent 74fd0159eb Fix conflicts 2020-01-07 12:41:14 +11:00
Vincent dff4523efa Cleanups 2020-01-07 10:32:54 +11:00
Vincent 2d01275ede QR Code responds to theme changes 2020-01-07 10:19:44 +11:00
Vincent 7b6e28eaab Keyboard navigation wrt Modals 2020-01-06 16:08:22 +11:00
Vincent 2ede557a74 Modal additions incl. QR fixup and Seed View 2020-01-06 15:46:49 +11:00
Vincent 2caffa9289 Dependencies resorted and modal adjustments 2020-01-06 09:30:29 +11:00
Audric Ackermann c9000c3f26 add the accept/decline buttons on friend requests in conversationslist 2020-01-03 17:07:41 +11:00
Audric Ackermann af22bd7b33 add the leftpane overlay as reusable from subsections 2020-01-03 17:07:40 +11:00
Audric Ackermann 571af6c654 add contact section bottom buttons and empty list 2020-01-03 17:07:40 +11:00
Audric Ackermann 1bbb3cedd4 render header from static method in LeftPane.tsx to be reused on subsection 2020-01-03 17:07:40 +11:00
Audric Ackermann 28a27711e1 work on compose view 2020-01-03 17:07:40 +11:00
Audric Ackermann 98be71680d add session h1 h2 and h3 2020-01-03 17:06:58 +11:00
Audric Ackermann e3a0d15890 add showcompose on showcompose click 2020-01-03 17:06:58 +11:00
Audric Ackermann 6cc7ef4962 correct typo 2020-01-03 17:06:58 +11:00
Audric Ackermann 7ba85921b1 replace loki with session on loading screens 2020-01-03 17:06:58 +11:00
Audric Ackermann bd3a4c5b19 addd placeholder in conversation search input 2020-01-03 17:04:53 +11:00
Audric Ackermann 225f002648 add conversations with working search on leftpanel 2020-01-03 17:03:02 +11:00
Vincent 8074756dc2 Infinte duration toasts 2020-01-03 11:48:55 +11:00
Vincent 6ee5d041fb Finishing up some modals 2019-12-30 17:38:28 +11:00
Vincent 66911d6f06 Connect to server modal semi-complete 2019-12-30 13:09:52 +11:00
Vincent 648cc2339c Working with deps 2019-12-27 17:55:28 +11:00
Vincent 659d4412bd QR code completion 2019-12-23 17:40:48 +11:00
Vincent 2419272608 Updated React dialogs to SessionModals 2019-12-23 09:44:18 +11:00
Vincent 8aac656107 Modals finished. Need to xfer all to React 2019-12-20 16:08:57 +11:00
Vincent d0d5012e07 Fixed breaking sessionToggle issues 2019-12-18 17:48:37 +11:00
Audric Ackermann cca4b51c8f remove showSubtitle option on registration page 2019-12-16 11:27:27 +11:00
Audric Ackermann 49d5106b56 validate form registration on enter press 2019-12-16 09:38:34 +11:00
Audric Ackermann 818cfc6dd3 make display name mandatory (remove optional string) 2019-12-16 09:38:34 +11:00
Audric Ackermann d5b8436f4d integrate dangerouslySetInnerHTML into custom components and sanityze it before rendering 2019-12-16 09:38:34 +11:00
Audric Ackermann d6913c4819 do not localize registration strings which cannot be easily made
begin your session
ensuring peace of mind
and terms and conditions
are all static english code because otherwise we would need to use
dangerouslySetHtml
2019-12-16 09:37:32 +11:00
Audric Ackermann 291e3b48a0 add i18n translation and use them in the app 2019-12-16 09:37:31 +11:00
Vincent 2bdc0579c3 Message deletion moderator check and toast. 2019-12-13 10:09:22 +11:00
Vincent fc235d6057 Completed message selection 2019-12-11 17:48:54 +11:00
Ryan Tharp c794ecea7a new add/remove moderation dialog messages 2019-12-10 00:18:01 -08:00
Ryan Tharp 549e3b4516
Merge branch 'clearnet' into multidevice-publicchat 2019-12-06 13:56:25 -08:00
Maxim Shishmarev 5123fa0409
Merge pull request #669 from msgmaxim/restoration
Prompting the user to reset session on invalid ciphertext
2019-12-05 10:06:48 +11:00
vincentbavitz 449eb8536b System clock (#677)
* Show toast when client clock is out of sync

* Fixed syntactical misarrangements

* Simplify getServerTime method

* Futher simplify getServerTime method

* Update js/modules/loki_app_dot_net_api.js

Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>

* Update js/modules/loki_app_dot_net_api.js

Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>

* Update loki_app_dot_net_api.js

Use cached timestamp value

* Update preload.js

Update some values to function scope

* Updated syntax

* Semifinal changes

* Improved efficiency and eliminated need for restart on clock update

* Remove await and immediately invoked function
2019-12-04 16:07:20 +11:00
Ryan Tharp 29090ad80a add updatePublicGroupDialogTitle and strip trailing whitespace 2019-12-03 02:34:26 -08:00
vincentbavitz 2e83881373
Merge pull request #652 from vincentbavitz/public-ban
Public ban
2019-11-29 10:12:14 +11:00
Maxim Shishmarev 81bfa90943 Prompting the user to reset session on invalid ciphertext 2019-11-28 14:05:11 +11:00
Maxim Shishmarev 07c39523e9 Show appropriate message in group invitation dialog on no friends 2019-11-25 17:29:07 +11:00
Beaudan Brown 43a91ab672 Linted 2019-11-25 16:34:52 +11:00
Beaudan Brown bee5a89f14 Show toast on user ban 2019-11-25 16:30:34 +11:00
Beaudan Brown 4581a20260 Add new string i18n stuff 2019-11-25 15:35:13 +11:00
Maxim Shishmarev 89e5e919f2 Address more review comments 2019-11-25 12:02:03 +11:00
Maxim Shishmarev a5fce17d8c public chat invitations 2019-11-22 16:16:43 +11:00
Maxim Shishmarev 4dd314c18f Enable profile pictures 2019-11-18 17:34:41 +11:00
sachaaaaa 5e27be9598 Change auto accept message 2019-11-18 12:05:21 +11:00
Beaudan Brown 685ada5cc5 Merge branch 'clearnet' into prep-merge 2019-11-15 12:31:40 +11:00
Beaudan Brown c168e34adf Update multi device string to match mobile 2019-11-15 11:36:15 +11:00
sachaaaaa cd2c4b993a lint 2019-11-06 13:22:01 +11:00
sachaaaaa 497f42165a Allow unpairing device 2019-11-06 10:52:34 +11:00
Maxim Shishmarev 8677fb15a0 Select multiple messages and bulk deletion 2019-11-06 10:26:21 +11:00
sachaaaaa 13572c3524
Merge branch 'multi-device' into paired_device_alias 2019-11-06 10:08:59 +11:00
sachaaaaa b324421534 Allow primary device to assign local aliases to paired devices 2019-11-01 16:18:30 +11:00
Maxim Shishmarev a2f836c690 Address review comments 2019-11-01 12:00:29 +11:00
Maxim Shishmarev 7c05939f55 Add group admins and the ability to remove members from private groups 2019-11-01 12:00:29 +11:00
Maxim Shishmarev 0df5214979 Limit small private groups to 10 members 2019-11-01 12:00:29 +11:00
Maxim Shishmarev 0490e5c668 Clean up conversation options for groups 2019-11-01 12:00:29 +11:00
Maxim Shishmarev 9f81f67460 Can leave private group chats 2019-11-01 12:00:29 +11:00
Maxim Shishmarev 90f1d4a6aa Display error messages when creating/updating group chats 2019-11-01 12:00:29 +11:00
Maxim Shishmarev cf18572049 Adding new group members; establishing sessions between non-friends 2019-11-01 11:57:49 +11:00
Maxim Shishmarev 0d19b708f9 Creating private group chats between friends 2019-11-01 11:57:49 +11:00
sachaaaaa 65361d33f5 New menu item "show pairing words" for secondary devices 2019-10-31 18:18:07 +11:00
Maxim Shishmarev 9e6f6d5a01 Fix incorrectly showing friend request as pending 2019-10-31 15:23:08 +11:00
Beaudan Brown 883feb668d The rest of my multidevice work, send messages to all the correct devices and automatic friend request if not friends with a device 2019-10-28 16:48:06 +11:00
Beaudan Brown 1b3f56dfd3 Update change nickname message 2019-10-28 13:56:09 +11:00
Beaudan Brown 08ad913105 Add explicit isSecondary flag to conversation list items so they can remain hidden in the menu after they become friends etc 2019-10-28 12:17:21 +11:00
Beaudan Brown 2f52995e18 Fix the delete messages button to not break the conversation 2019-10-25 12:06:39 +11:00
Beaudan Brown d97eced37b Merge branch 'clearnet' into multi-device 2019-10-23 16:34:56 +11:00
Beaudan Brown a3635216db Enable sending audio recordings 2019-10-23 15:00:14 +11:00
Beaudan Brown 49fcb50d48 Update link preview settings to be cleaner 2019-10-23 14:55:34 +11:00
Mikunj 3ba71fad9e Linting. 2019-10-23 09:31:36 +11:00
Beaudan Brown 5e1e70ac8c Enable link previews by default 2019-10-22 15:23:59 +11:00
Beaudan Campbell-Brown c9b11814a6
Merge pull request #567 from BeaudanBrown/name-restriction
Display name restrictions 2
2019-10-22 13:35:58 +11:00
Beaudan Brown 602ec1ccaf Also block displayname characters in the edit display name menu and change spaces to underscores 2019-10-22 13:15:58 +11:00
Beaudan Brown 5d2f7ddb20 Add messages needed for UI, bit of house work 2019-10-09 14:51:12 +11:00
Beaudan Brown 39fac5fd02 Add initial add server UI skeleton 2019-10-09 14:06:57 +11:00
sachaaaaa 8ecf057386 Display list of paired device in modal 2019-09-16 18:15:43 +10:00
Beaudan Brown 870dc7f904 Fix tests, refactor menu items to please linter and lint 2019-09-04 10:58:32 +10:00
Beaudan Brown 66459ac4bd Remove most of the right click and cog menu options for the public chats 2019-09-03 17:53:19 +10:00
Mikunj 21dad58537 Linting. 2019-09-02 14:27:52 +10:00
Mikunj 3380500a2d Added QR code viewing. 2019-09-02 11:31:07 +10:00
Beaudan Brown e4ecc5b389 A prepare for message deletion 2019-08-30 15:01:16 +10:00
Maxim Shishmarev cdd374a4b2 Add a toggle option for typing indicators; use short ttl for them 2019-08-06 11:57:45 +10:00
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
2019-04-24 13:25:20 +10:00
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
2019-04-18 12:45:19 +10:00
Mikunj 3a8111020e Merge v1.23.0
# Conflicts:
#	background.html
#	package.json
#	yarn.lock
2019-04-18 11:12:02 +10:00
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
2019-04-18 10:13:49 +10:00
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
2019-04-17 16:42:09 +10:00
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
2019-04-17 13:47:17 +10:00
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
2019-04-17 11:59:54 +10:00
Scott Nonnenberg b31fbcaa17 Don't send if message body is too long 2019-04-16 14:35:16 -07:00
Mikunj 40ab727b12 Linting 2019-04-15 10:42:29 +10:00
Mikunj b2ecb87462 Review fixes 2019-04-15 10:31:19 +10:00
Mikunj c7130a3bbb Added password confirmation dialog before showing seeds. 2019-04-12 14:48:15 +10:00
Scott Nonnenberg 2beee8da09 Update strings for 45 languages 2019-04-08 14:16:09 -07:00
Scott Nonnenberg c8ea2e9463 Download and install updates without the help of electron-updater 2019-04-05 17:18:37 -07:00
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
2019-03-14 17:30:46 -07:00
Scott Nonnenberg 42041d955c Fix typo in 'move to inbox' string 2019-03-13 09:15:03 -07:00
Scott Nonnenberg b3ac1373fa Move left pane entirely to React 2019-03-12 17:44:14 -07:00
Scott Nonnenberg 601ad3773c Update strings for sixteen languages 2019-03-12 17:44:14 -07:00
Scott Nonnenberg 6ffbc0ac06 Archive Conversation 2019-03-12 17:44:14 -07:00
Scott Nonnenberg ae161c6cf6 Update to Electron 4.x 2019-03-12 17:44:14 -07:00
Beaudan 14367620d9 lint 2019-03-12 11:36:32 +11:00
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 2019-03-12 11:10:50 +11:00
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 2019-03-07 17:10:33 +11:00
sachaaaaa b39b45e29d Fix #214 Replace help menu links 2019-03-01 14:44:16 +11:00
Scott Nonnenberg 5165eb3bd4 On database error: show popup, allow user to delete and relaunch 2019-02-20 16:51:30 -08:00
Scott Nonnenberg 5ea8f73f10 Localization updates 2019-02-13 16:53:39 -08:00
Scott Nonnenberg a43a78731a Note to Self 2019-02-12 16:08:51 -08:00
Mikunj a1e4b740f2 Fixed up settings view.
Fix review issues.
2019-02-08 16:03:15 +11:00
Mikunj 725a41a8d7 Added link preview setting. 2019-02-08 14:58:31 +11:00
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
2019-02-06 13:53:20 +11:00
Scott Nonnenberg 8654d80973 Localization updates 2019-02-05 13:55:55 -08:00
Scott Nonnenberg 0d7480bd92 A number of small fixes for Link Previews 2019-02-05 13:55:55 -08:00
Scott Nonnenberg 425e45e17a Introduce new language: NB 2019-01-29 16:08:03 -08:00
Scott Nonnenberg 160d9f640b Large update to localization strings 2019-01-29 13:53:14 -08:00
Scott Nonnenberg 813924685e Link Previews 2019-01-29 13:53:14 -08:00
Mikunj 5ad4532779 Fixed up delete message. 2019-01-29 13:57:17 +11:00
Mikunj ac59e1249f Added db resetting.
Use built in signal warning view.
2019-01-29 12:57:24 +11:00
Mikunj 1a15ec9c15 Merge commit signal/master into signal-1.20 2019-01-22 13:54:03 +11:00
Scott Nonnenberg 0ba25ff8d5 Multiple images can now be selected in file chooser and drag/drop 2019-01-17 10:17:10 -08:00
Scott Nonnenberg 1e4b562922 Multiple images can now be selected in file chooser and drag/drop 2019-01-16 10:32:57 -08:00
Mikunj 6bd2d3962e Linted files 2019-01-16 16:18:08 +11:00
Beaudan Campbell-Brown c1dfd400f5
Merge pull request #131 from Mikunj/ttl-setting
Added TTL to settings.
2019-01-16 15:22:56 +11:00
Mikunj 6467b0bb45 Fix up tests. 2019-01-16 12:38:29 +11:00
Mikunj 1f10a73e4f Updated strings. 2019-01-16 11:30:09 +11:00
Scott Nonnenberg 0de54e125c Improve caption editor usability, new 'add attachment' affordance 2019-01-15 10:51:49 -08:00
Scott Nonnenberg aab2a57b48 Some style and interaction fine-tuning 2019-01-14 17:40:31 -08:00
Mikunj 24455fc8b7 Updated TTL to use slider. 2019-01-14 12:41:25 +11:00
Mikunj 235dbb2176 Added display of message ttl in settings.
Fixed setting message ttl.
2019-01-14 09:46:31 +11:00
Scott Nonnenberg f9ea7be61f Reintroduce single attachment limit 2019-01-04 12:25:48 -08:00
Scott Nonnenberg 985b1d6aa6 New staged attachments UI, multiple image attachments per message 2019-01-04 12:21:26 -08:00
Mikunj 654b0dac84 Merge signal-master. 2018-12-17 12:56:04 +11:00
Mikunj f92cc6cbd4 Added menu option to view seed. 2018-12-12 11:27:47 +11:00