Commit Graph

223 Commits (457a8967d658e099aa52e458fd4011d5fe890f88)

Author SHA1 Message Date
Audric Ackermann 457a8967d6
remove beta disclaimer entirely 5 years ago
Audric Ackermann 70b739d24f
update translation to match android - part 1 5 years ago
Audric Ackermann 761ebf4a7c
lint 5 years ago
Audric Ackermann abc9456d14
add popup for disabling multi device 5 years ago
Mikunj fd547941d6 Fix sync message issue 5 years ago
Audric Ackermann 5610ec5a9f
move handling of message event sending to message.js 5 years ago
Audric Ackermann 63c6f12a66
send sync message when a message was sent to someone 5 years ago
Audric Ackermann 4c890482f7
handle sending events on messages (sent/error) 5 years ago
Audric Ackermann fb7e13acb0
lint 5 years ago
Audric Ackermann 8e0a466996
basic message sending event handling 5 years ago
Audric Ackermann 6a91d44e08
pass the db id to our messagesender message and clean a few files 5 years ago
Ryan Tharp d69a0a9fd4 lint 5 years ago
Vince 5bbd136493
Merge pull request #758 from neuroscr/version-check
Version check, de-signal.org-ification
5 years ago
Vincent 4350b73724 Messages.json amendments 5 years ago
Maxim Shishmarev 3f58dea035 Remove mixpanel 5 years ago
Ryan Tharp a0599d27bc get latest version through snode proxy, remove clearfix from ExpiredAlertBanner 5 years ago
Vincent 3dd18a0c9c Profile picture upload, fixes and copy 5 years ago
Vincent 6b577915a0 Fixed typos 5 years ago
Vincent 8de2ce9e23 Theme toggle and settings abstraction 5 years ago
Vincent 2b7af04587 Message selection fixed and optimised for speed 5 years ago
Vincent d20d62e8c6 Messages display temporary fix and panel optimisations 5 years ago
Vincent 505697bbcd App view change working 5 years ago
Audric Ackermann ecaf37cc82 resolve merge issues 5 years ago
Audric Ackermann 634aaa36d4 update loading screens with session subtitle 5 years ago
Vincent 8074756dc2 Infinte duration toasts 5 years ago
Beaudan Brown 685ada5cc5 Merge branch 'clearnet' into prep-merge 5 years ago
Maxim Shishmarev a2f836c690 Address review comments 6 years ago
Maxim Shishmarev 0d19b708f9 Creating private group chats between friends 6 years ago
Beaudan Brown 08ad913105 Add explicit isSecondary flag to conversation list items so they can remain hidden in the menu after they become friends etc 6 years ago
sachaaaaa b63d8ec84f Merge branch 'clearnet' into multi-device
* clearnet: (35 commits)
  yarn lint
  return early if signature is not a string
  lint pass 2
  lint pass 1
  make sure versioning on write can't get out of sync
  Update js/modules/loki_public_chat_api.js
  Handle annotations omit correctly
  fix typo CI found
  refactor
  pollOnceForMessages() move lastGot up, address Sacha's review
  Update js/modules/loki_public_chat_api.js
  address review
  address reviews
  Custom message rendering of mentions
  fix method
  separate out new/open, more lint/cleanup
  separate out note to self
  create window.mixpanel here
  use window.mixpanel, remove eventEmitter
  lint and remove unneeded params
  ...
6 years ago
Ryan Tharp db8ac66118 fix method 6 years ago
Ryan Tharp 3150a6ce11 separate out new/open, more lint/cleanup 6 years ago
Ryan Tharp d4ca49ae95 separate out note to self 6 years ago
Ryan Tharp 88b44390bf Desktop Analytics 6 years ago
Mikunj 831ae09576 Cherry pick "profile simplification" from Mik 6 years ago
Mikunj c4dd10a5cd Simplified profile setting. Renamed functions to be less confusing. Removed storing profile in local storage. 6 years ago
sachaaaaa b5aee4f4be Display "Pair New Device" in menu for non-secondary devices 6 years ago
Beaudan 9dae805017 Run lint 6 years ago
sachaaaaa 5cb7703ae5 Add one-time disclaimer at startup for beta release 6 years ago
Beaudan 96aaa7851d Send broadcast message instead of empty message to trigger things like session reset and disappearing messages. Also fix small bug where deleting a contact kept the (now removed) conversation open 6 years ago
Mikunj b8ef6c2cc6 Loki changes
Added friends section in search.

This is because contacts is now used in signal for something else and we don't want to clash meanings.

Styling fixes

Add dropdown options into mainheader

Updated styling

Restore StartNewConversation to the old ui style of loki messenger.

Fix friend search display.

Fix header expand animation.

Hooked up menu actions.

Linting.

More styling changes.

Fix tests.

Added back in the loki logo below the gutter.

Fix toast positioning.

Fix context menu showing incorrectly on virtual lists.

Added tabs.

Linting
6 years ago
Mikunj 61b862b021 Merge signal 1.24.1 6 years ago
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
6 years ago
Mikunj 3152f92e30 Merge signal 1.23.2
# Conflicts:
#	app/sql.js
#	js/conversation_controller.js
#	package.json
6 years ago
Scott Nonnenberg ef670bec3f Ensure that we have all conversations in redux store 6 years ago
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
6 years ago
Scott Nonnenberg fca40cb548 Disable keyboard shortcut for conversation archive 6 years ago
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
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
6 years ago
Scott Nonnenberg 81de5f9a76 Introduce CTRL-E shortcut for archiving a conversation 6 years ago