Commit Graph

12520 Commits (939f8cac437a9f637cb0aa301cc38e177ad9c296)
 

Author SHA1 Message Date
Kee Jefferys 939f8cac43 fix: resolve issues brought on by merge conflict
Fix conflict merge issue

fix: missing bracket
1 year ago
Kee Jefferys cf49839bde
Merge branch 'unstable' into follow-system-theme 1 year ago
Audric Ackermann f65895f013
Merge pull request #2955 from KeeJef/settings-update
feat: Allow enter to break line in settings
1 year ago
Audric Ackermann 88df8c2426
Merge pull request #2960 from KeeJef/alias-saved-messages
feat: Allow to find "Note to Self" conversation with "saved messages"
1 year ago
Kee Jefferys 7f30ed561b fix: update usage of undefined 1 year ago
Kee Jefferys 5571471bbe fix: update selector usage and theme checking code 1 year ago
Kee Jefferys ccd430bf0c fix: commit untracked theme.ts 1 year ago
Kee Jefferys 358e95621d fix: refactor and move various functions 1 year ago
Audric Ackermann d320fe588a
Merge pull request #2952 from KeeJef/count-visible
fix: bump contrast on attachment overlay text
1 year ago
Kee Jefferys 2fe29ca30e feat: implement setting to follow system theme
feat: check theme congruence on startup and on native theme update

fix: make toggle and startup following work

fix: should return here, but this breaks things
1 year ago
Kee Jefferys 36adbaa71e fix: update any to void 2 years ago
Kee Jefferys b8ef827e62 fix: update usage of string and bool in radio group 2 years ago
Kee Jefferys 143753566d feat: alias saved messages with note to self 2 years ago
Kee Jefferys 91475bbce9 fix: update shadow, font size and bg color 2 years ago
Audric Ackermann 67f569e9e3
Merge pull request #2917 from RubenGarcia/RenameMultipleAttachments
Rename multiple attachments
2 years ago
Audric Ackermann e39c276bcc
Merge pull request #2958 from oxen-io/pull-crowdin
chore: pull crowdin changes
2 years ago
Audric Ackermann 50afa68b1f chore: pull crowdin changes 2 years ago
Ruben Garcia 916babb9d0 fix: requested changes by Bilb 2 years ago
Kee Jefferys 6b78cc1d4b fix: ensure default value is provided 2 years ago
Kee Jefferys ff09d8e104 fix: disable eslint, refactor function 2 years ago
Keejef 95117afeea fix: Refactor settings to use Redux
Refactor setting to use boolean which is stored in redux
2 years ago
Keejef fb9da2e6e2 fix: bump contrast on attachment overlay text 2 years ago
Audric Ackermann 954a1a7002
Merge pull request #2944 from oxen-io/unstable
chore: updated electron to v25.8.4
2 years ago
Audric Ackermann d6d368c9f5
Merge pull request #2941 from yougotwill/chore/no-ref/electron-upgrade
chore: updated electron to v25.8.4
2 years ago
William Grant 12c6b59e46 chore: updated electron to v25.8.4 2 years ago
Audric Ackermann 63570d74ff
Merge pull request #2939 from yougotwill/feature/gh-2181/update_macos_logo
Update macOS icon to match new guidelines
2 years ago
William Grant 3f35838ebf feat: updated macOS icon to match new guidelines 2 years ago
Audric Ackermann 7336a39cca
Merge pull request #2938 from oxen-io/unstable
chore: bump to session 1.11.4
2 years ago
Audric Ackermann 3b6dae7c7a chore: bump to session 1.11.4 2 years ago
Audric Ackermann e6bbe93d32
Merge pull request #2936 from oxen-io/unstable
fix: do not try to store contacts not matching pubkey regex in wrapper
2 years ago
Audric Ackermann d369682462
Merge pull request #2932 from Bilb/fix-crash-space-in-pubkey
fix: do not try to store contacts not matching pubkey regex in wrapper
2 years ago
Audric Ackermann 7c16ce9da4 fix: do not try to store contacts not matching pubkey regex in wrapper
also remove existing convo with spaces and 05 on start
2 years ago
keejef 1cc4e6962b fix: revert unintentional remote push 2 years ago
keejef c299eb06aa fix: prevent installs on old windows versions 2 years ago
keejef 8f2a41bc13 feat: Allow enter to break line in settings
https://github.com/oxen-io/session-desktop/issues/1486
2 years ago
Audric Ackermann 83079a8b4c
Merge pull request #2915 from Bilb/chore/update-build-instructions
chore: add cmake installation in contributing.md
2 years ago
Ruben Garcia b3fb16eee5 Merge branch 'clearnet' into RenameMultipleAttachments 2 years ago
Audric Ackermann b550547fcf
Merge pull request #2924 from oxen-io/unstable
chore: bump to 1.11.3
2 years ago
Audric Ackermann 3f4c5a85e9
Merge pull request #2923 from Bilb/chore/update-electron
chore: update electron to v25.8.1
2 years ago
Audric Ackermann 383b24c859 chore: bump to 1.11.3 2 years ago
Audric Ackermann 3fd1fcb9c0 chore: update electron to v25.8.1
Relates CVE-2023-4863

Relates #2922
2 years ago
Ruben Garcia e5b7ca4d07 fix: yarn ready 2 years ago
Ruben Garcia 87e85c3cbb fix: pass index down so attachments with no name get the proper suffix 2 years ago
Ruben Garcia af9f6c7586 docs: tab to spaces 2 years ago
Ruben Garcia a992dd17c9 Merge branch 'clearnet' into RenameMultipleAttachments 2 years ago
Audric Ackermann ab556cdd4a chore: add cmake installation in contributing.md 2 years ago
Audric Ackermann b36155ad0b
Merge pull request #2913 from oxen-io/unstable
Fix KeeJef gpg pubkey link
2 years ago
Audric Ackermann 6cef1a3e0a
Merge pull request #2912 from jagerman/fix-pubkey-url
Fix KeeJef gpg pubkey link
2 years ago
Jason Rhinelander b484ae2a49
Fix KeeJef gpg pubkey link 2 years ago
Audric Ackermann ef848d2851
Merge pull request #2910 from oxen-io/unstable
fix: use network time for emoji reacts syncing
2 years ago