Commit Graph

12496 Commits (67f569e9e345828f411b07e58cec39d789b0fd10)
 

Author SHA1 Message Date
Audric Ackermann 67f569e9e3
Merge pull request #2917 from RubenGarcia/RenameMultipleAttachments
Rename multiple attachments
1 year ago
Audric Ackermann e39c276bcc
Merge pull request #2958 from oxen-io/pull-crowdin
chore: pull crowdin changes
1 year ago
Audric Ackermann 50afa68b1f chore: pull crowdin changes 1 year ago
Ruben Garcia 916babb9d0 fix: requested changes by Bilb 1 year 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 3b6dae7c7a chore: bump to session 1.11.4 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
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
Audric Ackermann fbbb67ea47
Merge pull request #2906 from Bilb/fix-emoji-react-syncing
fix: use network time for emoji reacts syncing
2 years ago
Audric Ackermann c3c2d65e6e
Merge pull request #2907 from oxen-io/unstable
fix: menu positioning after upgrade of dep
2 years ago
Audric Ackermann 1bdd8ca64c fix: menu positioning after upgrade of dep 2 years ago
Audric Ackermann 592d1f010f fix: use network time for emoji reacts syncing 2 years ago
Audric Ackermann ab91cc0995
Merge pull request #2904 from oxen-io/unstable
fix save as message context menu
2 years ago
Audric Ackermann dec848815a
Merge pull request #2903 from Bilb/fix-attachment-right-click-save-as
Fix attachment right click save as
2 years ago
Audric Ackermann c0ce1ede5b chore: add note for save as logic 2 years ago
Audric Ackermann 9199c7b529 fix: fix save as menu item + bump react-contexify to 6.0.0 2 years ago
Audric Ackermann eb4631ff99 chore: bump to session 1.11.2 2 years ago
Audric Ackermann 6c9890f3f9
Merge pull request #2901 from oxen-io/unstable
fix: fix synced messages sometimes not appearing
2 years ago
Audric Ackermann 5440388fb8
Merge pull request #2900 from Bilb/fix-synced-messages-when-wrapper-more-recent
fix: fix synced messages sometimes not appearing
2 years ago
Audric Ackermann e98c9720c8 fix: fix synced messages sometimes not appearing 2 years ago
Audric Ackermann 82e079832d
Merge pull request #2899 from Bilb/chore/add-supported-platforms-readme
chore: add supported platforms in readme
2 years ago
Audric Ackermann a973f62f63 chore: add supported platforms in readme 2 years ago
Audric Ackermann e75adaa754
Merge pull request #2897 from yougotwill/dx-commit-experience-revert
Dx commit experience revert
2 years ago
William Grant 153a6499ef chore: disable pre commit lint-staged hook for now
buildLintCommand is broken if you have a lint error in a file the commit fails silently
2 years ago
William Grant ff656de82b fix: lint-staged ignores files using eslintignore 2 years ago
Audric Ackermann 5fcad9ce4d
Merge pull request #2896 from oxen-io/clearnet
merge clearnet to unstable
2 years ago
Audric Ackermann 4cd4193b6b chore: add caching to eslint on git commit 2 years ago
Audric Ackermann d0ad89196d
Merge pull request #2891 from yougotwill/dx_commit_experience
Improved Git Committing
2 years ago
William Grant db8c309954 fix: no longer need to run yarn watch to fix eslint unresolved imports in vs code 2 years ago
William Grant 22036000a6 feat: added conventional commit requirement
use npx for husky hooks
2 years ago
William Grant 4d60c63f84 feat: setup lint-staged when making a commit 2 years ago
Ruben Garcia 6ac328f0c3 Merge branch 'clearnet' into RenameMultipleAttachments 2 years ago