oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity
5888 commits 5 branches 83 tags 171 MiB
Commit graph

5888 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mikunj 3152637cdc Fix more check on deletion. 2019-09-13 13:26:23 +10:00
Mikunj Varsani 69eab9f196
Merge pull request #503 from msgmaxim/shorten_pubkey 
Shorten pubkeys in quotations too
 2019-09-13 11:58:09 +10:00
Maxim Shishmarev 0d9e4bbf45 Only shorten pubkeys if name is present 2019-09-13 11:12:28 +10:00
Ryan Tharp 59609a13f9
Merge pull request #502 from neuroscr/clearnet 
pass serverId back to the server
 2019-09-12 16:09:17 -07:00
Maxim Shishmarev 08cab426c5 Shorten pubkeys in quotations too 2019-09-12 17:25:05 +10:00
Ryan Tharp ca5275b410 better guard 2019-09-12 00:09:22 -07:00
Ryan Tharp e6d22aab19 pass serverId back to the server 2019-09-12 00:07:31 -07:00
Mikunj 530a9201a2 Bump version. 2019-09-12 15:47:03 +10:00
Mikunj Varsani ec790ddf89
Merge pull request #500 from Mikunj/link-preview-fix 
Fix unnecessary link preview fetches.
 2019-09-12 15:44:40 +10:00
Mikunj a9710a68db Purge cache on failure. 2019-09-12 13:04:01 +10:00
Mikunj Varsani 51f161a613
Merge pull request #498 from Mikunj/mod-badges 
Mod badges
 2019-09-12 12:45:08 +10:00
Mikunj Varsani d302004225
Merge pull request #493 from BeaudanBrown/delete-polling-fix 
Make sure we are always updating the last deleted id
 2019-09-12 12:44:37 +10:00
Mikunj Varsani 0acea50acb
Merge pull request #490 from BeaudanBrown/incoming-public 
Fix duplicate detection for sent messages in public chat
 2019-09-12 12:44:23 +10:00
Mikunj 0636e635d5 Fix unnecessary link preview fetches. 2019-09-12 12:14:54 +10:00
Mikunj e6d62cb22c Review changes. 
Increase mod time to 30 seconds.
 2019-09-12 08:38:47 +10:00
Mikunj c69bd81343 Undo defaultPublicChatServer change, 2019-09-11 16:23:48 +10:00
Mikunj f860076587 Modified colour of dark mod badge 2019-09-11 16:19:12 +10:00
Mikunj 0b898612d9 Linting. 2019-09-11 15:18:18 +10:00
Mikunj 0883b1b650 Updated styles. 
Merge commit clearnet into mod-badges
 2019-09-11 14:58:34 +10:00
Mikunj ea5bc24253 Updated design 2019-09-11 14:02:56 +10:00
Mikunj Varsani c48ae80468
Merge pull request #486 from Mikunj/profile-icons 
Profile icons
 2019-09-11 14:02:35 +10:00
sachaaaaa 43976c6c43
Merge pull request #494 from sachaaaaa/fix_last_hash 
Fix last hash all being NULL in database
 2019-09-11 09:48:03 +10:00
Beaudan Brown e9a2b57d37 Show crown icon for moderators 2019-09-10 16:07:29 +10:00
Beaudan Campbell-Brown ec5a69f1cf
Merge pull request #489 from msgmaxim/replies 
Enable quotes in public chats
 2019-09-10 15:17:33 +10:00
sachaaaaa 3beb6004db Fix last hash all being NULL in database 2019-09-10 14:35:16 +10:00
Beaudan Brown 72b3d02b52 Poll for moderators, store them on the conversation and use the list to determine our own mod status 2019-09-10 12:57:57 +10:00
Mikunj Varsani ec3d9c5f1c
Merge pull request #491 from BeaudanBrown/better-dev 
Improve dev vs productions modes
 2019-09-10 11:59:15 +10:00
Beaudan Brown 97746307f0 Make sure we are always updating the last deleted id 2019-09-09 16:11:51 +10:00
sachaaaaa 440dc75584
Merge pull request #492 from sachaaaaa/fix_friend_request_timestamp 
Display timestamp for friend requests
 2019-09-09 14:05:06 +10:00
sachaaaaa 700c835782 Update ts/components/conversation/FriendRequest.md 
Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>
 2019-09-09 13:28:51 +10:00
sachaaaaa e5eab74b1b Fix #355 Display timestamp for friend requests 2019-09-09 11:56:35 +10:00
Beaudan Brown 9fe613967a Fix duplicate detection for sent messages in public chat 2019-09-09 11:43:47 +10:00
Beaudan Brown 5a35f05f29 Fix start-prod(-multi) to actually use different identities than default messenger, also connect dev instances to the dev public chat and clean up the config files a lil 2019-09-09 11:36:56 +10:00
Mikunj 5dc52f0858 Fix incorrect hue shifting 2019-09-06 13:18:26 +10:00
Maxim Shishmarev 5cf63af3a3 Enable quotes in public chats 2019-09-06 12:55:13 +10:00
Mikunj aa216d7a5d Added minor comment. 2019-09-05 15:28:00 +10:00
Mikunj a9189979e1 Added JazzIcon 2019-09-05 15:24:58 +10:00
Mikunj 500a88dbab Removed identicon.js 
Updated profile image helper.
 2019-09-05 15:18:52 +10:00
Beaudan Campbell-Brown 1cf6ccafc6
Merge pull request #485 from BeaudanBrown/complete-curlys 
Enforce curlies completely and lint with new settings
 2019-09-05 14:21:00 +10:00
Beaudan Brown 9beea2cbd3 Enforce curlies completely and lint with new settings 2019-09-05 11:48:10 +10:00
Beaudan Campbell-Brown f8cf1cb794
Merge pull request #484 from BeaudanBrown/neuroscr-publicchat-config 
Neuroscr publicchat config
 2019-09-05 11:45:41 +10:00
Beaudan Brown 6f995d6a96 Resolve linter issues 2019-09-05 11:38:47 +10:00
Beaudan Brown f9ca6e4cf2 Merge branch 'publicchat-config' of https://github.com/neuroscr/loki-messenger into neuroscr-publicchat-config 2019-09-05 11:02:17 +10:00
Ryan Tharp 3db32d1aa3
Merge pull request #483 from BeaudanBrown/full-history 
Full history and leave chat
 2019-09-04 01:03:21 -07:00
Ryan Tharp b4277532d6
Update app/sql.js 
Co-Authored-By: Beaudan Campbell-Brown <beau@loki.network>
 2019-09-04 01:01:04 -07:00
Beaudan Brown 0c870d04e3 Stop polling when leaving public chat, only grab the most recent 100 messages on first poll 2019-09-04 17:45:52 +10:00
Ryan Tharp dffcf51f88 add defaultPublicChatServer to config 2019-09-04 00:07:30 -07:00
Ryan Tharp 220f0aa9f5 handle empty servers better 2019-09-04 00:07:03 -07:00
Beaudan Campbell-Brown bf7742932b
Merge pull request #480 from BeaudanBrown/loop-stopping 
Stop polling on public chat deletion
 2019-09-04 16:49:25 +10:00
Beaudan Campbell-Brown 6e6428928c
Merge pull request #479 from neuroscr/use-user-obj 
Make sure public chat timers can't be restarted / Channel name bug fix
 2019-09-04 16:48:44 +10:00