883b94ff92
Merge pull request #279 from sachaaaaa/remove_lint_deps
...
Skip `lint-deps` on appveyor to prevent build failure
7 years ago
990f390f8a
Skip `lint-deps` on appveyor, which triggers a failed build
7 years ago
ab202f0225
Merge pull request #278 from BeaudanBrown/silly-typo
...
Fix typo
7 years ago
145b9e0a37
Fix typo
7 years ago
95cad09253
Merge pull request #277 from BeaudanBrown/polling-patch
...
Polling patch
7 years ago
6f21e7244f
Print polling error
7 years ago
54bd75e9a6
Wait for a longer time after failed poll and extend default timeout
7 years ago
d960739ac2
Merge pull request #273 from fanvyr/patch-1
...
update white paper link
7 years ago
b0f4e627a8
Updated whitepaper link
7 years ago
5ba190f055
Merge pull request #269 from loki-project/KeeJef-patch-1
...
Update issue templates
7 years ago
21ea030f5a
Removed testing windows release on AppVeyor
7 years ago
c3a065c21e
Remove travis windows.
...
Update Appveyor config.
7 years ago
fbbf454c49
Merge branch 'development' into signal-1.24
7 years ago
318371a652
Merge pull request #264 from BeaudanBrown/remove-signal-references
...
Remove Signal references
7 years ago
2a56190ad9
updated white paper link
7 years ago
a8a959b326
Merge branch 'development' into signal-1.24
7 years ago
296eb6fd72
Merge pull request #271 from sachaaaaa/fix_node_tests
...
Fix node tests
7 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
7 years ago
ce4105f529
Fix node tests
7 years ago
61b862b021
Merge signal 1.24.1
7 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
7 years ago
3152f92e30
Merge signal 1.23.2
...
# Conflicts:
# app/sql.js
# js/conversation_controller.js
# package.json
7 years ago
42c501e7f8
Merge v1.23.1
...
# Conflicts:
# package.json
7 years ago
3a8111020e
Merge v1.23.0
...
# Conflicts:
# background.html
# package.json
# yarn.lock
7 years ago
5d916748ae
Fix styling
7 years ago
ef670bec3f
Ensure that we have all conversations in redux store
7 years ago
7387e88c97
Add showing friends in search.
7 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
7 years ago
d934e2cd48
v1.24.1
7 years ago
f6b1b7e39e
Merge tag 'v1.24.1-beta.1'
7 years ago
bc6d549f20
v1.24.1-beta.1
7 years ago
fca40cb548
Disable keyboard shortcut for conversation archive
7 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
7 years ago
5752985bd8
Update bug_report.md
7 years ago
4e9bb78068
Update issue templates
7 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
7 years ago
57195017f9
Linting
7 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
7 years ago
cab389fe2e
Merge pull request #267 from BeaudanBrown/move-filtering
...
Persistent last hash
7 years ago
e54d2b3448
v1.24.0
7 years ago
f20dd3c97a
Merge tag 'v1.24.0-beta.4'
7 years ago
014716922f
v1.24.0-beta.4
7 years ago
b31fbcaa17
Don't send if message body is too long
7 years ago
6cf4f19317
Add a new env variable to the hardening list
7 years ago
6a290f4918
Merge pull request #266 from Mikunj/fixes
...
UI Fixes
7 years ago
8ff647e3cd
Return instead of await
7 years ago
3522513590
Use TEXT over STRING
7 years ago
e63e9b9053
Small optimisation
7 years ago
faf1b4b66b
Lint
7 years ago
620380d2d9
Move filter messages to message api and some other cleaning
7 years ago
Mikunj Varsani
sachaaaaa
Beaudan Campbell-Brown
sachaaaaa
Mikunj
fanvyr
Scott Nonnenberg
Kee Jefferys