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.
session-desktop/app
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
..
.eslintrc.js Use window.log in browser context, turn on console eslint rule 7 years ago
attachment_channel.js Re-enable orphaned attachment cleanup 7 years ago
attachments.js Eliminate orphaned external message files on startup 7 years ago
auto_update.js Protect against unhandled promises when calling checkForUpdates 6 years ago
base_config.js Merge signal changes into branch. 7 years ago
config.js Let's make it all pretty, shall we? 7 years ago
ephemeral_config.js Merge signal changes into branch. 7 years ago
global_errors.js On database error: show popup, allow user to delete and relaunch 6 years ago
locale.js Let's make it all pretty, shall we? 7 years ago
logging.js If logs are malformed on startup, delete them all and start over 6 years ago
menu.js Partial Merge commit 'bf904ddd129ceba8fa363ccf6d10ecd256c65f63' into signal-1.23 6 years ago
password_util.js Changed registration to be a 2 step process. 6 years ago
permissions.js Permissions: 'return callback(true)' instead of 'return true' 7 years ago
profile_images.js Linted files 6 years ago
protocol_filter.js Follow symlinks on target file path as well as user/config paths 7 years ago
sql.js Left pane changes. 6 years ago
sql_channel.js Split configuration into low and high traffic files 7 years ago
tray_icon.js Partial Merge commit 'bf904ddd129ceba8fa363ccf6d10ecd256c65f63' into signal-1.23 6 years ago
user_config.js Changed development folder to 'Loki-Messenger-Development` instead of 'Signal-Development' 6 years ago
window_state.js Clean logs on start - and eslint/mocha with code coverage (#1945) 7 years ago