Commit Graph

175 Commits

Author SHA1 Message Date
Vincent 53555c0133 Fixed wrt review @ Audric 2020-01-03 16:54:27 +11:00
Vincent 66911d6f06 Connect to server modal semi-complete 2019-12-30 13:09:52 +11:00
Vincent 659d4412bd QR code completion 2019-12-23 17:40:48 +11:00
Audric Ackermann 148210c390 lock dompurify in yarn.lock 2019-12-16 09:38:34 +11:00
Mikunj 6817d82b00 Upgrade electron-notarize 2019-11-14 11:28:47 +11:00
Mikunj 9a3aa2a5bc upgraded electron-builder. 2019-10-23 10:51:52 +11:00
Mikunj 1250d93252 Added electron-notarize 2019-10-23 09:24:56 +11:00
Ryan Tharp 88b44390bf Desktop Analytics 2019-09-17 01:14:29 -07:00
Mikunj 500a88dbab Removed identicon.js
Updated profile image helper.
2019-09-05 15:18:52 +10:00
Mikunj a89358676c Update electron-context-menu.
Only allow copying QR code since saving doesn't work.
2019-09-02 12:32:43 +10:00
sachaaaaa c53633e367 Clearnet p2p with https (no verification yet) 2019-06-28 12:09:46 +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 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 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 0ffda78ecb Update libphonenumber dependency 2019-04-11 18:01:28 -07:00
Gabe Stocco 851c1a0e47 Adding right click listener for URLs and Text Selections (#3197)
* Adds right-click listener

For urls and text selections

* Fixes build-release on windows

Should still be bash compatible too

* Update context menu line

Responding to feedback from @JaredPotter
2019-04-10 12:06: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 e15daf7a37 Update to Electron v4.1.2 to fix permissions issue
https://github.com/electron/electron/releases/tag/v4.1.2

Permissions issue: https://github.com/electron/electron/issues/17581
2019-03-28 17:23:09 -07:00
Scott Nonnenberg 065b58fb6b Update Electron to 4.1.1 2019-03-22 12:28:02 -07:00
Scott Nonnenberg d251282da1 Upgrade electron-builder and electron-updater 2019-03-22 12:24:07 -07:00
Scott Nonnenberg 81696b4b15 Update sqlcipher dependency to get win vc++ redistributable 2019-03-22 11:06:33 -07:00
Scott Nonnenberg b232d6289a Update react-contextmenu to avoid event handler issues un unload 2019-03-21 12:22:24 -07:00
Scott Nonnenberg 3b140d9b51 Update react-contextmenu to avoid event handler issues un unload 2019-03-20 13:43:24 -07:00
Scott Nonnenberg b0a3ef5d29 Update spellchecker to reenable spellcheck on linux w/electron v4 2019-03-18 16:46:56 -07:00
Scott Nonnenberg 6d8ab33e93 Update to Electron 4.0.8 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 d72f89d776 Render only visible conversations in left pane 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 Campbell-Brown 8e3542b511
Merge pull request #213 from sachaaaaa/channel_encryption
Hook up channel encryption
2019-03-04 12:19:34 +11:00
sachaaaaa ee8b9b7982 update react-contextmenu for bugfix 2019-02-28 14:09:37 +11:00
sachaaaaa 16b96f3d21 update yarn.lock 2019-02-27 14:04:15 +11:00
sachaaaaa e2abc0d510 Add channel encryption library with tests (not in used so far) 2019-02-15 16:09:02 +11:00
Scott Nonnenberg 3f8223ff48 Revert electron-builder upgrade due to bugs
This reverts commit 8a3acc6b7e
2019-02-13 16:04:58 -08: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 8a3acc6b7e Update electron-builder and electron-updater 2019-01-29 13:53:14 -08:00
Scott Nonnenberg 813924685e Link Previews 2019-01-29 13:53:14 -08:00
Mikunj Varsani b226feaac7
Merge pull request #148 from Mikunj/signal-1.20
Signal 1.20
2019-01-25 10:13:08 +11:00
Mikunj 1a15ec9c15 Merge commit signal/master into signal-1.20 2019-01-22 13:54:03 +11:00
Mikunj 8c9b1a7a7a Added loki server.
Added test.
2019-01-21 15:23:20 +11:00