Commit Graph

113 Commits (12bf46e09ecd107ffe0f3bd88382b731727efd14)

Author SHA1 Message Date
Audric Ackermann 026a1930ed
add a getOrThrow to ConversationController when we expect this convo 5 years ago
Audric Ackermann 4d991d3992
Merge branch 'clearnet' into react-refactor 5 years ago
Audric Ackermann 1a5a0786a1
fix new medium group mark as unread then as read on opened 5 years ago
Audric Ackermann 3945c6b208
Merge remote-tracking branch 'upstream/clearnet' into react-refactor 5 years ago
Maxim Shishmarev cc43555cd2 Merge branch 'clearnet' into medium-group-fixes 5 years ago
Maxim Shishmarev 87144336b7 Large refactor of medium groups. Fixes them for multidevice 5 years ago
Vincent 704d5a1184 Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into refactor-ts-react 5 years ago
Vincent d823e2a758 safety-number-view 5 years ago
Vincent 3591001ef1 audio component ui 5 years ago
Audric Ackermann f4af41e07f
remove wrapSend() and prepareForSend() from conversation 5 years ago
Vincent 83528f4b8d Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into refactor-ts-react 5 years ago
Mikunj Varsani f11e0f2cd0
Merge pull request #1222 from Mikunj/blocking
Fix up Blocking
5 years ago
Mikunj aa75205bbd Move BlockedNumberController to ts 5 years ago
Maxim Shishmarev d5a98b8b47 Remove swarm nodes from conversations 5 years ago
Maxim Shishmarev 0904e7a8ca Refactor from message polling to content message handling 5 years ago
Audric Ackermann cfd76587f6
remove getSendOptions and getNumberInfo() 5 years ago
Audric Ackermann 66de8d9648
remove plenty of the friend logic 5 years ago
Vincent d8a12aab0f conv tinkering 5 years ago
Vincent 6360b539a3 linting 5 years ago
Vincent 99a5766592 session nomenclature updates 5 years ago
Vincent 5d11ef1457 Header props 5 years ago
Vincent 1689bc617e Message loading with redux 5 years ago
Vincent bf5badda3b Working conversation openning 5 years ago
Vincent ea4dc05009 Upgrade typescript, finding messaages 5 years ago
Mikunj Varsani beb4cdbed8 Closed group fixes. (#816)
* Fix group updates not syning

* Fix leaving closed groups

* Fix incorrect members being shown on create group dialog

* Linting

* Fix create closed group showing our own conversation
5 years ago
Mikunj Varsani 21e982e5c2 Fix open group joining. 5 years ago
Ryan Tharp 30ed04a3b1 tell the server when you leave the channel 5 years ago
Mikunj c4dd10a5cd Simplified profile setting. Renamed functions to be less confusing. Removed storing profile in local storage. 6 years ago
Beaudan 143bf1bdc1 Fill out unregister channel stub, trigger unregister channel on conversation deletion 6 years ago
Beaudan 580931c4fb Pass ourKey to message api, initialise these APIs after registration or when storage is ready so we always have ourKey 6 years ago
Mikunj 3152f92e30 Merge signal 1.23.2
# Conflicts:
#	app/sql.js
#	js/conversation_controller.js
#	package.json
6 years ago
Scott Nonnenberg ef670bec3f Ensure that we have all conversations in redux store 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
Scott Nonnenberg 0c69d725c3 Ensure that we have all conversations in redux store 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 812f895e12 Bring lastMessage and lastMessageStatus back to conversation 6 years ago
Beaudan dbdde07062 Allow conversation symbol to generate while swarm nodes are being retrieved 6 years ago
Beaudan 5c29c6cb1d Search view now works with deleting contacts as well 6 years ago
Beaudan df93c97b48 Added ability to delete contacts and destroy all sessions with them. Added right click menu to contacts/conversations in list which can block, delete messages and delete contact 6 years ago
sachaaaaa 926c9ce3ca Fix multiple friend request timers instantiated 6 years ago
Beaudan 2311bd1328 Fix bug with swarm node reference, now we should only refresh swarm nodes when they fail 6 years ago
Beaudan 5d823de6f9 Renamed lokiSnodeAPI to start with lower case for consistency, refactor snode API to use conversation controller 6 years ago
Mikunj 174f8747b6 Review fixes.
Revert promises back to old style.
6 years ago
Mikunj 8526c6dd92 Fix up possible database write issue. 6 years ago
Mikunj f4e9bc655a Hooked up LokiP2pAPI with online stuff. 6 years ago
Beaudan 6ba7fb20b8 Fixed UI blocking when creating conversation, more review comments 6 years ago
Beaudan 2bae6b5eed Removed online broadcast message type, changed ttl logic a little, add p2p address and port to the window object when recieve message 6 years ago