Commit graph

175 commits

Author SHA1 Message Date
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
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
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
Mikunj 3c07d99a89 Fix variable names.
Fix module export to be more consistent.
2019-01-31 11:30:26 +11:00
Beaudan 07076c27ae Moved friend status to window, added start of p2p api stuff 2019-01-31 10:24:34 +11:00
Beaudan b417edfc9b Added new protos for online broadcast messages, added db hits for getting friends, local server now instantiated on the window, now sending online broadcast messages when the local server starts 2019-01-31 10:24:34 +11: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 69f51021b6 Travis windows fixes. 2019-01-24 14:47:38 +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
Mikunj e08a63d078 Merge development into lint 2019-01-17 12:58:33 +11:00
Beaudan 7b1799c418 Big ol' hunk o' chunk. Now using random.snode to populate swarm lists, now making multiple requests from said lists and they are processed as they complete rather than waiting for all to resolve 2019-01-16 17:08:46 +11:00
Beaudan 37ba762312 First stuff for contacting specific nodes for each contact. Hard coded to hit the same bootstrap node for now plus doesn't handle unreachable nodes/errors well yet 2019-01-16 17:08:46 +11:00
Mikunj 6bd2d3962e Linted files 2019-01-16 16:18:08 +11:00
Mikunj 924c51d5c7 Removed min and max clamping in code.
This should be done UI and Server side instead.
2019-01-14 15:39:42 +11:00
Mikunj 87113b6cc1 Added message ttl setting storage 2019-01-11 15:59:44 +11:00
Scott Nonnenberg e4babdaef0 Updates to backup infrastructure 2019-01-04 12:21:26 -08:00
Mikunj 3690f4acda Added timeout argument to WorkerInterface. 2018-12-19 14:05:57 +11:00
Mikunj 654b0dac84 Merge signal-master. 2018-12-17 12:56:04 +11:00
Beaudan bb3ca610ff Cleaned up utilWorker spawning 2018-12-14 10:03:15 +11:00
Beaudan 6113f13d3a Rip the worker logic out of message_receiver and add the functionality for it to work with pow. Fix pow tests to work with those changes 2018-12-13 17:13:52 +11:00
Mikunj 26ba553e6a Added menu options to set, change and remove password. 2018-12-07 11:43:48 +11:00
Mikunj f53bec38a5 Added password inputs on registration screen.
Fix case where db is deleted but password hash still remains which causes user to never register.
Allow password to have symbols and other characters.
Added more tests.

Moved passHash from config into the sqlite db.
We can do this because we assume if sql failed to initialise then the key provided was wrong and thus we can show the user the password page.
2018-12-06 15:47:37 +11:00
Mikunj 1cb09cad2a Add header options. 2018-12-04 08:47:09 +11:00
Mikunj 961eb53915 Auto-generate profile images on conversations. 2018-12-03 08:55:43 +11:00
Scott Nonnenberg 8add0ac8a1
Enable CI and packaged builds with Electron v3 (#2939)
* Update spectron to fix linux CI runs

* Point test-release grunt task at release folder

* Ensure that build folders of socks/smart-buffer are in build

* AppVeyor: windows build output folder is now release

* Travis: Force build output to release directory
2018-11-27 16:20:48 -08:00
Beaudan bed9ce5be2 Added read receipt checkbox to the settings window which enables or disables the sending and receiving of read receipts 2018-11-22 16:49:15 +11:00
Mikunj 5f4a44ba8c Remove returning models from block/unblock.
lint fixes.
2018-11-20 11:36:44 +11:00
Mikunj dbb92aa9c8 Added i18n messages. 2018-11-19 16:22:17 +11:00
Mikunj ba390e354b Added unblocking.
Added styling.

Trigger changes on both conversation and messages when we block/unblock.
2018-11-19 16:08:01 +11:00
Mikunj 4d3fb17e61 Merge branch 'sig-development' into merge/signal 2018-11-14 15:06:46 +11:00
Beaudan 3aa135fdb4 Grabbing last hash from server response. only requesting messages after the lasthash. Keeping track of lasthash for array of nodes (currently hardcoded for one) 2018-11-14 13:09:33 +11:00
sachaaaaa ad1cf94526 ES2015 classes for LokiServer and FallBackSessionCipher 2018-11-13 15:03:06 +11:00
Scott Nonnenberg 6300256a3e Gracefully shut down database operations before app exit 2018-11-12 15:31:17 -08:00
Mikunj f589fdac5c Merge signal changes into branch. 2018-11-07 15:26:37 +11:00