Commit Graph

518 Commits (9beea2cbd3b0cb4857a750a03ba52e6d69789662)

Author SHA1 Message Date
Beaudan Brown 9beea2cbd3 Enforce curlies completely and lint with new settings 6 years ago
Beaudan Brown 0c870d04e3 Stop polling when leaving public chat, only grab the most recent 100 messages on first poll 6 years ago
Beaudan Campbell-Brown bf7742932b
Merge pull request #480 from BeaudanBrown/loop-stopping
Stop polling on public chat deletion
6 years ago
Beaudan Campbell-Brown 6e6428928c
Merge pull request #479 from neuroscr/use-user-obj
Make sure public chat timers can't be restarted / Channel name bug fix
6 years ago
Beaudan Brown d2dcd6c23d Stop polling when you leave the public chat, clear up a bit 6 years ago
Ryan Tharp eea6bac7e6 add setGroupName() 6 years ago
Beaudan Brown 870dc7f904 Fix tests, refactor menu items to please linter and lint 6 years ago
Beaudan Brown 66459ac4bd Remove most of the right click and cog menu options for the public chats 6 years ago
Beaudan Campbell-Brown a6abcaf826
Merge pull request #453 from Mikunj/profile-simplification
Profile simplification
6 years ago
Beaudan Brown 27976a053c Save the last retrieved message for public chats on the conversation 6 years ago
Beaudan Brown 8066affd2c Move initialisation of public and rss conversations to fix early loading error. Rename function to be more readable 6 years ago
Ryan Tharp 133f2a5656 replace publicSendData with LokiPublicChannelAPI instance 6 years ago
Beaudan Brown 351fa09ad6 Only show delete option if have mod status and show different modal for mod deletion 6 years ago
Beaudan Brown e4ecc5b389 A prepare for message deletion 6 years ago
Mikunj c4dd10a5cd Simplified profile setting. Renamed functions to be less confusing. Removed storing profile in local storage. 6 years ago
Beaudan Brown 700ed5d2a8 Some refactoring from reviews, and include the token in the message pipeline instead of getting in message_api 6 years ago
Beaudan Brown b5fd01a468 Add required metadata to sending pipeline and send to public channels 6 years ago
Beaudan Brown 662c64f347 Remove ability to delete some rss conversations 6 years ago
Beaudan Brown 3f4b94ba74 Transition to initialising rss feeds in schema update 6 years ago
Ryan Tharp d3cf055128 rss avatar guard 6 years ago
Ryan Tharp a67e7fcfe1 guard for CI fix 6 years ago
Ryan Tharp bbffa89308 make sure we have braces 6 years ago
Ryan Tharp c57571fdfd loki.network rss feed 6 years ago
Beaudan c9f433fbba Save message id when sending/receiving to/from public server and lint 6 years ago
Beaudan f857744e88 Revert sending id 6 years ago
Beaudan 5bdfaeaf1d Don't send read receipts to public chats 6 years ago
Beaudan f718bf15d2 Prepare to delete message, send message id to server 6 years ago
Beaudan 143bf1bdc1 Fill out unregister channel stub, trigger unregister channel on conversation deletion 6 years ago
Beaudan 014558d939 Squash and clean of old PRs, move towards sending cleartext again 6 years ago
Beaudan b4cc9430be Add loki schema versioning and create new public conversation 6 years ago
Beaudan debd211fe5 Also don't send typing messages for people we aren't friends with 6 years ago
Beaudan Campbell-Brown fc12f01ab3
Merge pull request #374 from msgmaxim/no-read-receipt-unless-friends
Only send read receipts if friends
6 years ago
Beaudan Campbell-Brown b76f84acc5
Merge pull request #377 from msgmaxim/typing-indicators
Add a toggle option for typing indicators; use short ttl for them
6 years ago
Maxim Shishmarev cdd374a4b2 Add a toggle option for typing indicators; use short ttl for them 6 years ago
Maxim Shishmarev f12a7cee4d only send read receipts if friends 6 years ago
Beaudan 63396669bc Add eslint rule to enforce curlys, run eslint --fix to automatically apply this rule and add swapfiles to gitignore 6 years ago
Beaudan 96aaa7851d Send broadcast message instead of empty message to trigger things like session reset and disappearing messages. Also fix small bug where deleting a contact kept the (now removed) conversation open 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
Beaudan Campbell-Brown 4330e48185
Merge pull request #307 from BeaudanBrown/fix-self-note
Fix not to self
6 years ago
Beaudan e1d2484797 Can't update conversation that hasn't been created yet 6 years ago
Beaudan ab15a4afd6 Review moving status setting to conversation init 6 years ago
Beaudan 3bb9d888dc Initialise conversation with ourselves as friends and don't allow it to be changed to anything else 6 years ago
Beaudan 94b125f2cf Consider friend requests that are still being sent as sent 6 years ago
Mikunj 2c12c8a1d8 Convert profile field in data message to use LokiProfile instead of signal Contact. 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 3a8111020e Merge v1.23.0
# Conflicts:
#	background.html
#	package.json
#	yarn.lock
6 years ago
Mikunj 7387e88c97 Add showing friends in search. 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