Mikunj
92c3e19865
Don't show relative timestamp.
2019-08-21 13:07:31 +10:00
Mikunj
61b862b021
Merge signal 1.24.1
2019-04-18 13:27:54 +10:00
Mikunj
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
2019-04-18 12:45:19 +10:00
Mikunj
3152f92e30
Merge signal 1.23.2
...
# Conflicts:
# app/sql.js
# js/conversation_controller.js
# package.json
2019-04-18 12:31:39 +10:00
Mikunj
42c501e7f8
Merge v1.23.1
...
# Conflicts:
# package.json
2019-04-18 11:13:23 +10:00
Mikunj
3a8111020e
Merge v1.23.0
...
# Conflicts:
# background.html
# package.json
# yarn.lock
2019-04-18 11:12:02 +10:00
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
2019-04-18 10:13:49 +10:00
Scott Nonnenberg
fca40cb548
Disable keyboard shortcut for conversation archive
2019-04-17 14:19:32 -07:00
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
2019-04-17 16:42:09 +10:00
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
2019-04-17 13:47:17 +10:00
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
2019-04-17 11:59:54 +10:00
Scott Nonnenberg
0ffda78ecb
Update libphonenumber dependency
2019-04-11 18:01:28 -07:00
Scott Nonnenberg
5a50786e7a
Lint fixes
2019-04-10 12:14:32 -07:00
Scott Nonnenberg
a450cdf528
Lint fixes for recent PRs
2019-04-08 11:30:19 -07:00
Buck Doyle
1a76f1dae3
Make manual emoji text entry case-insensitive ( #2353 )
2019-04-08 09:57:21 -07:00
Scott Nonnenberg
eae7660074
Downgrade to electron-builder@20.39.0 due to windows install bug
...
https://github.com/electron-userland/electron-builder/issues/3813
2019-04-05 17:18:37 -07:00
Scott Nonnenberg
c8ea2e9463
Download and install updates without the help of electron-updater
2019-04-05 17:18:37 -07:00
Scott Nonnenberg
81de5f9a76
Introduce CTRL-E shortcut for archiving a conversation
2019-04-04 17:17:19 -07:00
Scott Nonnenberg
613d0ddd12
Lint fixes
2019-03-28 17:24:46 -07:00
Scott Nonnenberg
d251282da1
Upgrade electron-builder and electron-updater
2019-03-22 12:24:07 -07:00
Scott Nonnenberg
230c6dc284
Fix vertical sizing of left pane when switching inbox<->archive
2019-03-14 17:30:46 -07:00
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
2019-03-14 17:30:46 -07:00
Scott Nonnenberg
ba461eb44a
Update electron-updater to fix its handling of node_module pkging
2019-03-12 19:45:02 -07:00
Scott Nonnenberg
1c48db7df0
Update electron-builder/updater to fix build error on MacOS
2019-03-12 18:49:22 -07:00
Scott Nonnenberg
b3ac1373fa
Move left pane entirely to React
2019-03-12 17:44:14 -07:00
Scott Nonnenberg
768007a269
Message Detail: Ensure that quotes are not clickable
2019-03-12 17:44:14 -07:00
Scott Nonnenberg
e980e3cd22
Lint fixes
2019-03-12 17:44:14 -07:00
Scott Nonnenberg
6ffbc0ac06
Archive Conversation
2019-03-12 17:44:14 -07:00
Scott Nonnenberg
ae161c6cf6
Update to Electron 4.x
2019-03-12 17:44:14 -07:00
Scott Nonnenberg
d574c2a1e4
Lint fixes
2019-02-20 16:51:30 -08:00
Scott Nonnenberg
ca0c0133e9
Lint fixes
2019-02-13 16:07:35 -08:00
Scott Nonnenberg
e12e120355
Lint fixes
2019-02-13 16:04:58 -08:00
Scott Nonnenberg
3f8223ff48
Revert electron-builder upgrade due to bugs
...
This reverts commit 8a3acc6b7e
2019-02-13 16:04:58 -08:00
Scott Nonnenberg
a43a78731a
Note to Self
2019-02-12 16:08:51 -08:00
sachaaaaa
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
2019-02-06 13:53:20 +11:00
Scott Nonnenberg
4d69e109b8
Lint fixes
2019-01-29 16:13:23 -08:00
Scott Nonnenberg
1533fcc807
Fail over to all numbers in retry if errors don't have numbers
2019-01-29 16:08:03 -08:00
Scott Nonnenberg
8a3acc6b7e
Update electron-builder and electron-updater
2019-01-29 13:53:14 -08:00
Scott Nonnenberg
589a66c78c
Lint fixes
2019-01-29 13:53:14 -08:00
Mikunj
1a15ec9c15
Merge commit signal/master into signal-1.20
2019-01-22 13:54:03 +11:00
Scott Nonnenberg
74bbdb88a5
Lint fixes
2019-01-15 10:51:49 -08:00
Scott Nonnenberg
7db7a3ad44
Preserve scroll position when adding/removing staged quote
2019-01-14 19:20:45 -08:00
Scott Nonnenberg
57abb8300f
Upgrade Electron to 3.0.14
2019-01-14 17:40:31 -08:00
Scott Nonnenberg
b08c10a547
FileInputView: Event on attachment change to hide/show microphone
2019-01-14 17:35:01 -08:00
Scott Nonnenberg
6eb8f5680c
Preserve links with embedded emoji
2019-01-04 12:25:48 -08:00
Scott Nonnenberg
f9ea7be61f
Reintroduce single attachment limit
2019-01-04 12:25:48 -08:00
Scott Nonnenberg
985b1d6aa6
New staged attachments UI, multiple image attachments per message
2019-01-04 12:21:26 -08:00
Scott Nonnenberg
e4babdaef0
Updates to backup infrastructure
2019-01-04 12:21:26 -08:00
Scott Nonnenberg
47f834cf5c
Encrypt device name on account create, on first launch if needed
2019-01-04 12:21:26 -08:00
Mikunj
654b0dac84
Merge signal-master.
2018-12-17 12:56:04 +11:00
