fbbf454c49
Merge branch 'development' into signal-1.24
6 years ago
318371a652
Merge pull request #264 from BeaudanBrown/remove-signal-references
...
Remove Signal references
6 years ago
a8a959b326
Merge branch 'development' into signal-1.24
6 years ago
296eb6fd72
Merge pull request #271 from sachaaaaa/fix_node_tests
...
Fix node tests
6 years ago
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
ce4105f529
Fix node tests
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
5d916748ae
Fix styling
6 years ago
ef670bec3f
Ensure that we have all conversations in redux store
6 years ago
7387e88c97
Add showing friends in search.
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
d934e2cd48
v1.24.1
6 years ago
f6b1b7e39e
Merge tag 'v1.24.1-beta.1'
6 years ago
bc6d549f20
v1.24.1-beta.1
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
57195017f9
Linting
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
cab389fe2e
Merge pull request #267 from BeaudanBrown/move-filtering
...
Persistent last hash
6 years ago
e54d2b3448
v1.24.0
6 years ago
f20dd3c97a
Merge tag 'v1.24.0-beta.4'
6 years ago
014716922f
v1.24.0-beta.4
6 years ago
b31fbcaa17
Don't send if message body is too long
6 years ago
6cf4f19317
Add a new env variable to the hardening list
6 years ago
6a290f4918
Merge pull request #266 from Mikunj/fixes
...
UI Fixes
6 years ago
8ff647e3cd
Return instead of await
6 years ago
3522513590
Use TEXT over STRING
6 years ago
e63e9b9053
Small optimisation
6 years ago
faf1b4b66b
Lint
6 years ago
620380d2d9
Move filter messages to message api and some other cleaning
6 years ago
796181e00c
Add database functions for storing, retrieving and cleaning last hash for snodes
6 years ago
960bd3fff2
Move JobQueue to be a module so that we can use it in preload
6 years ago
949f597ca5
Merge pull request #263 from BeaudanBrown/long-polling
...
Long polling
6 years ago
40ab727b12
Linting
6 years ago
b2ecb87462
Review fixes
6 years ago
22f7a352f9
updateLastMessage: If we don't update last text, clear it
6 years ago
c7130a3bbb
Added password confirmation dialog before showing seeds.
6 years ago
1a211e8df8
Fix loki image stretching randomly
6 years ago
0ffda78ecb
Update libphonenumber dependency
6 years ago
7eabae18f5
Replaced more references to signal with loki and updated CONTRIBUTING.md
6 years ago
377e90bafe
Include long polling header for retrieve messages, extend retrieveMessages timeout to 40 seconds, reduce default tmeout to 5 seconds, remove dev/prod poll time difference
6 years ago
495ddcabab
Merge pull request #262 from BeaudanBrown/millisecond-times
...
Ttl and timestamp milliseconds
6 years ago
ee813a1126
Update libloki/proof-of-work.js
6 years ago
eff8da3677
Merge pull request #261 from BeaudanBrown/disable-encryption
...
Disable encryption
6 years ago
b9c11a229b
Fix tests by handling millisecond ttl better
6 years ago
Mikunj
Beaudan Campbell-Brown
Mikunj Varsani
sachaaaaa
Scott Nonnenberg