Commit Graph

177 Commits (986d34bbd93e104e72bebbad921609c78865acc1)

Author SHA1 Message Date
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
6 years ago
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
6 years ago
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
6 years ago
Beaudan 531ee92dcb Updated messenger to work with slightly different storage server API and changed swarm requests to go through storage server 6 years ago
Scott Nonnenberg c8ea2e9463 Download and install updates without the help of electron-updater 6 years ago
Scott Nonnenberg ae161c6cf6 Update to Electron 4.x 6 years ago
Scott Nonnenberg e4b0901620 If logs are malformed on startup, delete them all and start over 6 years ago
Beaudan 6b1b73a5ea Missed lint line 6 years ago
sachaaaaa 4714cafa6f
Merge pull request #238 from sachaaaaa/commit_hash_about
Show commit hash in About window for beta builds
6 years ago
sachaaaaa 01577a7b45
Merge pull request #236 from BeaudanBrown/fix-database-bug
Fix windows database crash
6 years ago
sachaaaaa 37f0fced29 Show commit hash in About window for beta builds 6 years ago
Beaudan 98aa53de07 Await removing databse 6 years ago
sachaaaaa b39b45e29d Fix #214 Replace help menu links 6 years ago
Scott Nonnenberg 5165eb3bd4 On database error: show popup, allow user to delete and relaunch 6 years ago
Beaudan 6426a5eb9b Added ability to look up our .loki address and now send that with our LokiAddress messages 6 years ago
sachaaaaa 68fe552156 Merge commit '5c8558e293989094693f918a63b672301f1aeb55' into merge_1_21_1
* commit '5c8558e293989094693f918a63b672301f1aeb55':
  v1.21.1
  v1.21.1-beta.1
  Fix: Navigation to message via quote click didn't always work
  mainWindow.close - be ready for null mainWindow
  Ensure that Curve.async points to worker after startWorker call
  Protect against unhandled promises when calling checkForUpdates
  Reenable send when link preview is missing an image

# Conflicts:
#	package.json
6 years ago
Scott Nonnenberg 2624a6af88 mainWindow.close - be ready for null mainWindow 6 years ago
Mikunj 725a41a8d7 Added link preview setting. 6 years ago
sachaaaaa 6b7db5d085 Comment out auto-updater which was making test-loki-view fail 6 years ago
sachaaaaa c968eb8daf revert background colour in main.js (+1 squashed commit)
Squashed commits:
[9ec61f5f] revert background colour
6 years ago
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
6 years ago
Vanja Cosic b26f6231d8 Get rid of the white flash when the app starts up (#3083)
* Prevent FOUC on startup, use Signal Blue instead

Instead of flashing a white background on startup, the app will show a blue background while everything is loading.

* Make sure tests are rendered on white background

* Use `icon_250.png` as the loading image

* Remove hardcoded 'Loading...' text from template
6 years ago
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 6 years ago
Scott Nonnenberg 813924685e Link Previews 6 years ago
Scott Nonnenberg 2c99cc8ff5 Print out error properly if we can't initialize logging
Fixes #3070
6 years ago
Mikunj ac59e1249f Added db resetting.
Use built in signal warning view.
6 years ago
Mikunj e08a63d078 Merge development into lint 6 years ago
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 6 years ago
Mikunj 6bd2d3962e Linted files 6 years ago
Mikunj 87113b6cc1 Added message ttl setting storage 6 years ago
Mikunj 654b0dac84 Merge signal-master. 6 years ago
Mikunj 35c8f32461 Fixed app quitting after unlock on linux. 6 years ago
Scott Nonnenberg dee91b6772 main process: Don't send IPC to event.sender if it is destroyed 6 years ago
sachaaaaa a1255dd31e
Merge pull request #77 from Mikunj/password-protection
Password protection
6 years ago
Beaudan c93aff7ebe Setup grunt/yarn etc for loki tests plus wrote first 2 simple libloki-protocol tests 6 years ago
Mikunj 7d0d244e7c Added localised error messages. 6 years ago
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.
6 years ago
Mikunj 7a96b8446a Rename launcherView to passwordView. 6 years ago
Mikunj 6620244d03 Show main window on correct password; 6 years ago
Mikunj 6b9764e6c6 Added launcher view. 6 years ago
Beaudan bed9ce5be2 Added read receipt checkbox to the settings window which enables or disables the sending and receiving of read receipts 6 years ago
Mikunj ba390e354b Added unblocking.
Added styling.

Trigger changes on both conversation and messages when we block/unblock.
6 years ago
Mikunj 4d3fb17e61 Merge branch 'sig-development' into merge/signal 6 years ago
Mikunj e2a48b8373 Clean up multi instance code. 6 years ago
sachaaaaa f9efd0da68 allow multiple instances running for debugging 6 years ago
Scott Nonnenberg ecf3f18762 Improve our deletion of IndexedDB post-SQLCipher migration 6 years ago
Scott Nonnenberg 6300256a3e Gracefully shut down database operations before app exit 6 years ago
Mikunj f589fdac5c Merge signal changes into branch. 7 years ago
Scott Nonnenberg a7d78c0e9b Sealed Sender support
https://signal.org/blog/sealed-sender/
7 years ago
sachaaaaa 33ad509fbf Merge branch 'master' of https://github.com/signalapp/Signal-Desktop into development
# Conflicts:
#	_locales/ar/messages.json
#	_locales/es_419/messages.json
#	_locales/he/messages.json
#	_locales/hi/messages.json
#	_locales/hr/messages.json
#	_locales/kn/messages.json
#	_locales/ko/messages.json
#	_locales/mk/messages.json
#	_locales/sr/messages.json
#	_locales/uk/messages.json
#	_locales/vi/messages.json
#	package.json
7 years ago