Commit Graph

440 Commits (abdb2321519db75abfc1d1a31b2d91241e0bc2e1)

Author SHA1 Message Date
sachaaaaa c53633e367 Clearnet p2p with https (no verification yet) 6 years ago
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
6 years ago
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 3152f92e30 Merge signal 1.23.2
# Conflicts:
#	app/sql.js
#	js/conversation_controller.js
#	package.json
6 years ago
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 e54d2b3448 v1.24.0 6 years ago
Scott Nonnenberg 014716922f v1.24.0-beta.4 6 years ago
Scott Nonnenberg 0ffda78ecb Update libphonenumber dependency 6 years ago
Scott Nonnenberg be7f10e4ac v1.24.0-beta.3 6 years ago
Scott Nonnenberg 01a91d2cc1 Restore previous build-release command, failed on macOS 6 years ago
Scott Nonnenberg f44856c73b v1.24.0-beta.2 6 years ago
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
6 years ago
Scott Nonnenberg 5c66c3ddc8 v1.24.0-beta.1 6 years ago
Scott Nonnenberg a450cdf528 Lint fixes for recent PRs 6 years ago
Scott Nonnenberg eae7660074 Downgrade to electron-builder@20.39.0 due to windows install bug
https://github.com/electron-userland/electron-builder/issues/3813
6 years ago
Scott Nonnenberg c8ea2e9463 Download and install updates without the help of electron-updater 6 years ago
Scott Nonnenberg 82dc723432 yarn clean-transpile: ensure that it always gets everything 6 years ago
Scott Nonnenberg beebd1885b v1.23.2 6 years ago
Scott Nonnenberg 377ab6c1cb v1.23.2-beta.1 6 years ago
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
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