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
6 years ago
0d9e4bbf45
Only shorten pubkeys if name is present
6 years ago
08cab426c5
Shorten pubkeys in quotations too
6 years ago
d3c3184405
Search returns primary device when looking up secondary pub key
6 years ago
0b898612d9
Linting.
6 years ago
0883b1b650
Updated styles.
...
Merge commit clearnet into mod-badges
6 years ago
c48ae80468
Merge pull request #486 from Mikunj/profile-icons
...
Profile icons
6 years ago
e9a2b57d37
Show crown icon for moderators
6 years ago
72b3d02b52
Poll for moderators, store them on the conversation and use the list to determine our own mod status
6 years ago
700c835782
Update ts/components/conversation/FriendRequest.md
...
Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>
6 years ago
e5eab74b1b
Fix #355 Display timestamp for friend requests
6 years ago
5dc52f0858
Fix incorrect hue shifting
6 years ago
aa216d7a5d
Added minor comment.
6 years ago
a9189979e1
Added JazzIcon
6 years ago
5247bc56b7
Address review
6 years ago
870dc7f904
Fix tests, refactor menu items to please linter and lint
6 years ago
66459ac4bd
Remove most of the right click and cog menu options for the public chats
6 years ago
a2cda31f1a
Remove delete option from more info
6 years ago
21dad58537
Linting.
6 years ago
3380500a2d
Added QR code viewing.
6 years ago
616e952f8e
Add right click option to public chat messages to copy pubkey of sender
6 years ago
f4e76f0576
Merge pull request #455 from neuroscr/public-delete
...
Public delete
6 years ago
ba72f55b03
Fix missing react key error
6 years ago
351fa09ad6
Only show delete option if have mod status and show different modal for mod deletion
6 years ago
e4ecc5b389
A prepare for message deletion
6 years ago
59e1bb48c1
Merge pull request #434 from sachaaaaa/fix_clipboard_redraws
...
[multi-device] Fix main header being redrawn every 100ms
6 years ago
4a35492fe0
Fix main header being redrawn every 100ms
6 years ago
b5aee4f4be
Display "Pair New Device" in menu for non-secondary devices
6 years ago
662c64f347
Remove ability to delete some rss conversations
6 years ago
9bd6b7a364
lint
6 years ago
a0e7ba252c
strip style and improving stripping regex
6 years ago
c57571fdfd
loki.network rss feed
6 years ago
fce4d0ce79
Review cleanup
6 years ago
86e55e5dc6
Clean up bold check
6 years ago
3ea3a394e7
Only bold the profile name for messages
6 years ago
958766dc65
Bold the profile name and truncate the pubkey
6 years ago
3a5e6e2fd3
Lint
6 years ago
1fc2173d9b
Update header template to display group names properly and update migration to only store name for public chat
6 years ago
1d0067e6e5
Forgot to add this part
6 years ago
d0e73ed7f8
Add a button to paste pubkey from clipboard if valid
6 years ago
47ac247f83
Comment out the show all media button
6 years ago
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
3152f92e30
Merge signal 1.23.2
...
# Conflicts:
# app/sql.js
# js/conversation_controller.js
# package.json
6 years ago
3a8111020e
Merge v1.23.0
...
# Conflicts:
# background.html
# package.json
# yarn.lock
6 years ago
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
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
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
57195017f9
Linting
6 years ago
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
8833cd7de4
Skip URLs that include the @ symbol when generating links
...
Thanks to mcsim for the bug report.
6 years ago
sachaaaaa
Maxim Shishmarev
Mikunj
Mikunj Varsani
Beaudan Brown
sachaaaaa
Ryan Tharp
Scott Nonnenberg