Commit graph

208 commits

Author SHA1 Message Date
Maxim Shishmarev 4e39f1e0eb When composing: show mentions as profile names and treat them as indivisible elements 2019-09-30 16:50:22 +10:00
sachaaaaa a931b2491a Merge branch 'clearnet' into PR_file_server
* clearnet:
  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 reviews
  Custom message rendering of mentions
  lint and remove unneeded params
  modernize annotations since we're making a backward-incomp change
  sign and only show verified messages

# Conflicts:
#	js/modules/loki_public_chat_api.js
2019-09-25 13:49:10 +10:00
sachaaaaa b13a4f3e56
Merge pull request #520 from msgmaxim/mentions2
Custom message rendering of mentions
2019-09-25 11:42:12 +10:00
sachaaaaa 7756d4f0f3 Merge branch 'clearnet' into PR_file_server
* clearnet:
  fix method
  separate out new/open, more lint/cleanup
  separate out note to self
  create window.mixpanel here
  use window.mixpanel, remove eventEmitter
  allow mixpanel to be already set up elsewhere
  Address review comments
  Add missing file in tests
  Add UI elements for searching and selecting members in a group chat
  Desktop Analytics
  Replaced value with a descriptive constant.
  Add comment to fix up confusion.
  Keep a cache of the last 5 fetched messages for public chat so we can use it to detect duplicate messages.

# Conflicts:
#	js/background.js
#	js/modules/loki_public_chat_api.js
2019-09-24 13:50:41 +10:00
Maxim Shishmarev 687e9db77b Custom message rendering of mentions 2019-09-23 11:00:51 +10:00
Ryan Tharp 3150a6ce11 separate out new/open, more lint/cleanup 2019-09-19 20:18:03 -07:00
Ryan Tharp 587df45086 create window.mixpanel here 2019-09-19 20:03:15 -07:00
sachaaaaa e07f81c150 Add LokiFileServerAPI 2019-09-19 16:37:15 +10:00
Ryan Tharp 88b44390bf Desktop Analytics 2019-09-17 01:14:29 -07:00
Beaudan Brown 9beea2cbd3 Enforce curlies completely and lint with new settings 2019-09-05 11:48:10 +10:00
Mikunj 21dad58537 Linting. 2019-09-02 14:27: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
Ryan Tharp c57571fdfd loki.network rss feed 2019-08-23 11:11:23 +10:00
Beaudan 014558d939 Squash and clean of old PRs, move towards sending cleartext again 2019-08-08 14:56:52 +10:00
Beaudan Campbell-Brown 73b417e605
Merge pull request #371 from BeaudanBrown/testnet
Separate testnet
2019-08-07 14:45:57 +10:00
Beaudan 492bb3723a Move pubkey truncation to loki_rpc and add window function 2019-08-07 13:57:17 +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
Beaudan df2c4af67c Run lint and check for ip or address when removing unreachable nodes 2019-07-04 10:20:16 +10:00
Beaudan 87c5d0858c Choose a random seed node from a list for bootstrapping 2019-07-03 11:32:31 +10:00
sachaaaaa c53633e367 Clearnet p2p with https (no verification yet) 2019-06-28 12:09:46 +10:00
Beaudan d12f6b6d32 Handle swarm nodes the same for us or contacts, attach our key to message api object 2019-06-17 15:59:22 +10:00
Beaudan Campbell-Brown 971aef0c1b
Merge pull request #296 from BeaudanBrown/clearnet-seeds
Clearnet seeds
2019-06-12 11:19:34 +10:00
Beaudan Campbell-Brown 5c5155899e
Merge pull request #298 from BeaudanBrown/tls-fix
Have to put the tls setting here for some reason
2019-06-11 16:41:53 +10:00
Beaudan 6b2b9ce926 Remove default port and use port from storage server responses 2019-06-11 16:30:01 +10:00
Beaudan eea2b8e6a7 Do port null check inside rpc call 2019-06-11 16:29:04 +10:00
Beaudan 8d4bfc27c9 Have to put the tls setting here for some reason 2019-06-11 14:59:23 +10:00
Beaudan e520bf109a Persist PoW difficulty and update if get response from snodes 2019-06-03 13:37:34 +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 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
Beaudan 960bd3fff2 Move JobQueue to be a module so that we can use it in preload 2019-04-15 15:26:48 +10:00
Scott Nonnenberg 5a50786e7a Lint fixes 2019-04-10 12:14:32 -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
Beaudan 531ee92dcb Updated messenger to work with slightly different storage server API and changed swarm requests to go through storage server 2019-04-08 13:37:20 +10:00
Scott Nonnenberg c8ea2e9463 Download and install updates without the help of electron-updater 2019-04-05 17:18:37 -07:00
Scott Nonnenberg 7cfd3870d5 Escape XML delimiters for notifications on linux
Thanks to @whitequark for pointing out an inconsistency in the way that
some Linux desktop environments were displaying markup in notifications.
2019-03-18 16:30:53 -07:00
Beaudan 0d3c010cf7 I didn't realise there were 2 different windows between processes and I shouldn't have removed this 2019-03-04 12:36:19 +11: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 4714cafa6f
Merge pull request #238 from sachaaaaa/commit_hash_about
Show commit hash in About window for beta builds
2019-03-04 10:52:26 +11:00
sachaaaaa 37f0fced29 Show commit hash in About window for beta builds 2019-03-01 17:10:20 +11:00
Beaudan 5030ad4021 Made the slider label populate as well, plus removed redundant window function 2019-03-01 12:52:18 +11:00
sachaaaaa aa722590fa use channel encryption with storage server 2019-02-27 14:04:15 +11:00
Mikunj 75d0894104 Fixed files not included in release.
Moved node relevant stuff in libloki into its own modules folder.
2019-02-22 12:00:04 +11:00
Scott Nonnenberg ce9a52dde3 Remove unnecessary methods on window 2019-02-20 16:40:35 -08:00
Beaudan 6426a5eb9b Added ability to look up our .loki address and now send that with our LokiAddress messages 2019-02-14 13:09:04 +11:00
Beaudan 5d823de6f9 Renamed lokiSnodeAPI to start with lower case for consistency, refactor snode API to use conversation controller 2019-02-11 16:35:22 +11:00
Mikunj 725a41a8d7 Added link preview setting. 2019-02-08 14:58:31 +11:00
sachaaaaa f900a08eda
Merge pull request #177 from sachaaaaa/merge_1_21_0
Merge Signal 1.21.0
2019-02-07 10:08:50 +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
Beaudan 69ebf017ff Reworked loki_p2p_api to not use the window object, which means it needs to be instantiated after the storage is ready so that your pubkey can be passed in to the constructor. This makes it more modular and allows for easier testing 2019-02-06 10:26:25 +11:00