Commit graph

302 commits

Author SHA1 Message Date
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
c8ea2e9463 Download and install updates without the help of electron-updater 2019-04-05 17:18:37 -07:00