Commit Graph

549 Commits (f46c885fdf3c9f3a396df032b96bae5f67489d51)

Author SHA1 Message Date
Maxim Shishmarev a3aa104f00 Remove more references to signal.org 5 years ago
Vince 1fefe81f02
Merge pull request #772 from Bilb/fix-global-shortcut-reload-multiple-window
use local shortcut instead of global shortcut
5 years ago
Audric Ackermann ddf1ca78ec
use local shortcut instead of global shortcut
otherwise, ctrl+r is only caught bu the last loaded instance
5 years ago
Maxim Shishmarev 3f58dea035 Remove mixpanel 5 years ago
Audric Ackermann 7c4944ed20
Sped up lint (#754)
Sped up lint
5 years ago
Vincent 9dcc851ebd Updated all icon references 5 years ago
Vincent 4f881ab9a3 Merge branch 'clearnet' of https://github.com/loki-project/loki-messenger into clearnet 5 years ago
Ryan Tharp 0daccb8785
cache eslint on `lint` but not `ready` 5 years ago
Maxim Shishmarev 02320334f0 Remove P2P 5 years ago
Vincent b69b8bffbd conflict resolution 5 years ago
Vincent 0a6a035750 Constants rework 5 years ago
Ryan Tharp 62e09c6441 speed up lint, add lint-full/format-full, make sure use lint-full 5 years ago
Ryan Tharp 11359fc037
Merge branch 'clearnet' into fileproxy 5 years ago
Ryan Tharp 6293cd468b bump form-data to 3.0 5 years ago
Audric Ackermann e094731684
use cross-env and update generated exe name 5 years ago
Audric Ackermann 5d8ada7876 fix use of cross-env for build-release 5 years ago
Audric Ackermann 293eca0509 Merge branch 'brand-redesign' into clearnet 5 years ago
Audric Ackermann 52e782d3fd use cross-env to make build of release easier 5 years ago
Vincent a1a582d7ea Session branding fixes 5 years ago
Vincent 5fbbdc33c3 Signal branding 5 years ago
Audric Ackermann 25344685a2 merge 5 years ago
Vincent f7548fc6ef Finalising pr 5 years ago
Vincent c26097554f settings optimisations 5 years ago
Vincent 2ede557a74 Modal additions incl. QR fixup and Seed View 5 years ago
Vincent 2caffa9289 Dependencies resorted and modal adjustments 5 years ago
Vincent 53555c0133 Fixed wrt review @ Audric 5 years ago
Vincent 66911d6f06 Connect to server modal semi-complete 5 years ago
Vincent 659d4412bd QR code completion 5 years ago
Maxim Shishmarev a195c98061 Add a feature flag for snode proxy 5 years ago
Mikunj 5710c410c7 Bump version to 1.0.0-beta10 5 years ago
Audric Ackermann d7cc76f08e add dev-lint command to packages.json which does not stop on prettier failure 5 years ago
Audric Ackermann 907883b679 add DOMPurify to package.json 5 years ago
Mikunj b3dcd07d16 Bump version to 1.0.0-beta9 5 years ago
Mikunj ad16cbec4a Bundle mac app as dmg instead of 7z. 5 years ago
sachaaaaa 1deccdb882 Bump version to 1.0.0-beta8 5 years ago
Mikunj 6817d82b00 Upgrade electron-notarize 6 years ago
Beaudan Brown 1b3f56dfd3 Update change nickname message 6 years ago
Mikunj e5f17d9d21 Fix CI 6 years ago
Mikunj 9a3aa2a5bc upgraded electron-builder. 6 years ago
Mikunj 1250d93252 Added electron-notarize 6 years ago
Mikunj 103e5e0ab8 Added mac signing 6 years ago
Beaudan Brown a296bf96bf Bump version to beta6 6 years ago
Beaudan Brown 8708943fd3 Add yarn start-multi2 to allow for easier multi device testing (3 clients, 2 are linked) 6 years ago
Ryan Tharp 88b44390bf Desktop Analytics 6 years ago
Mikunj 530a9201a2 Bump version. 6 years ago
Mikunj Varsani c48ae80468
Merge pull request #486 from Mikunj/profile-icons
Profile icons
6 years ago
Beaudan Brown 5a35f05f29 Fix start-prod(-multi) to actually use different identities than default messenger, also connect dev instances to the dev public chat and clean up the config files a lil 6 years ago
Mikunj 500a88dbab Removed identicon.js
Updated profile image helper.
6 years ago
Beaudan Brown 6d76384acd Bump version number 6 years ago
Beaudan Campbell-Brown 48b6bf54c1
Merge pull request #461 from Mikunj/qr-code
Pubkey QR code
6 years ago
Beaudan Campbell-Brown 43bd167965
Merge pull request #463 from loki-project/public-chat
Public chat
6 years ago
Beaudan Brown 38e81fd95a Lower default PoW and add export to build-release yarn call 6 years ago
Mikunj a89358676c Update electron-context-menu.
Only allow copying QR code since saving doesn't work.
6 years ago
Beaudan Brown d8050fbc7f ACTUALLY launch in production 6 years ago
Beaudan dd9e401623 Bump version number 6 years ago
Beaudan 0a231ea2ae Allow start-prod and start-prod-multi so launch in production (mainnet) mode 6 years ago
Beaudan 6f029c9a1f Update to beta 2 6 years ago
Beaudan 47de3963d5 Update version to 1.0.0-beta1 6 years ago
sachaaaaa b6dc8b8a7e Fix tests for https server 6 years ago
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