Commit Graph

575 Commits (ea17437a0cb96e1fe2d9d018bea5d2670086d37d)

Author SHA1 Message Date
sachaaaaa 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
Mikunj 3152637cdc Fix more check on deletion. 6 years ago
Ryan Tharp ca5275b410 better guard 6 years ago
Ryan Tharp e6d22aab19 pass serverId back to the server 6 years ago
sachaaaaa d3c3184405 Search returns primary device when looking up secondary pub key 6 years ago
Mikunj e6d62cb22c Review changes.
Increase mod time to 30 seconds.
6 years ago
Mikunj 0b898612d9 Linting. 6 years ago
Mikunj 0883b1b650 Updated styles.
Merge commit clearnet into mod-badges
6 years ago
sachaaaaa 43976c6c43
Merge pull request #494 from sachaaaaa/fix_last_hash
Fix last hash all being NULL in database
6 years ago
Beaudan Campbell-Brown ec5a69f1cf
Merge pull request #489 from msgmaxim/replies
Enable quotes in public chats
6 years ago
sachaaaaa 3beb6004db Fix last hash all being NULL in database 6 years ago
Beaudan Brown 72b3d02b52 Poll for moderators, store them on the conversation and use the list to determine our own mod status 6 years ago
Beaudan Brown 97746307f0 Make sure we are always updating the last deleted id 6 years ago
Maxim Shishmarev 5cf63af3a3 Enable quotes in public chats 6 years ago
sachaaaaa b10835ffc7 Share contact upon authorising secondary device 6 years ago
Beaudan Brown 9beea2cbd3 Enforce curlies completely and lint with new settings 6 years ago
Beaudan Brown 6f995d6a96 Resolve linter issues 6 years ago
Beaudan Brown f9ca6e4cf2 Merge branch 'publicchat-config' of https://github.com/neuroscr/loki-messenger into neuroscr-publicchat-config 6 years ago
Beaudan Brown 0c870d04e3 Stop polling when leaving public chat, only grab the most recent 100 messages on first poll 6 years ago
Ryan Tharp 220f0aa9f5 handle empty servers better 6 years ago
Ryan Tharp eb3d22f2b0 remove unneeded comment 6 years ago
Ryan Tharp c97f26465c set correct name on conversation 6 years ago
Ryan Tharp 6d1c9700b1 this.stop guard on channelAPI 6 years ago
Ryan Tharp e382afdf91 make timers stoppable, delete throw parameter, pollForChannel() pattern update 6 years ago
Ryan Tharp f093490bec lint plus constant fix 6 years ago
Ryan Tharp 2ca23db141 Merge branch 'use-user-obj' of https://github.com/neuroscr/loki-messenger into use-user-obj 6 years ago
Ryan Tharp 5b193b9e47 remove throw for now, squash ifs, some future avatar notes 6 years ago
Ryan Tharp 35d059eae5 was getting some weird errors, going to try this 6 years ago
Ryan Tharp 3f35170eae
Merge branch 'clearnet' into use-user-obj 6 years ago
Ryan Tharp 428a3b7077 add back conversationId 6 years ago
Beaudan Brown da97d15891 Log when there are errors polling 6 years ago
Beaudan Brown 0dd180d4f4 Wrap polling function in try finally for safety, fix issue with empty array check and lint 6 years ago
Ryan Tharp e25ed0aba3 move pubkey/name out of annotation into user object, read channel meta data from server, throw alert if delete fails, constant name clean up, store timers, Calls refreshModStatus/pollForChannel in cstr 6 years ago
Beaudan Brown 8f4b0a2088 Don't look 6 years ago
sachaaaaa 35b6182074 Clean up after account registration failure 6 years ago
Beaudan Campbell-Brown 43bd167965
Merge pull request #463 from loki-project/public-chat
Public chat
6 years ago
Beaudan Brown cccf533abc Save conversation after all messages are processed 6 years ago
Beaudan Brown 27976a053c Save the last retrieved message for public chats on the conversation 6 years ago
Beaudan Campbell-Brown f4e76f0576
Merge pull request #455 from neuroscr/public-delete
Public delete
6 years ago
Beaudan Campbell-Brown 17c2817517
Merge pull request #449 from BeaudanBrown/rss-fix
Fix feed reader for single element results
6 years ago
Ryan Tharp 56a4a31ca2 sendMessage(), getOrRefreshServerToken supports forceRefresh, make modStatus a property, additional comments 6 years ago
Ryan Tharp dfd6039c83 use LokiPublicChannelAPI 6 years ago
Ryan Tharp 95cca859e9 Merge branch 'deletion-final' of https://github.com/BeaudanBrown/loki-messenger into public-delete 6 years ago
Beaudan Brown 8d77d6fd79 All the API updates, enable mod status retrieval and allow for message deletion 6 years ago
Beaudan Brown 1b4105a3d0 Fix db stuff and remove unneeded message function 6 years ago
Ryan Tharp 33572cac1f use newer delete system every 5s, deleteMessage(), store token in serverAPI, serverRequest refactor, registerChannel now returns the channel found/created, change baseChannelUrl base 6 years ago
Beaudan Brown 7d0b300246 Add deletion polling 6 years ago
Beaudan Brown 6392c77952 Fix database helpers 6 years ago
Beaudan Brown 700ed5d2a8 Some refactoring from reviews, and include the token in the message pipeline instead of getting in message_api 6 years ago
Beaudan Brown b5fd01a468 Add required metadata to sending pipeline and send to public channels 6 years ago