You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		6 years ago
..
JazzIcon	Linting.	6 years ago
conversation	Only shorten pubkeys if name is present	6 years ago
Avatar.md	Note to Self	6 years ago
Avatar.tsx	Added JazzIcon	6 years ago
CaptionEditor.md	Improve caption editor usability, new 'add attachment' affordance	6 years ago
CaptionEditor.tsx	Move left pane entirely to React	6 years ago
ContactListItem.md	ContactListItem: Add spacing above and below (for 'show members')	7 years ago
ContactListItem.tsx	Move left pane entirely to React	6 years ago
ConversationListItem.md	Move left pane entirely to React	6 years ago
ConversationListItem.tsx	Fix tests, refactor menu items to please linter and lint	6 years ago
Intl.md	Finish new Message component, integrate into application	7 years ago
Intl.tsx	Move left pane entirely to React	6 years ago
LeftPane.md	Move left pane entirely to React	6 years ago
LeftPane.tsx	Loki changes	6 years ago
Lightbox.md	Support receiving multiple images in one messages	7 years ago
Lightbox.tsx	Move left pane entirely to React	6 years ago
LightboxGallery.md	Ensure that multi-video lightbox scrolling changes video	7 years ago
LightboxGallery.tsx	Move left pane entirely to React	6 years ago
MainHeader.md	Move left pane entirely to React	6 years ago
MainHeader.tsx	Merge branch 'clearnet' into multi-device	6 years ago
MessageBodyHighlight.md	Move left pane entirely to React	6 years ago
MessageBodyHighlight.tsx	Move left pane entirely to React	6 years ago
MessageSearchResult.md	Move left pane entirely to React	6 years ago
MessageSearchResult.tsx	Move left pane entirely to React	6 years ago
SearchResults.md	Move left pane entirely to React	6 years ago
SearchResults.tsx	Loki changes	6 years ago
Spinner.md	Send long text as an attachment instead of inline	6 years ago
Spinner.tsx	Send long text as an attachment instead of inline	6 years ago
StartNewConversation.md	Move left pane entirely to React	6 years ago
StartNewConversation.tsx	Loki changes	6 years ago