Commit Graph

421 Commits (42c501e7f8906003d7e156bbe1ab0d8ff6ed9877)

Author SHA1 Message Date
Mikunj 42c501e7f8 Merge v1.23.1
# Conflicts:
#	package.json
6 years ago
Mikunj 3a8111020e Merge v1.23.0
# Conflicts:
#	background.html
#	package.json
#	yarn.lock
6 years ago
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
6 years ago
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
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
Scott Nonnenberg 16bd8c1744 v1.23.1 6 years ago
Scott Nonnenberg d96b189a07 v1.23.1-beta.1 6 years ago
Scott Nonnenberg 065b58fb6b Update Electron to 4.1.1 6 years ago
Scott Nonnenberg d251282da1 Upgrade electron-builder and electron-updater 6 years ago
Scott Nonnenberg 81696b4b15 Update sqlcipher dependency to get win vc++ redistributable 6 years ago
Scott Nonnenberg dd13e16aee v1.23.0 6 years ago
Scott Nonnenberg b232d6289a Update react-contextmenu to avoid event handler issues un unload 6 years ago
Scott Nonnenberg 3b140d9b51 Update react-contextmenu to avoid event handler issues un unload 6 years ago
Scott Nonnenberg f86ac1c765 v1.23.0-beta.4 6 years ago
Scott Nonnenberg b0a3ef5d29 Update spellchecker to reenable spellcheck on linux w/electron v4 6 years ago
Scott Nonnenberg 5336c5fd90 v1.23.0-beta.3 6 years ago
Scott Nonnenberg 6d8ab33e93 Update to Electron 4.0.8 6 years ago
Scott Nonnenberg a7d0e6bf88 v1.23.0-beta.2 6 years ago
Scott Nonnenberg ba461eb44a Update electron-updater to fix its handling of node_module pkging 6 years ago
Scott Nonnenberg 1c48db7df0 Update electron-builder/updater to fix build error on MacOS 6 years ago
Scott Nonnenberg c75a756b2a v1.23.0-beta.1 6 years ago
Scott Nonnenberg b3ac1373fa Move left pane entirely to React 6 years ago
Scott Nonnenberg d72f89d776 Render only visible conversations in left pane 6 years ago
Scott Nonnenberg ae161c6cf6 Update to Electron 4.x 6 years ago
Scott Nonnenberg ae2db9f09a Improve handling for URLs composed of mixed character sets 6 years ago
sachaaaaa 0d3cd78c12 Replace mentions of Signal in package json 6 years ago
Beaudan Campbell-Brown 8e3542b511
Merge pull request #213 from sachaaaaa/channel_encryption
Hook up channel encryption
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 37f0fced29 Show commit hash in About window for beta builds 6 years ago
sachaaaaa ee8b9b7982 update react-contextmenu for bugfix 6 years ago
sachaaaaa aa722590fa use channel encryption with storage server 6 years ago
2-4601 4b1ae1535d Remove gconf dependency from deb package (#3174)
Fixes #2344

//FREEBIE
6 years ago
Mikunj 75d0894104 Fixed files not included in release.
Moved node relevant stuff in libloki into its own modules folder.
6 years ago
Scott Nonnenberg 18b5b7c046 v1.22.0 6 years ago
Scott Nonnenberg 65e4acb706 v1.22.0-beta.2 6 years ago
Scott Nonnenberg 552db647e5 v1.22.0-beta.1 6 years ago
Scott Nonnenberg 3f8223ff48 Revert electron-builder upgrade due to bugs
This reverts commit 8a3acc6b7e
6 years ago
Scott Nonnenberg 681ca363fe v1.21.2-beta.1 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 5c8558e293 v1.21.1 6 years ago
Scott Nonnenberg 84bb9be6a9 v1.21.1-beta.1 6 years ago
sachaaaaa f900a08eda
Merge pull request #177 from sachaaaaa/merge_1_21_0
Merge Signal 1.21.0
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
Beaudan 02d6920ade Tests for loki_p2p_api, added yarn command to generate coverage html, instantiating loki_p2p_api in the test preload 6 years ago
Scott Nonnenberg c5eb067206 v1.21.0 6 years ago
Scott Nonnenberg 6599c9a704 v1.21.0-beta.4 6 years ago
Scott Nonnenberg b69e720c81 v1.21.0-beta.3 6 years ago
Scott Nonnenberg 8a3acc6b7e Update electron-builder and electron-updater 6 years ago
Scott Nonnenberg 813924685e Link Previews 6 years ago