Commit graph

7142 commits

Author SHA1 Message Date
Ryan Tharp 6ff5175a74 remove copyId and block user on RSS feeds 2020-02-04 23:09:30 -08:00
Ryan Tharp 8f77c2e00b expose isRss, don't close uncloseable Rss conversation on deleteMessages 2020-02-04 23:09:03 -08:00
Ryan Tharp aff22eb5f9 fix grunt error 2020-02-04 22:29:20 -08:00
Ryan Tharp 2c4facc694 Merge branch 'clearnet' of https://github.com/loki-project/loki-messenger into tls-fix 2020-02-04 22:25:41 -08:00
Vince c288f28a1e
Merge pull request #791 from vincentbavitz/clearnet
Grunt fixes
2020-02-05 16:49:01 +11:00
Vincent f526ee0d96 gruntify 2020-02-05 16:46:59 +11:00
Vince badfb8a203
Merge pull request #790 from vincentbavitz/clearnet
Closed groups UI & styling fixes
2020-02-05 16:02:40 +11:00
Vincent c5ff70c970 Message deletion fix 2020-02-05 16:01:55 +11:00
Vincent b4c6c37b16 constants renaming 2020-02-05 15:19:18 +11:00
Vincent fdbe539eba Merge branch 'clearnet' of https://github.com/vincentbavitz/session-desktop into clearnet 2020-02-05 15:11:48 +11:00
Vincent 799fcb80f4 Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into clearnet 2020-02-05 15:09:35 +11:00
Vincent 674713e6b6 Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into clearnet 2020-02-05 14:21:24 +11:00
Vincent 821cf00b65 Closed group update message stylgin 2020-02-05 14:19:01 +11:00
Mikunj Varsani 44f817d16c
Merge pull request #789 from Mikunj/closed-group-fixes
Closed group fixes
2020-02-05 03:07:24 +01:00
Mikunj 164303180f Remove unneeded boolean condition. 2020-02-05 13:06:36 +11:00
Mikunj c9f60826b4 Fix friend request messages being sent to users you don't have a session in closed groups.
Disable typing messages and read receipts in groups.
Send out session request messages if you don't have a session with a member in the group.
2020-02-05 13:00:19 +11:00
Vincent 78e2491de0 Merge branch 'clearnet' of https://github.com/loki-project/loki-messenger into clearnet 2020-02-05 11:38:57 +11:00
Vincent b341ceaf76 Closed group joining completed w/o backend 2020-02-05 11:12:50 +11:00
Maxim Shishmarev 9104144922
Merge pull request #788 from Mikunj/session-request
Fix session request messages
2020-02-05 10:56:50 +11:00
Mikunj d7f71650ea Linting 2020-02-05 10:37:55 +11:00
Mikunj 8ae793db19 Rename BACKGROUND_FRIEND_REQUEST to SESSION_REQUEST.
Don't trigger friend request logic if a message is aimed at a group.
2020-02-05 10:32:14 +11:00
Ryan Tharp 09e133743d lint caught typo 2020-02-04 15:27:49 -08:00
Ryan Tharp 3abb691e2c lint 2020-02-04 15:25:25 -08:00
Ryan Tharp 90de43e6ff refactor out validServer() 2020-02-04 15:25:09 -08:00
Ryan Tharp eecf2252d7 use attempt from window object to reduce code duplication 2020-02-04 15:24:38 -08:00
Ryan Tharp 83e2404d89 move comments from connecting_to_server_dialog_view 2020-02-04 15:24:09 -08:00
Vincent 4fd2126fbe Fileserver update 2020-02-05 10:08:55 +11:00
Vincent 250a3ad6c1 Closed groups overlay integration 2020-02-05 09:59:55 +11:00
Ryan Tharp 8767a57ddd actually validate URL before starting up a bunch of timers 2020-02-04 14:34:25 -08:00
Ryan Tharp 739ac4ce4e include useful info on error 2020-02-04 14:33:47 -08:00
Ryan Tharp c1cea3ca04 turn off snode proxy logging 2020-02-04 14:33:29 -08:00
Ryan Tharp 9732c4f4d0
Merge pull request #784 from neuroscr/tls-fix
make sure TLS is forced on open groups
2020-02-04 14:11:24 -08:00
Vincent 91c6a153ae function params changes 2020-02-04 18:14:18 +11:00
Vincent c5e0fe8503 Closed groups UI 2020-02-04 18:07:31 +11:00
Ryan Tharp d7a1fbab22 make sure TLS is forced on open groups, improve serverRequest error message 2020-02-03 23:00:18 -08:00
Maxim Shishmarev 22cc171bf5
Merge pull request #752 from msgmaxim/cleanup
Remove more references to signal.org
2020-02-04 16:26:25 +11:00
Maxim Shishmarev a3aa104f00 Remove more references to signal.org 2020-02-04 16:25:47 +11:00
Ryan Tharp bd62d27f6f
Merge pull request #783 from neuroscr/tls-fix
libtextsecure/message_receiver.js typo
2020-02-03 21:12:07 -08:00
Ryan Tharp 158b4fcb08 fix typo 2020-02-03 21:11:14 -08:00
Ryan Tharp 441fb78e96
Merge pull request #782 from neuroscr/tls-fix
fix querystring in file-proxy
2020-02-03 20:23:27 -08:00
Ryan Tharp 3a0b3dddfd lint 2020-02-03 20:15:43 -08:00
Ryan Tharp 63c2e4c7bf Merge branch 'clearnet' of https://github.com/loki-project/loki-messenger into tls-fix 2020-02-03 20:12:44 -08:00
Ryan Tharp e6ab3d55ae fix querystring in file-proxy 2020-02-03 20:11:06 -08:00
Ryan Tharp 3f1294198f
Merge pull request #781 from neuroscr/tls-fix
Clearnet fixes
2020-02-03 19:29:41 -08:00
Ryan Tharp 569485f42a put back seemingly now required process.env.NODE_TLS_REJECT_UNAUTHORIZED 2020-02-03 19:29:30 -08:00
Ryan Tharp c864f00697 lint 2020-02-03 19:29:11 -08:00
Ryan Tharp 3abfd7833c fix typo 2020-02-03 19:08:49 -08:00
Ryan Tharp 260e494aee use promise version to see if we're expired 2020-02-03 19:02:43 -08:00
Ryan Tharp 058d294eb0 better error checking 2020-02-03 19:01:26 -08:00
Ryan Tharp 8e92f22974 window.extension.expiredPromise version 2020-02-03 19:01:06 -08:00