diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7965a2d88..80a4112c8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,47 +3,38 @@ ## Advice for new contributors Start small. The PRs most likely to be merged are the ones that make small, -easily reviewed changes with clear and specific intentions. See below for more +easily reviewed changes with clear and specific intentions. [guidelines on pull requests](#pull-requests). It's a good idea to gauge interest in your intended work by finding the current issue -for it or creating a new one yourself. You can use also that issue as a place to signal +for it or creating a new one yourself. Use Github issues as a place to signal your intentions and get feedback from the users most likely to appreciate your changes. -If you intend to make a pull request for a new feature and the feature is user facing, -please let us know in a new, or existing issue, so we can guide your efforts around -UX/UI considerations. -You're most likely to have your pull request accepted easily if it addresses bugs already -in the [Next Steps project](https://github.com/oxen-io/session-desktop/projects/1), -especially if they are near the top of the Backlog column. Those are what we'll be looking -at next, so it would be great if you helped us out! +You're most likely to have your pull request accepted if it addresses an existing Github issue marked with the [good-first-issue](https://github.com/oxen-io/session-desktop/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) tag, these issues are specifically tagged, because they are generally features/bug fixes which can be cleanly merged on a single platform without requiring cross platform work, are generally of lower complexity than larger features and are non contentious, meaning that the core team doesn't need to try and assess the community desire for such a feature before merging. -Once you've spent a little bit of time planning your solution, it's a good idea to go -back to the issue and talk about your approach. We'd be happy to provide feedback. [An -ounce of prevention, as they say!](https://www.goodreads.com/quotes/247269-an-ounce-of-prevention-is-worth-a-pound-of-cure) +Of course we encourage community developers to work on ANY issue filed on our Github regardless of how it’s tagged, however if you pick up or create an issue without the “Good first issue” tag it would be best if you leave a comment on the issue so that the core team can give you any guidance required, especially around UI heavy features or issues which require cross platform integration. ## Developer Setup First, you'll need [Node.js](https://nodejs.org/) which matches our current version. You can check [`.nvmrc` in the `clearnet` branch](https://github.com/oxen-io/session-desktop/blob/clearnet/.nvmrc) to see what the current version is. If you have [nvm](https://github.com/creationix/nvm) you can just run `nvm use` in the project directory and it will switch to the project's -desired Node.js version. [nvm for windows](https://github.com/coreybutler/nvm-windows) is -still useful, but it doesn't support `.nvmrc` files. +desired Node.js version. + +If you are using Windows [nvm for windows](https://github.com/coreybutler/nvm-windows) is +still useful, but it doesn't support `.nvmrc` files. In this case you will need to `nvm install` the projects node version and `nvm use` the installed version Then you need `git`, if you don't have that yet: https://git-scm.com/ +## Platform Specific Instructions + ### macOS 1. Install the [Xcode Command-Line Tools](http://osxdaily.com/2014/02/12/install-command-line-tools-mac-os-x/). ### Windows -1. **Windows 7 only:** - - Install Microsoft .NET Framework 4.5.1: - https://www.microsoft.com/en-us/download/details.aspx?id=40773 - - Install Windows SDK version 8.1: https://developer.microsoft.com/en-us/windows/downloads/sdk-archive -1. Install _Windows Build Tools_: Open the [Command Prompt (`cmd.exe`) as Administrator]() - and run: `npm install --vs2015 --global --production --add-python-to-path windows-build-tools` +Building on Windows versions 8+ is supported out of the box ### Linux @@ -54,6 +45,12 @@ Then you need `git`, if you don't have that yet: https://git-scm.com/ 1. Install `make` 1. Depending on your distro, you might need to install `hunspell` and `hunspell-` (e.g. `hunspell-en-au`) +If you are using a Debian based Linux distribution gcc, g++ and make can be installed as part of the `build-essential` package using + +``` +apt install build-essential +``` + ### All platforms Now, run these commands in your preferred terminal in a good directory for development: @@ -136,25 +133,20 @@ The easiest way to run all tests at once is `yarn test`. So you wanna make a pull request? Please observe the following guidelines. - - - First, make sure that your `yarn ready` run passes - it's very similar to what our Continuous Integration servers do to test the app. - Never use plain strings right in the source code - pull them from `messages.json`! You **only** need to modify the default locale [`_locales/en/messages.json`](_locales/en/messages.json). - + uploaded to Crowdin for translation. +- Please do not submit pull requests for pure translation fixes. Anyone can update + the translations at [Crowdin](https://crowdin.com/project/session-desktop). - [Rebase](https://nathanleclaire.com/blog/2014/09/14/dont-be-scared-of-git-rebase/) your - changes on the latest `development` branch, resolving any conflicts. + changes on the latest `clearnet` branch, resolving any conflicts. This ensures that your changes will merge cleanly when you open your PR. - Be sure to add and run tests! -- Make sure the diff between our master and your branch contains only the +- Make sure the diff between `clearnet` and your branch contains only the minimal set of changes needed to implement your feature or bugfix. This will make it easier for the person reviewing your code to approve the changes. Please do not submit a PR with commented out code or unfinished features. @@ -174,7 +166,6 @@ So you wanna make a pull request? Please observe the following guidelines. choices that may be helpful to someone reviewing or auditing the commit history in the future. When in doubt, err on the side of a longer commit message. - Above all, spend some time with the repository. Follow the pull request template added to your pull request description automatically. Take a look at recent approved pull requests, see how they did things. diff --git a/BUILDING.md b/INTERNALBUILDS.md similarity index 95% rename from BUILDING.md rename to INTERNALBUILDS.md index ad7374aaf..7d0f77d65 100644 --- a/BUILDING.md +++ b/INTERNALBUILDS.md @@ -1,5 +1,7 @@ # Building +This document alongside [Releasing.md](RELEASING.md) primarily cover our internal build process for release builds, if you are an external contributor please refer to [Contributing.md](CONTRIBUTING.md) for building instructions. + ## Automated Automatic building of session binaries is done using github actions. Windows and linux binaries will build right out of the box but there are some extra steps needed for Mac OS diff --git a/README.md b/README.md index 486e18ed6..a37e03d5f 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,11 @@ Session integrates directly with [Oxen Service Nodes](https://docs.oxen.io/about ## Want to Contribute? Found a Bug or Have a feature request? -Please search for any [existing issues](https://github.com/oxen-io/session-desktop/issues) that describe your bugs in order to avoid duplicate submissions.

Submissions can be made by making a pull request to our development branch. If you don't know where to start contributing, try reading the Github issues page for ideas. +Please search for any [existing issues](https://github.com/oxen-io/session-desktop/issues) that describe your bug in order to avoid duplicate submissions.

Submissions can be made by making a pull request to our development branch.If you don't know where to start contributing please read [Contributing.md](CONTRIBUTING.md) and refer to issues tagged with the [Good-first-issue](https://github.com/oxen-io/session-desktop/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) tag. ## Build instruction -Build instructions can be found in [BUILDING.md](BUILDING.md). - +Build instructions can be found in [Contributing.md](CONTRIBUTING.md). ## Verifying signatures @@ -55,5 +54,5 @@ Please visit https://deb.oxen.io/
Copyright 2011 Whisper Systems
Copyright 2013-2017 Open Whisper Systems
-Copyright 2019-2021 The Oxen Project
+Copyright 2019-2023 The Oxen Project
Licensed under the GPLv3: https://www.gnu.org/licenses/gpl-3.0.html
diff --git a/_locales/en/messages.json b/_locales/en/messages.json index beeefcc03..e43489841 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -31,7 +31,7 @@ "openGroupInvitation": "Community invitation", "joinOpenGroupAfterInvitationConfirmationTitle": "Join $roomName$?", "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?", - "couldntFindServerMatching": "Couldn't find the corresponding opengroup server", + "couldntFindServerMatching": "Couldn't find the corresponding Community server", "enterSessionIDOrONSName": "Enter Session ID or ONS name", "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.", "loading": "Loading...",