d3653e8665
lint after manual merge
6 years ago
0426d85e7a
Merge branch 'clearnet' into multi-device
...
* clearnet: (136 commits)
Fix more check on deletion.
Only shorten pubkeys if name is present
Shorten pubkeys in quotations too
better guard
pass serverId back to the server
Bump version.
Purge cache on failure.
Fix unnecessary link preview fetches.
Review changes. Increase mod time to 30 seconds.
Undo defaultPublicChatServer change,
Modified colour of dark mod badge
Linting.
Updated design
Show crown icon for moderators
Fix last hash all being NULL in database
Poll for moderators, store them on the conversation and use the list to determine our own mod status
Make sure we are always updating the last deleted id
Update ts/components/conversation/FriendRequest.md
Fix #355 Display timestamp for friend requests
Fix duplicate detection for sent messages in public chat
...
# Conflicts:
# app/sql.js
# js/background.js
# js/models/messages.js
# js/views/app_view.js
# libloki/crypto.js
# libtextsecure/message_receiver.js
6 years ago
d17f86679f
Merge pull request #495 from sachaaaaa/fix_unknown_signedkey
...
[multi-device] Ensure the latest contact signed prekey is used
6 years ago
bd16bc5b9b
lint
6 years ago
6de6b762e6
Ensure the latest contact signed prekey is used
6 years ago
3152637cdc
Fix more check on deletion.
6 years ago
59609a13f9
Merge pull request #502 from neuroscr/clearnet
...
pass serverId back to the server
6 years ago
ca5275b410
better guard
6 years ago
e6d22aab19
pass serverId back to the server
6 years ago
d3c3184405
Search returns primary device when looking up secondary pub key
6 years ago
ec790ddf89
Merge pull request #500 from Mikunj/link-preview-fix
...
Fix unnecessary link preview fetches.
6 years ago
a9710a68db
Purge cache on failure.
6 years ago
51f161a613
Merge pull request #498 from Mikunj/mod-badges
...
Mod badges
6 years ago
d302004225
Merge pull request #493 from BeaudanBrown/delete-polling-fix
...
Make sure we are always updating the last deleted id
6 years ago
0acea50acb
Merge pull request #490 from BeaudanBrown/incoming-public
...
Fix duplicate detection for sent messages in public chat
6 years ago
0636e635d5
Fix unnecessary link preview fetches.
6 years ago
f9df221638
Merge pull request #497 from sachaaaaa/prevent_multiple_retrievers
...
[multi-device] Ensure API objects are inited only once
6 years ago
e6d62cb22c
Review changes.
...
Increase mod time to 30 seconds.
6 years ago
0b898612d9
Linting.
6 years ago
0883b1b650
Updated styles.
...
Merge commit clearnet into mod-badges
6 years ago
025ad10fc5
Ensure API objects are inited only once
6 years ago
c48ae80468
Merge pull request #486 from Mikunj/profile-icons
...
Profile icons
6 years ago
43976c6c43
Merge pull request #494 from sachaaaaa/fix_last_hash
...
Fix last hash all being NULL in database
6 years ago
e9a2b57d37
Show crown icon for moderators
6 years ago
ec5a69f1cf
Merge pull request #489 from msgmaxim/replies
...
Enable quotes in public chats
6 years ago
3beb6004db
Fix last hash all being NULL in database
6 years ago
72b3d02b52
Poll for moderators, store them on the conversation and use the list to determine our own mod status
6 years ago
97746307f0
Make sure we are always updating the last deleted id
6 years ago
e5eab74b1b
Fix #355 Display timestamp for friend requests
6 years ago
9fe613967a
Fix duplicate detection for sent messages in public chat
6 years ago
5cf63af3a3
Enable quotes in public chats
6 years ago
b10835ffc7
Share contact upon authorising secondary device
6 years ago
cf3ddf0b03
Merge pull request #466 from sachaaaaa/mnemonic_secret
...
[multi-device] Show 3 last mnemonic representation of public key
6 years ago
500a88dbab
Removed identicon.js
...
Updated profile image helper.
6 years ago
9beea2cbd3
Enforce curlies completely and lint with new settings
6 years ago
6f995d6a96
Resolve linter issues
6 years ago
f9ca6e4cf2
Merge branch 'publicchat-config' of https://github.com/neuroscr/loki-messenger into neuroscr-publicchat-config
6 years ago
0c870d04e3
Stop polling when leaving public chat, only grab the most recent 100 messages on first poll
6 years ago
220f0aa9f5
handle empty servers better
6 years ago
bf7742932b
Merge pull request #480 from BeaudanBrown/loop-stopping
...
Stop polling on public chat deletion
6 years ago
6e6428928c
Merge pull request #479 from neuroscr/use-user-obj
...
Make sure public chat timers can't be restarted / Channel name bug fix
6 years ago
d2dcd6c23d
Stop polling when you leave the public chat, clear up a bit
6 years ago
eb3d22f2b0
remove unneeded comment
6 years ago
c97f26465c
set correct name on conversation
6 years ago
eea6bac7e6
add setGroupName()
6 years ago
4836b74f60
Merge pull request #478 from BeaudanBrown/clean-branches
...
Clean up redundant repetition of successive code duplication one after the other
6 years ago
f9c7a6ff3d
Merge pull request #475 from neuroscr/use-user-obj
...
Use user obj / pull channel name/avatar from server
6 years ago
6d1c9700b1
this.stop guard on channelAPI
6 years ago
c4a95218fa
Make even smaller
6 years ago
e382afdf91
make timers stoppable, delete throw parameter, pollForChannel() pattern update
6 years ago
sachaaaaa
sachaaaaa
Mikunj
Ryan Tharp
Mikunj Varsani
Beaudan Brown
Maxim Shishmarev