Commit Graph

5869 Commits (0883b1b6505d31eb8fcdeae612ada1a2546fe073)
 

Author SHA1 Message Date
Mikunj 0883b1b650 Updated styles.
Merge commit clearnet into mod-badges
6 years ago
Mikunj ea5bc24253 Updated design 6 years ago
Mikunj Varsani c48ae80468
Merge pull request #486 from Mikunj/profile-icons
Profile icons
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 Brown e9a2b57d37 Show crown icon for moderators 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
Mikunj Varsani ec3d9c5f1c
Merge pull request #491 from BeaudanBrown/better-dev
Improve dev vs productions modes
6 years ago
Beaudan Brown 97746307f0 Make sure we are always updating the last deleted id 6 years ago
sachaaaaa 440dc75584
Merge pull request #492 from sachaaaaa/fix_friend_request_timestamp
Display timestamp for friend requests
6 years ago
sachaaaaa 700c835782 Update ts/components/conversation/FriendRequest.md
Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>
6 years ago
sachaaaaa e5eab74b1b Fix #355 Display timestamp for friend requests 6 years ago
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 6 years ago
Mikunj 5dc52f0858 Fix incorrect hue shifting 6 years ago
Maxim Shishmarev 5cf63af3a3 Enable quotes in public chats 6 years ago
Mikunj aa216d7a5d Added minor comment. 6 years ago
Mikunj a9189979e1 Added JazzIcon 6 years ago
Mikunj 500a88dbab Removed identicon.js
Updated profile image helper.
6 years ago
Beaudan Campbell-Brown 1cf6ccafc6
Merge pull request #485 from BeaudanBrown/complete-curlys
Enforce curlies completely and lint with new settings
6 years ago
Beaudan Brown 9beea2cbd3 Enforce curlies completely and lint with new settings 6 years ago
Beaudan Campbell-Brown f8cf1cb794
Merge pull request #484 from BeaudanBrown/neuroscr-publicchat-config
Neuroscr publicchat config
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
Ryan Tharp 3db32d1aa3
Merge pull request #483 from BeaudanBrown/full-history
Full history and leave chat
6 years ago
Ryan Tharp b4277532d6
Update app/sql.js
Co-Authored-By: Beaudan Campbell-Brown <beau@loki.network>
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 dffcf51f88 add defaultPublicChatServer to config 6 years ago
Ryan Tharp 220f0aa9f5 handle empty servers better 6 years ago
Beaudan Campbell-Brown bf7742932b
Merge pull request #480 from BeaudanBrown/loop-stopping
Stop polling on public chat deletion
6 years ago
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
6 years ago
Beaudan Brown d2dcd6c23d Stop polling when you leave the public chat, clear up a bit 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 eea6bac7e6 add setGroupName() 6 years ago
Beaudan Campbell-Brown 4836b74f60
Merge pull request #478 from BeaudanBrown/clean-branches
Clean up redundant repetition of successive code duplication one after the other
6 years ago
Beaudan Campbell-Brown f9c7a6ff3d
Merge pull request #475 from neuroscr/use-user-obj
Use user obj / pull channel name/avatar from server
6 years ago
Ryan Tharp 6d1c9700b1 this.stop guard on channelAPI 6 years ago
Beaudan Brown c4a95218fa Make even smaller 6 years ago
Ryan Tharp e382afdf91 make timers stoppable, delete throw parameter, pollForChannel() pattern update 6 years ago
Beaudan Brown 3894f2784e Clean up redundant repetition 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
Beaudan Campbell-Brown e70b875226
Merge pull request #474 from BeaudanBrown/hide-menus
Remove most of the right click and cog menu options for the public chats
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 5247bc56b7 Address review 6 years ago
Beaudan Brown 870dc7f904 Fix tests, refactor menu items to please linter and lint 6 years ago