oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity
5521 commits 5 branches 83 tags 171 MiB
Commit graph

81 commits

Author SHA1 Message Date
Mikunj
3a8111020e Merge v1.23.0 
# Conflicts:
#	background.html
#	package.json
#	yarn.lock
 2019-04-18 11:12:02 +10:00
Mikunj
5d916748ae Fix styling 2019-04-18 11:05:01 +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
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
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
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
b3ac1373fa Move left pane entirely to React 2019-03-12 17:44:14 -07:00
Scott Nonnenberg
6ffbc0ac06 Archive Conversation 2019-03-12 17:44:14 -07:00
Scott Nonnenberg
d72f89d776 Render only visible conversations in left pane 2019-03-12 17:44:14 -07:00
Mikunj
9ac76e7e62 Linting 2019-02-22 10:22:03 +11:00
Mikunj
06be1da40d Added p2p message styling 2019-02-22 10:22:03 +11:00
Scott Nonnenberg
f5af063191 Improve spinner colors on top of medium-brightness backgrounds 2019-02-20 16:40:35 -08:00
Scott Nonnenberg
1d2c3ae23c Download attachments in separate queue from message processing 2019-02-12 16:34:21 -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
Mikunj
9b382de6da Added online indicator. 
Disable selection in contacts.
 2019-02-01 10:06:39 +11:00
Scott Nonnenberg
813924685e Link Previews 2019-01-29 13:53:14 -08:00
Vanja Cosic
993c85b88c Make non-message components of UI non-selectable (#3078) 
* Make sidebar non-selectable
* Prevent selection of avatar and context menu text in conversation view
* Make loading view and conversation placeholder view non-selectable
* Make settings view contents non-selectable
 2019-01-22 14:08:00 -08:00
Mikunj
1a15ec9c15 Merge commit signal/master into signal-1.20 2019-01-22 13:54:03 +11:00
Mikunj
6bd2d3962e Linted files 2019-01-16 16:18:08 +11:00
Scott Nonnenberg
0de54e125c Improve caption editor usability, new 'add attachment' affordance 2019-01-15 10:51:49 -08:00
Scott Nonnenberg
aab2a57b48 Some style and interaction fine-tuning 2019-01-14 17:40:31 -08:00
Scott Nonnenberg
2380f01e31 Ensure that too-wide messages don't overflow in small breakpoint 2019-01-10 10:22:52 -08:00
Scott Nonnenberg
985b1d6aa6 New staged attachments UI, multiple image attachments per message 2019-01-04 12:21:26 -08:00
Mikunj
654b0dac84 Merge signal-master. 2018-12-17 12:56:04 +11:00
sha-265
3f78a3c466 Fix text alignment for RTL quoted messages (#2980) 2018-12-14 09:27:46 -08:00
Mikunj
d686783124 Fix minor icon clipping. 
Disable text highlighting on header.
 2018-12-04 15:31:59 +11:00
Mikunj
341c5e4ed8 Updated nickname display modal. 2018-12-04 15:31:59 +11:00
Mikunj
1cb09cad2a Add header options. 2018-12-04 08:47:09 +11:00
Mikunj
14ecbc3f35 Moved MainHeader into its own Backbone View. 2018-12-04 08:47:09 +11:00
Mikunj
a807b6eacd Show expand icon on main header. 2018-12-04 08:47:09 +11:00
Mikunj
1be63b52b2 Show contact name on main header. 2018-12-04 08:47:09 +11:00
Mikunj
961eb53915 Auto-generate profile images on conversations. 2018-12-03 08:55:43 +11:00
Mikunj
c32bd3564d Fix minor UI layout. 2018-11-29 16:11:24 +11:00
Mikunj
a530a6c197 Convert gutter to dark theme. 2018-11-29 16:02:02 +11:00
Mikunj
f1d18219ed Conversation UI update. 2018-11-28 10:31:11 +11:00
Scott Nonnenberg
79a861a870 Typing Indicators 2018-11-26 15:26:04 -08:00
Scott Nonnenberg
99252702e1 Support receiving multiple images in one messages 2018-11-26 15:26:04 -08:00
Mikunj
ae2e2fa2ae Updated UI in conversation to support user blocking behaviour. 2018-11-16 15:31:56 +11:00
Mikunj
3789e94342 Added PoW loading icon. 2018-11-15 13:58:29 +11:00
Mikunj
a80d6bb868 Merged branch correctly. 2018-11-13 13:41:21 +11:00
Mikunj
21f76fa693 Minor layout fix 2018-11-12 12:22:56 +11:00
Mikunj
0a23888875 Fix up friend request message layout 2018-11-12 12:17:47 +11:00
Mikunj
0cf616328e Fixed saving prekey bundle once friend request is accepted. 
Added option to delete conversation after it is declined.
 2018-11-12 11:02:08 +11:00
Mikunj
c150cbe34f Friend request message indicator. 2018-11-12 09:22:05 +11:00
Mikunj
9dc19044b9 Handle the case where the user is sending a friend request. 
Fix up styling for outgoing message.
 2018-11-09 14:42:14 +11:00
Mikunj
08ca779fe1 Fixed up friend request message display 2018-11-09 14:27:49 +11:00
Mikunj
f589fdac5c Merge signal changes into branch. 2018-11-07 15:26:37 +11:00
Scott Nonnenberg
a7d78c0e9b Sealed Sender support 
https://signal.org/blog/sealed-sender/
 2018-10-29 14:49:18 -07:00