oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity
6468 commits 5 branches 83 tags 171 MiB
Commit graph

221 commits

Author SHA1 Message Date
Beaudan Brown 685ada5cc5 Merge branch 'clearnet' into prep-merge 2019-11-15 12:31:40 +11:00
sachaaaaa 2c1375e42a Fix recurring memory leak in mentions 2019-11-13 15:52:17 +11:00
Beaudan Brown de0a5c7b78 Unique constraint and prevent some undefined bugs 2019-10-28 12:11:52 +11:00
sachaaaaa 8df692901a Merge branch 'clearnet' into multi-device 
* clearnet:
  set active_at to now() for public channels
 2019-09-30 17:22:26 +10:00
sachaaaaa 634d274ffc
Merge pull request #531 from sachaaaaa/remove_all_private_conv 
[multi-device] Remove private convs only
 2019-09-30 16:57:27 +10:00
sachaaaaa 8ce21b13fe Remove only private conversation during secondary registrations steps to keep public chats in db 2019-09-26 16:37:57 +10:00
sachaaaaa 5a8ab00a96 Rename pairing getters to specify secondary or primary. Add getGrantAuthForPrimary. 2019-09-26 16:27:29 +10:00
sachaaaaa 7d7eea9547 set active_at to now() for public channels 2019-09-25 16:58:49 +10:00
sachaaaaa f8e9e1d3bd Remove rejected authorisation from database 2019-09-19 16:55:51 +10:00
sachaaaaa 0426d85e7a Merge branch 'clearnet' into multi-device 
* clearnet: (136 commits)
  Fix more check on deletion.
  Only shorten pubkeys if name is present
  Shorten pubkeys in quotations too
  better guard
  pass serverId back to the server
  Bump version.
  Purge cache on failure.
  Fix unnecessary link preview fetches.
  Review changes. Increase mod time to 30 seconds.
  Undo defaultPublicChatServer change,
  Modified colour of dark mod badge
  Linting.
  Updated design
  Show crown icon for moderators
  Fix last hash all being NULL in database
  Poll for moderators, store them on the conversation and use the list to determine our own mod status
  Make sure we are always updating the last deleted id
  Update ts/components/conversation/FriendRequest.md
  Fix #355 Display timestamp for friend requests
  Fix duplicate detection for sent messages in public chat
  ...

# Conflicts:
#	app/sql.js
#	js/background.js
#	js/models/messages.js
#	js/views/app_view.js
#	libloki/crypto.js
#	libtextsecure/message_receiver.js
 2019-09-16 15:59:40 +10:00
sachaaaaa d17f86679f
Merge pull request #495 from sachaaaaa/fix_unknown_signedkey 
[multi-device] Ensure the latest contact signed prekey is used
 2019-09-16 13:05:30 +10:00
sachaaaaa 6de6b762e6 Ensure the latest contact signed prekey is used 2019-09-16 09:33:17 +10:00
sachaaaaa d3c3184405 Search returns primary device when looking up secondary pub key 2019-09-12 15:47:05 +10:00
sachaaaaa b10835ffc7 Share contact upon authorising secondary device 2019-09-05 21:29:20 +10:00
Mikunj a9189979e1 Added JazzIcon 2019-09-05 15:24:58 +10:00
Mikunj 500a88dbab Removed identicon.js 
Updated profile image helper.
 2019-09-05 15:18:52 +10:00
Beaudan Brown 9beea2cbd3 Enforce curlies completely and lint with new settings 2019-09-05 11:48:10 +10:00
Beaudan Brown 6f995d6a96 Resolve linter issues 2019-09-05 11:38:47 +10:00
Ryan Tharp b4277532d6
Update app/sql.js 
Co-Authored-By: Beaudan Campbell-Brown <beau@loki.network>
 2019-09-04 01:01:04 -07:00
Ryan Tharp dffcf51f88 add defaultPublicChatServer to config 2019-09-04 00:07:30 -07:00
sachaaaaa 35b6182074 Clean up after account registration failure 2019-09-02 16:54:16 +10:00
Beaudan Brown 6392c77952 Fix database helpers 2019-08-29 17:11:29 +10:00
Beaudan Brown 700ed5d2a8 Some refactoring from reviews, and include the token in the message pipeline instead of getting in message_api 2019-08-29 14:19:35 +10:00
Beaudan Brown 716e142ac4 Reviews 2019-08-29 13:30:31 +10:00
Beaudan Brown 37366198fc Add database tables and helper functions for public server auth 2019-08-29 13:30:31 +10:00
sachaaaaa a4411007b0 Pairing authorisations: refactor proto, change sql table, add getters 2019-08-23 16:31:35 +10:00
Beaudan Brown 895cedc801 Lint 2019-08-23 15:18:47 +10:00
Beaudan Brown 3f4b94ba74 Transition to initialising rss feeds in schema update 2019-08-23 13:36:36 +10:00
sachaaaaa edd800d382 Make linter happy 2019-08-12 15:07:17 +10:00
sachaaaaa 88c1454c18 Use Loki Schema for database versioning 2019-08-12 15:07:17 +10:00
sachaaaaa d208614909 Multi-device part 1: make primary account generate and send authorisation to secondary 2019-08-12 15:07:17 +10:00
Beaudan c9f433fbba Save message id when sending/receiving to/from public server and lint 2019-08-09 13:46:05 +10:00
Beaudan 899bfc3b2b Add channel id to message table and provide helper functions 2019-08-09 13:34:48 +10:00
Beaudan 1fc2173d9b Update header template to display group names properly and update migration to only store name for public chat 2019-08-08 14:56:52 +10:00
Beaudan 014558d939 Squash and clean of old PRs, move towards sending cleartext again 2019-08-08 14:56:52 +10:00
Beaudan 90f788c591 Add the server and channel plus proper displayName 2019-08-08 14:56:52 +10:00
Beaudan 89980e3248 Better sql for selecting version 2019-08-08 14:56:52 +10:00
Beaudan 8225bf5847 Slight sql changes 2019-08-08 14:56:52 +10:00
Beaudan 06832e4978 Lint 2019-08-08 14:56:52 +10:00
Beaudan b4cc9430be Add loki schema versioning and create new public conversation 2019-08-08 14:56:52 +10:00
Beaudan 0a231ea2ae Allow start-prod and start-prod-multi so launch in production (mainnet) mode 2019-08-05 14:34:16 +10:00
Beaudan 5887f8c14c Fix password error 2019-07-05 13:21:32 +10:00
Beaudan 8d4bfc27c9 Have to put the tls setting here for some reason 2019-06-11 14:59:23 +10:00
sachaaaaa 9d6c5bff36 make unverified https queries to the snodes 2019-06-07 16:12:25 +10:00
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
 2019-04-18 12:45:19 +10:00
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
 2019-04-17 16:42:09 +10:00
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
 2019-04-17 13:47:17 +10:00
Mikunj 57195017f9 Linting 2019-04-17 12:05:30 +10:00
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
Scott Nonnenberg 6cf4f19317 Add a new env variable to the hardening list 2019-04-16 14:35:16 -07:00