92c3e19865
Don't show relative timestamp.
6 years ago
61b862b021
Merge signal 1.24.1
6 years ago
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
3152f92e30
Merge signal 1.23.2
...
# Conflicts:
# app/sql.js
# js/conversation_controller.js
# package.json
6 years ago
42c501e7f8
Merge v1.23.1
...
# Conflicts:
# 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
fca40cb548
Disable keyboard shortcut for conversation archive
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
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
0ffda78ecb
Update libphonenumber dependency
6 years ago
5a50786e7a
Lint fixes
6 years ago
a450cdf528
Lint fixes for recent PRs
6 years ago
1a76f1dae3
Make manual emoji text entry case-insensitive ( #2353 )
6 years ago
eae7660074
Downgrade to electron-builder@20.39.0 due to windows install bug
...
https://github.com/electron-userland/electron-builder/issues/3813
6 years ago
c8ea2e9463
Download and install updates without the help of electron-updater
6 years ago
81de5f9a76
Introduce CTRL-E shortcut for archiving a conversation
6 years ago
613d0ddd12
Lint fixes
6 years ago
d251282da1
Upgrade electron-builder and electron-updater
6 years ago
230c6dc284
Fix vertical sizing of left pane when switching inbox<->archive
6 years ago
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
ba461eb44a
Update electron-updater to fix its handling of node_module pkging
6 years ago
1c48db7df0
Update electron-builder/updater to fix build error on MacOS
6 years ago
b3ac1373fa
Move left pane entirely to React
6 years ago
768007a269
Message Detail: Ensure that quotes are not clickable
6 years ago
e980e3cd22
Lint fixes
6 years ago
6ffbc0ac06
Archive Conversation
6 years ago
ae161c6cf6
Update to Electron 4.x
6 years ago
d574c2a1e4
Lint fixes
6 years ago
ca0c0133e9
Lint fixes
6 years ago
e12e120355
Lint fixes
6 years ago
3f8223ff48
Revert electron-builder upgrade due to bugs
...
This reverts commit 8a3acc6b7e
6 years ago
a43a78731a
Note to Self
6 years ago
a0f67c22da
Merge branch 'textsecure/master' into merge_1_21_0
...
* textsecure/master: (26 commits)
v1.21.0
v1.21.0-beta.4
Dark Theme: Preserve blue background on app loading screen
Localization updates
Fix width of audio player when window is very narrow
A number of small fixes for Link Previews
Get rid of the white flash when the app starts up (#3083 )
v1.21.0-beta.3
Lint fixes
Introduce new language: NB
Fail over to all numbers in retry if errors don't have numbers
Use the proper method for pulling attachments off disk for retry
Fix rendering bug with verified state in updateVerified()
Update electron-builder and electron-updater
Ensure that dialog pops up when permissions denied for voice note
Lint fixes
Large update to localization strings
Link Previews
Ensure that blocked messages are dropped even after sealed sender
Don't linkify quoted message contents
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# _locales/cs/messages.json
# background.html
# config/default.json
# index.html
# js/models/conversations.js
# js/modules/web_api.js
# js/settings_start.js
# js/views/conversation_view.js
# js/views/settings_view.js
# package.json
# protos/SignalService.proto
# stylesheets/_index.scss
# stylesheets/_settings.scss
6 years ago
4d69e109b8
Lint fixes
6 years ago
1533fcc807
Fail over to all numbers in retry if errors don't have numbers
6 years ago
8a3acc6b7e
Update electron-builder and electron-updater
6 years ago
589a66c78c
Lint fixes
6 years ago
1a15ec9c15
Merge commit signal/master into signal-1.20
6 years ago
74bbdb88a5
Lint fixes
6 years ago
7db7a3ad44
Preserve scroll position when adding/removing staged quote
6 years ago
57abb8300f
Upgrade Electron to 3.0.14
6 years ago
b08c10a547
FileInputView: Event on attachment change to hide/show microphone
6 years ago
6eb8f5680c
Preserve links with embedded emoji
6 years ago
f9ea7be61f
Reintroduce single attachment limit
6 years ago
985b1d6aa6
New staged attachments UI, multiple image attachments per message
6 years ago
e4babdaef0
Updates to backup infrastructure
6 years ago
47f834cf5c
Encrypt device name on account create, on first launch if needed
6 years ago
654b0dac84
Merge signal-master.
6 years ago
Mikunj
Scott Nonnenberg
Buck Doyle
sachaaaaa