Commit Graph

436 Commits (7de0a0ae65b1384553b51a1e0d744823b9adf026)

Author SHA1 Message Date
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
Vincent cf46548761 Simplification of keyup 5 years ago
Vincent f55e20d8ac Cleanup media view formatting 5 years ago
Maxim Shishmarev 02320334f0 Remove P2P 5 years ago
Audric Ackermann d68aeb947e
Merge branch 'clearnet' into brand-redesign 5 years ago
Audric Ackermann 7867f4dceb
Merge branch 'clearnet' into brand-redesign 5 years ago
Maxim Shishmarev 09bfd9e4ed
Merge pull request #719 from msgmaxim/private-groups
Fix not showing non-friend members in update group dialog
5 years ago
Maxim Shishmarev 8ce066b802 Display subscriber count for open chats 5 years ago
Vincent 4d690768a6 Scrolling button updated and animations to modals 5 years ago
Vincent a0a5a61b29 Various changes suggested by redesign overview 5 years ago
Vincent 3dd18a0c9c Profile picture upload, fixes and copy 5 years ago
Audric Ackermann 293eca0509 Merge branch 'brand-redesign' into clearnet 5 years ago
Audric Ackermann 7e6bbe9c54 do not make highlighted message different for now 5 years ago
Audric Ackermann 25344685a2 merge 5 years ago
Audric Ackermann 25d0fff95f fix build 5 years ago
Vincent d0a8b933e9 Add friends to server Session'isation 5 years ago
Vincent 643a19d1af Sass improvements 5 years ago
Vincent 010cf045cb optimisation of ternary & binary expr. 5 years ago
Vincent 2439c6f95b Contextmenu left trigger fix for messageview 5 years ago
Audric Ackermann 67262c7eaa lint after merge and fix startup of app 5 years ago
Audric Ackermann a7f2072eb7 update invite friend dialog with session ui 5 years ago
Audric Ackermann fb4debdd42 fix add friends dialog noFriendsToAdd 5 years ago
Audric Ackermann 1d63bc3203 add required props in grouppanel to handle disappearing message sets 5 years ago
Audric Ackermann 213db6c1ed fix lint 5 years ago
Audric Ackermann ab0ff9c3ad rename showUserDetails -> avatarClick for conversationHeader 5 years ago
Audric Ackermann ddaf62a499 add group settings page with media downladable and docs only 5 years ago
Audric Ackermann 89ba00e213 remove unused import 5 years ago
Audric Ackermann 73041ccef3 show receivedFriendRequest in a popup 5 years ago
Audric Ackermann 84c315449f show nb of members on group chat when members.length>0 5 years ago
Maxim Shishmarev 0eda74d476 Fix not showing non-friend members in update group dialog 5 years ago
Vincent 7b6e28eaab Keyboard navigation wrt Modals 5 years ago
Vincent 2ede557a74 Modal additions incl. QR fixup and Seed View 5 years ago
Vincent 2419272608 Updated React dialogs to SessionModals 5 years ago
Vincent 9afb8b4d5e Major rework of context menus 5 years ago
Vincent 08cc218364 Fixed orderin of toasts with Maps 5 years ago
Ryan Tharp 404a2129af
Merge pull request #700 from neuroscr/multidevice-publicchat
Defeat caching of context menu
5 years ago
Maxim Shishmarev dcc3232b2b
Merge pull request #697 from msgmaxim/mentions-fix
Fix not awaiting on promises in mentions
5 years ago
Ryan Tharp 7507b9c2ce defeat caching of context menu, and remove unneeded parameter to getHeaderProps 5 years ago
Audric Ackermann 2cc7f3ed20 fix merge issue 5 years ago
Audric Ackermann 803b24ef16 fix lint 5 years ago
Audric Ackermann d5b8436f4d integrate dangerouslySetInnerHTML into custom components and sanityze it before rendering 5 years ago
Audric Ackermann e2519c38e1 fix lint 5 years ago
Ryan Tharp 472d5ed3be correct menu for RSS conversations 5 years ago
Maxim Shishmarev efc03153d3 Fix not awaiting on promises in mentions 5 years ago
Ryan Tharp 26ea0d3ce4 take out unneeded dollar signs 5 years ago
Ryan Tharp 2761e89732 Make aspects of the HTML easier to style 5 years ago
Ryan Tharp 0281338a39 fix tabIndex 5 years ago
Vincent fc235d6057 Completed message selection 5 years ago
Vincent 0c4f57e57d Added session button types and session button colors 5 years ago
Ryan Tharp 9af91d228c fix typo 5 years ago
Ryan Tharp 5730a88c18 add/remove moderator modal dialogs 5 years ago
Vincent 98b4b18583 Added message selection inital functionality and added to buttons 5 years ago
Vincent c2c084920a Namespacing 5 years ago
Vincent c9887f7bc3 Exports simplification and message selection 5 years ago
Vincent 10676f5573 Improved file structuring 5 years ago
Vincent a17964beb7 Using singular enum names rather than plural 5 years ago
Vincent 141c0135fb Fixed styling 5 years ago
Vincent d62f1c6e22 Inital conversation restructuring 5 years ago
Ryan Tharp 37f4b8e8ed use else 6 years ago
Ryan Tharp d58a835af4 enable updateGroup if a public chat channel mod 6 years ago
Ryan Tharp b152d186d5 handle public chat group update 6 years ago
Vince 44ff75cc88 Fixed multi select by preventing select on clicking audio element in message list. 6 years ago
Maxim Shishmarev 1020f54b60
Merge pull request #662 from Bilb/655-clickable-profile
clickable profile
6 years ago
vincentbavitz 2e83881373
Merge pull request #652 from vincentbavitz/public-ban
Public ban
6 years ago
Vince a7a2f9289c Updated references to hasModPerms to isModerator for code consistency 6 years ago
Vince e9068d56ce Updated isModerator to senderIsModerator and fixed logic of isModerator function 6 years ago
Audric Ackermann acea116d4f Revert "Message: click on avatar show userDetailModal"
This reverts commit 2c914c554d.
6 years ago
Audric Ackermann be5f932c08 fix lint 6 years ago
Audric Ackermann c61249e5e0 put event in the avatar element and trigger it in conversation header 6 years ago
Audric Ackermann 2c914c554d Message: click on avatar show userDetailModal
Disable the click on avatar because before it selected the message.
OnClick on avatar -> trigger event to show the UserDetails modal with this pubkey.
6 years ago
Audric Ackermann 9992a3da1d Add a showUserDetails modal to display user's details
Relates #655
6 years ago
Maxim Shishmarev 07c39523e9 Show appropriate message in group invitation dialog on no friends 6 years ago
Beaudan Brown 43a91ab672 Linted 6 years ago
Maxim Shishmarev 2ab0d084f1
Merge pull request #645 from msgmaxim/group-invites
Public chat invitations
6 years ago
Beaudan Brown a3d171884d Added ban user right click functionality 6 years ago
Ryan Tharp 6cde9aa263
Merge pull request #638 from neuroscr/multidevice-publicchat
Public Chat - home server refactor / read public chat avatars from home server
6 years ago
Maxim Shishmarev 89e5e919f2 Address more review comments 6 years ago
Maxim Shishmarev a5fce17d8c public chat invitations 6 years ago
Maxim Shishmarev 9d50c21b29
Merge pull request #635 from msgmaxim/context-menu-select
Don't select messages when context menu is shown
6 years ago
Ryan Tharp f245007a8b convert findMember to async 6 years ago
Maxim Shishmarev e738e07d3e Add missing margin to typing indicator bubbles 6 years ago
Maxim Shishmarev 8b2876dadc Disable context menu and message selection for RSS feed 6 years ago
Maxim Shishmarev 2262b41cd7 Prevent hiding the context menu by clicking away to also potentially select messages 6 years ago
Maxim Shishmarev 2990c95e40 Fix incorrect margins for public messages and friend request bubbles 6 years ago
Maxim Shishmarev 7c96990119 Correctly handle server errors in multi-deletion 6 years ago
Maxim Shishmarev 8677fb15a0 Select multiple messages and bulk deletion 6 years ago
Maxim Shishmarev 395daf3aba Use Array.includes in place of Array.indexOf 6 years ago
Maxim Shishmarev a2f836c690 Address review comments 6 years ago
Maxim Shishmarev 7c05939f55 Add group admins and the ability to remove members from private groups 6 years ago
Maxim Shishmarev 0df5214979 Limit small private groups to 10 members 6 years ago
Maxim Shishmarev 0490e5c668 Clean up conversation options for groups 6 years ago
Maxim Shishmarev 9f81f67460 Can leave private group chats 6 years ago
Maxim Shishmarev f5e9a870f7 Add support for mentions in private group chats 6 years ago
Maxim Shishmarev 90f1d4a6aa Display error messages when creating/updating group chats 6 years ago
Maxim Shishmarev cf18572049 Adding new group members; establishing sessions between non-friends 6 years ago
Maxim Shishmarev 0d19b708f9 Creating private group chats between friends 6 years ago
Maxim Shishmarev 6c08852118
Merge pull request #593 from msgmaxim/not-friends
Fix incorrectly showing friend request as pending
6 years ago
Maxim Shishmarev e64ccbdd2b Clean up RSS conversation 6 years ago
Maxim Shishmarev 9e6f6d5a01 Fix incorrectly showing friend request as pending 6 years ago
Maxim Shishmarev 16692696e0 address reviews 6 years ago
Maxim Shishmarev 687e9db77b Custom message rendering of mentions 6 years ago
Maxim Shishmarev 1496a368e9 Add UI elements for searching and selecting members in a group chat 6 years ago
Maxim Shishmarev 0d9e4bbf45 Only shorten pubkeys if name is present 6 years ago
Maxim Shishmarev 08cab426c5 Shorten pubkeys in quotations too 6 years ago
Mikunj 0b898612d9 Linting. 6 years ago
Mikunj 0883b1b650 Updated styles.
Merge commit clearnet into mod-badges
6 years ago
Beaudan Brown e9a2b57d37 Show crown icon for moderators 6 years ago
Beaudan Brown 72b3d02b52 Poll for moderators, store them on the conversation and use the list to determine our own mod status 6 years ago
sachaaaaa 700c835782 Update ts/components/conversation/FriendRequest.md
Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>
6 years ago
sachaaaaa e5eab74b1b Fix #355 Display timestamp for friend requests 6 years ago
Beaudan Brown 5247bc56b7 Address review 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 Brown a2cda31f1a Remove delete option from more info 6 years ago
Beaudan 616e952f8e Add right click option to public chat messages to copy pubkey of sender 6 years ago
Beaudan Campbell-Brown f4e76f0576
Merge pull request #455 from neuroscr/public-delete
Public delete
6 years ago
Beaudan Brown ba72f55b03 Fix missing react key error 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
Beaudan Brown 662c64f347 Remove ability to delete some rss conversations 6 years ago
Ryan Tharp 9bd6b7a364 lint 6 years ago
Ryan Tharp a0e7ba252c strip style and improving stripping regex 6 years ago
Ryan Tharp c57571fdfd loki.network rss feed 6 years ago
Beaudan fce4d0ce79 Review cleanup 6 years ago
Beaudan 86e55e5dc6 Clean up bold check 6 years ago
Beaudan 3ea3a394e7 Only bold the profile name for messages 6 years ago
Beaudan 958766dc65 Bold the profile name and truncate the pubkey 6 years ago
Beaudan 3a5e6e2fd3 Lint 6 years ago
Beaudan 1fc2173d9b Update header template to display group names properly and update migration to only store name for public chat 6 years ago
Beaudan 1d0067e6e5 Forgot to add this part 6 years ago
Beaudan 47ac247f83 Comment out the show all media button 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 3152f92e30 Merge signal 1.23.2
# Conflicts:
#	app/sql.js
#	js/conversation_controller.js
#	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 8833cd7de4 Skip URLs that include the @ symbol when generating links
Thanks to mcsim for the bug report.
6 years ago
Scott Nonnenberg 8c4d90df07 Send long text as an attachment instead of inline
Remove Android length warning

Handle incoming long message attachments

Show long download pending status in message bubble

Fix the width of the smallest spinner

Remove Android length warning from HTML templates
6 years ago
Scott Nonnenberg b3ac1373fa Move left pane entirely to React 6 years ago
Scott Nonnenberg 6ffbc0ac06 Archive Conversation 6 years ago
Scott Nonnenberg ae2db9f09a Improve handling for URLs composed of mixed character sets 6 years ago
Beaudan 14367620d9 lint 6 years ago
Beaudan d0d57ea8c7 Add more functionality to the conversation right click menu, add right click for messages, change some of the ways toasts/confirmation dialogs are created, auto focus text input for nickname, clean up some stuff 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
Mikunj 9ac76e7e62 Linting 6 years ago
Mikunj 06be1da40d Added p2p message styling 6 years ago
Scott Nonnenberg 9c540ab977 Add cache support to Signal Protocol Store 6 years ago