oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity
6469 commits 5 branches 83 tags 171 MiB
Commit graph

598 commits

Author SHA1 Message Date
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.
 2019-11-28 10:02:20 +11:00
Audric Ackermann
9992a3da1d Add a showUserDetails modal to display user's details 
Relates #655
 2019-11-28 10:02:20 +11:00
Maxim Shishmarev
5a4ea93594
Merge pull request #653 from Bilb/clearnet 
Fix the conversation horizontal scrollbar when only few conversations #560
 2019-11-26 12:47:38 +11:00
Audric Ackermann
2c789c8b0e fix lint 2019-11-26 11:29:20 +11:00
Audric Ackermann
0b15fa467b Fix the conversation scrollbar when only few conversations #560 2019-11-26 11:18:51 +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
Maxim Shishmarev
2ab0d084f1
Merge pull request #645 from msgmaxim/group-invites 
Public chat invitations
 2019-11-25 16:29:02 +11:00
Beaudan Brown
a3d171884d Added ban user right click functionality 2019-11-25 15:58:25 +11:00
Ryan Tharp
6cde9aa263
Merge pull request #638 from neuroscr/multidevice-publicchat 
Public Chat - home server refactor / read public chat avatars from home server
 2019-11-24 20:23:04 -08: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
9d50c21b29
Merge pull request #635 from msgmaxim/context-menu-select 
Don't select messages when context menu is shown
 2019-11-22 13:52:53 +11:00
Ryan Tharp
f245007a8b convert findMember to async 2019-11-21 17:45:04 -08:00
Maxim Shishmarev
8cd8c8d4f9
Merge pull request #610 from msgmaxim/profile-pictures 
Enable custom profile pictures
 2019-11-21 12:53:16 +11:00
Maxim Shishmarev
e738e07d3e Add missing margin to typing indicator bubbles 2019-11-20 09:27:30 +11:00
Maxim Shishmarev
8b2876dadc Disable context menu and message selection for RSS feed 2019-11-19 16:32:03 +11:00
Maxim Shishmarev
2262b41cd7 Prevent hiding the context menu by clicking away to also potentially select messages 2019-11-19 13:51:01 +11:00
Maxim Shishmarev
2990c95e40 Fix incorrect margins for public messages and friend request bubbles 2019-11-19 10:35:47 +11:00
Maxim Shishmarev
4dd314c18f Enable profile pictures 2019-11-18 17:34:41 +11:00
Beaudan Brown
685ada5cc5 Merge branch 'clearnet' into prep-merge 2019-11-15 12:31:40 +11:00
sachaaaaa
ffd1667964 mainheader: call setstate only when needed for clipboard 2019-11-13 17:32:08 +11:00
sachaaaaa
006f817faa make linter happy 2019-11-13 16:51:58 +11:00
sachaaaaa
c9e3757381 dial the logging down a notch 2019-11-13 16:15:27 +11:00
Maxim Shishmarev
7c96990119 Correctly handle server errors in multi-deletion 2019-11-06 13:22:21 +11:00
Maxim Shishmarev
8677fb15a0 Select multiple messages and bulk deletion 2019-11-06 10:26:21 +11:00
Maxim Shishmarev
f4ed8b2bf3 Add a feature flag for private group chats 2019-11-01 12:43:01 +11:00
Maxim Shishmarev
395daf3aba Use Array.includes in place of Array.indexOf 2019-11-01 12:00:29 +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
f5e9a870f7 Add support for mentions in 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
Maxim Shishmarev
6c08852118
Merge pull request #593 from msgmaxim/not-friends 
Fix incorrectly showing friend request as pending
 2019-11-01 10:17:31 +11:00
sachaaaaa
65361d33f5 New menu item "show pairing words" for secondary devices 2019-10-31 18:18:07 +11:00
Maxim Shishmarev
e64ccbdd2b Clean up RSS conversation 2019-10-31 17:40:26 +11:00
Maxim Shishmarev
9e6f6d5a01 Fix incorrectly showing friend request as pending 2019-10-31 15:23:08 +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
d97eced37b Merge branch 'clearnet' into multi-device 2019-10-23 16:34:56 +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
Beaudan Brown
8d6fee4aec Merge branch 'clearnet' into multi-device 2019-10-08 09:24:55 +11:00
Maxim Shishmarev
8be1c61f4c Highlight conversations with unread mentions of the user 2019-10-02 16:18:45 +10:00
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
  ...
 2019-09-26 11:08:55 +10:00
sachaaaaa
b13a4f3e56
Merge pull request #520 from msgmaxim/mentions2 
Custom message rendering of mentions
 2019-09-25 11:42:12 +10:00
Maxim Shishmarev
16692696e0 address reviews 2019-09-24 11:39:16 +10:00
sachaaaaa
155a3b8f17
Merge pull request #512 from neuroscr/desktop-analytics 
Desktop Analytics
 2019-09-24 10:48:02 +10:00
Maxim Shishmarev
687e9db77b Custom message rendering of mentions 2019-09-23 11:00:51 +10:00
Maxim Shishmarev
1496a368e9 Add UI elements for searching and selecting members in a group chat 2019-09-18 10:08:16 +10:00
Ryan Tharp
88b44390bf Desktop Analytics 2019-09-17 01:14:29 -07:00
sachaaaaa
8ecf057386 Display list of paired device in modal 2019-09-16 18:15:43 +10:00
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
 2019-09-16 15:59:40 +10:00
Maxim Shishmarev
0d9e4bbf45 Only shorten pubkeys if name is present 2019-09-13 11:12:28 +10:00
Maxim Shishmarev
08cab426c5 Shorten pubkeys in quotations too 2019-09-12 17:25:05 +10:00
sachaaaaa
d3c3184405 Search returns primary device when looking up secondary pub key 2019-09-12 15:47:05 +10:00
Mikunj
0b898612d9 Linting. 2019-09-11 15:18:18 +10:00
Mikunj
0883b1b650 Updated styles. 
Merge commit clearnet into mod-badges
 2019-09-11 14:58:34 +10:00
Mikunj Varsani
c48ae80468
Merge pull request #486 from Mikunj/profile-icons 
Profile icons
 2019-09-11 14:02:35 +10:00
Beaudan Brown
e9a2b57d37 Show crown icon for moderators 2019-09-10 16:07:29 +10:00
Beaudan Brown
72b3d02b52 Poll for moderators, store them on the conversation and use the list to determine our own mod status 2019-09-10 12:57:57 +10:00
sachaaaaa
700c835782 Update ts/components/conversation/FriendRequest.md 
Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>
 2019-09-09 13:28:51 +10:00
sachaaaaa
e5eab74b1b Fix #355 Display timestamp for friend requests 2019-09-09 11:56:35 +10:00
Mikunj
5dc52f0858 Fix incorrect hue shifting 2019-09-06 13:18:26 +10:00
Mikunj
aa216d7a5d Added minor comment. 2019-09-05 15:28:00 +10:00
Mikunj
a9189979e1 Added JazzIcon 2019-09-05 15:24:58 +10:00
Beaudan Brown
5247bc56b7 Address review 2019-09-04 11:09:05 +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
Beaudan Brown
a2cda31f1a Remove delete option from more info 2019-09-02 16:56:34 +10:00
Beaudan Campbell-Brown
48b6bf54c1
Merge pull request #461 from Mikunj/qr-code 
Pubkey QR code
 2019-09-02 15:52:39 +10:00
Beaudan Campbell-Brown
3c6b374428
Merge pull request #424 from Mikunj/timestamp-fix 
Don't show relative timestamp.
 2019-09-02 15:27:22 +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
616e952f8e Add right click option to public chat messages to copy pubkey of sender 2019-09-02 10:49:50 +10:00
Beaudan Campbell-Brown
f4e76f0576
Merge pull request #455 from neuroscr/public-delete 
Public delete
 2019-09-02 10:47:04 +10:00
Beaudan Brown
ba72f55b03 Fix missing react key error 2019-08-30 16:40:05 +10:00
Beaudan Brown
351fa09ad6 Only show delete option if have mod status and show different modal for mod deletion 2019-08-30 15:02:17 +10:00
Beaudan Brown
e4ecc5b389 A prepare for message deletion 2019-08-30 15:01:16 +10:00
sachaaaaa
59e1bb48c1
Merge pull request #434 from sachaaaaa/fix_clipboard_redraws 
[multi-device] Fix main header being redrawn every 100ms
 2019-08-26 16:50:20 +10:00
sachaaaaa
4a35492fe0 Fix main header being redrawn every 100ms 2019-08-26 11:16:30 +10:00
sachaaaaa
b5aee4f4be Display "Pair New Device" in menu for non-secondary devices 2019-08-23 16:51:52 +10:00
Beaudan Brown
662c64f347 Remove ability to delete some rss conversations 2019-08-23 14:23:21 +10:00
Ryan Tharp
9bd6b7a364 lint 2019-08-23 11:12:16 +10:00
Ryan Tharp
a0e7ba252c strip style and improving stripping regex 2019-08-23 11:12:16 +10:00
Ryan Tharp
c57571fdfd loki.network rss feed 2019-08-23 11:11:23 +10:00
Mikunj
92c3e19865 Don't show relative timestamp. 2019-08-21 13:07:31 +10:00
Beaudan
fce4d0ce79 Review cleanup 2019-08-08 14:56:52 +10:00
Beaudan
86e55e5dc6 Clean up bold check 2019-08-08 14:56:52 +10:00
Beaudan
3ea3a394e7 Only bold the profile name for messages 2019-08-08 14:56:52 +10:00
Beaudan
958766dc65 Bold the profile name and truncate the pubkey 2019-08-08 14:56:52 +10:00
Beaudan
3a5e6e2fd3 Lint 2019-08-08 14:56:52 +10:00
Beaudan
1fc2173d9b Update header template to display group names properly and update migration to only store name for public chat 2019-08-08 14:56:52 +10:00
Beaudan
1d0067e6e5 Forgot to add this part 2019-08-08 14:56:52 +10:00
Maxim Shishmarev
d0e73ed7f8 Add a button to paste pubkey from clipboard if valid 2019-08-02 10:33:55 +10:00
Beaudan
47ac247f83 Comment out the show all media button 2019-06-14 15:32:09 +10:00
Mikunj
a8a959b326 Merge branch 'development' into signal-1.24 2019-04-26 11:32:10 +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
sachaaaaa
ce4105f529 Fix node tests 2019-04-24 12:10:25 +10:00
Mikunj
61b862b021 Merge signal 1.24.1 2019-04-18 13:27:54 +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
3152f92e30 Merge signal 1.23.2 
# Conflicts:
#	app/sql.js
#	js/conversation_controller.js
#	package.json
 2019-04-18 12:31:39 +10:00
Mikunj
42c501e7f8 Merge v1.23.1 
# Conflicts:
#	package.json
 2019-04-18 11:13:23 +10:00
Mikunj
3a8111020e Merge v1.23.0 
# Conflicts:
#	background.html
#	package.json
#	yarn.lock
 2019-04-18 11:12:02 +10:00
Mikunj
7387e88c97 Add showing friends in search. 2019-04-18 10:37:23 +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
Scott Nonnenberg
fca40cb548 Disable keyboard shortcut for conversation archive 2019-04-17 14:19:32 -07: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
57195017f9 Linting 2019-04-17 12:05:30 +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
22f7a352f9 updateLastMessage: If we don't update last text, clear it 2019-04-12 14:06:34 -07:00
Scott Nonnenberg
0ffda78ecb Update libphonenumber dependency 2019-04-11 18:01:28 -07:00
Scott Nonnenberg
5a50786e7a Lint fixes 2019-04-10 12:14:32 -07:00
Scott Nonnenberg
a450cdf528 Lint fixes for recent PRs 2019-04-08 11:30:19 -07:00
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
 2019-04-08 10:25:14 -07:00
sha-265
3e16ea7b32 Add RTL support for author name in quote (#2594) 2019-04-08 10:22:52 -07:00
Buck Doyle
1a76f1dae3 Make manual emoji text entry case-insensitive (#2353) 2019-04-08 09:57:21 -07:00
Scott Nonnenberg
eae7660074 Downgrade to electron-builder@20.39.0 due to windows install bug 
https://github.com/electron-userland/electron-builder/issues/3813
 2019-04-05 17:18:37 -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
a2fca80759 Conversation.updateLastMessage: Properly clear timestamp/status 2019-04-04 17:17:19 -07:00
Scott Nonnenberg
81de5f9a76 Introduce CTRL-E shortcut for archiving a conversation 2019-04-04 17:17:19 -07:00
Scott Nonnenberg
613d0ddd12 Lint fixes 2019-03-28 17:24:46 -07:00
Scott Nonnenberg
d251282da1 Upgrade electron-builder and electron-updater 2019-03-22 12:24:07 -07:00
Scott Nonnenberg
8833cd7de4 Skip URLs that include the @ symbol when generating links 
Thanks to mcsim for the bug report.
 2019-03-21 12:22:34 -07:00
Scott Nonnenberg
c1b680eeb4 Skip URLs that include the @ symbol when generating links 
Thanks to mcsim for the bug report.
 2019-03-20 13:53:54 -07:00
Scott Nonnenberg
230c6dc284 Fix vertical sizing of left pane when switching inbox<->archive 2019-03-14 17:30:46 -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
ba461eb44a Update electron-updater to fix its handling of node_module pkging 2019-03-12 19:45:02 -07:00
Scott Nonnenberg
1c48db7df0 Update electron-builder/updater to fix build error on MacOS 2019-03-12 18:49:22 -07:00
Scott Nonnenberg
b3ac1373fa Move left pane entirely to React 2019-03-12 17:44:14 -07:00
Scott Nonnenberg
bf904ddd12 On attachment save include date, include album index 2019-03-12 17:44:14 -07:00
Scott Nonnenberg
768007a269 Message Detail: Ensure that quotes are not clickable 2019-03-12 17:44:14 -07:00
Scott Nonnenberg
e980e3cd22 Lint fixes 2019-03-12 17:44:14 -07:00
Scott Nonnenberg
6ffbc0ac06 Archive Conversation 2019-03-12 17:44:14 -07:00
Scott Nonnenberg
d72f89d776 Render only visible conversations in left pane 2019-03-12 17:44:14 -07:00
Scott Nonnenberg
031b64a476 Disable full-text search until we can go to arbitrary messages 2019-03-12 17:44:14 -07:00
Scott Nonnenberg
ae161c6cf6 Update to Electron 4.x 2019-03-12 17:44:14 -07:00
Scott Nonnenberg
ae2db9f09a Improve handling for URLs composed of mixed character sets 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
Mikunj
9ac76e7e62 Linting 2019-02-22 10:22:03 +11:00
Mikunj
06be1da40d Added p2p message styling 2019-02-22 10:22:03 +11:00
Scott Nonnenberg
d574c2a1e4 Lint fixes 2019-02-20 16:51:30 -08:00
Scott Nonnenberg
ca0c0133e9 Lint fixes 2019-02-13 16:07:35 -08:00
Scott Nonnenberg
e12e120355 Lint fixes 2019-02-13 16:04:58 -08:00