From 826af1a32bc0f701d0276b678b6ff46f567866a4 Mon Sep 17 00:00:00 2001 From: Mulyawan-spec Date: Wed, 11 Sep 2024 12:00:29 +0700 Subject: [PATCH 1/3] give example in markdown contributing to twenty --- .github/CONTRIBUTING.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8a57d7b34744..f8d73095b805 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -47,6 +47,13 @@ cd twenty ```shell git checkout -b your-branch-name ``` + + +#### **Example** + +```shell +git checkout -b twenty-my-branch +``` 4. **Make Changes:** Make your desired changes and ensure that your code adheres to Twenty's coding standards. @@ -60,6 +67,7 @@ git checkout -b your-branch-name ```shell git commit -m "Add your detailed description here" ``` + 7. **Push Changes:** Push your changes to your forked repository. From ff6db272febfe804ddc9bc090eae333e3bc73948 Mon Sep 17 00:00:00 2001 From: Mulyawan-spec Date: Thu, 12 Sep 2024 08:12:56 +0700 Subject: [PATCH 2/3] add a file contributing_example.md on folder .github --- .github/CONTIBUTING_EXAMPLE.md | 93 ++++++++++++++++++++++++++++++++++ .github/CONTRIBUTING.md | 7 --- README.md | 2 + 3 files changed, 95 insertions(+), 7 deletions(-) create mode 100644 .github/CONTIBUTING_EXAMPLE.md diff --git a/.github/CONTIBUTING_EXAMPLE.md b/.github/CONTIBUTING_EXAMPLE.md new file mode 100644 index 000000000000..76b3c2255d07 --- /dev/null +++ b/.github/CONTIBUTING_EXAMPLE.md @@ -0,0 +1,93 @@ +# Contributing to Twenty + + +Thank you for considering contributing to Twenty! All community contributions are welcome. + +This guide outlines the process for contributing to this project. Please make sure to go through the [documentation](https://docs.twenty.com) before making your contribution. + +> And if you like the project, but just don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation: +> - Star the project +> - Tweet about it + +
+ +## Getting Started + +Good first issues are a great way to start contributing to the project and get familiar with the codebase. Here's how to find them: + +1. Visit the "[Issues](https://github.com/twentyhq/twenty/issues)" tab on the main [repository](https://github.com/twentyhq/twenty). + +2. Use the "Labels" filter and select "[Good First Issue](https://github.com/twentyhq/twenty/labels/good%20first%20issue)" to see a list of beginner-friendly tasks. + +3. Choose an issue that interests you, fork the project, and start working on it. Once you solve and test the issue, open a PR for review. + +Note: We are aware that having multiple contributors address the same issue can cause frustration. To prevent this, we adhere to a specific guideline: if a core team member has assigned an issue to a contributor, either as the issue assignee or through explicit assignment in the issue comments within the past three days, that contributor's pull request takes precedence. Otherwise, the first PR submitted will be given priority. This delay is reduced to one day for PR tagged with "size: minutes" and extended to a week for PR tagged "size: days". + +Therefore, ensure you are assigned to an issue before beginning work on it. + +
+ +## Contributing Guidelines + +1. **Fork the Repository:** Click on the 'Fork' button in the upper right corner of the repository's GitHub page. This will create a copy of the repository in your GitHub account. + + +2. **Clone the Repository:** Clone your forked repository to your local machine using `git clone`. + +```shell +git clone https://github.com/yourusername/twenty.git +cd twenty +``` + +3. **Create a New Branch:** Create a new branch for your changes instead of using the main branch. + +```shell +git checkout -b your-branch-name +``` + + +**Example** + +```shell +git checkout -b twenty-my-branch +``` + +4. **Make Changes:** Make your desired changes and ensure that your code adheres to Twenty's coding standards. + +5. **Test Locally:** Test your changes locally to ensure they work as expected. + +6. **Commit Changes:** Commit your changes with a clear and concise commit message. + +```shell +git commit -m "Add your detailed description here" +``` + +7. **Push Changes:** Push your changes to your forked repository. + +```shell +git push origin your-branch-name +``` + +8. **Create a Pull Request:** Go to the original Twenty repository and create a pull request. Please provide a detailed description of your changes. To have your pull request accepted, you must sign a CLA. + +9. **Code Review:** Your pull request will undergo a code review. Note that you might need to make any necessary adjustments based on feedback. + +10. **Merge:** Once approved, maintainers will merge your pull request into the main repository. + +
+ +## Code of Conduct + +Please note that by contributing to this project, you're expected to follow Twenty's [Code of Conduct](./CODE_OF_CONDUCT.md). All maintainers strive to maintain a welcoming, friendly, and inclusive community for all contributors. + +
+ +## Reporting Issues + +If you encounter any issues or have suggestions for improvements, please feel free to (create an issue on Twenty's GitHub repository)[https://github.com/twentyhq/twenty/issues/new]. When reporting issues, please provide as much detail as possible to help in understanding and addressing the problem effectively. + +--- + +
+Thank you for considering contributing to Twenty. Your contributions help make Twenty's CRM platform even better! + diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f8d73095b805..46c2f1905cf5 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -47,13 +47,6 @@ cd twenty ```shell git checkout -b your-branch-name ``` - - -#### **Example** - -```shell -git checkout -b twenty-my-branch -``` 4. **Make Changes:** Make your desired changes and ensure that your code adheres to Twenty's coding standards. diff --git a/README.md b/README.md index d46caec8d4f9..f0c96b0a32ac 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ We felt the need for a CRM platform that empowers rather than constrains. We bel # Demo Go to demo.twenty.com and login with the following credentials: + ``` email: noah@demo.dev password: Applecar2025 @@ -67,6 +68,7 @@ Below are some features we have implemented to date: + [Create tasks on records](#create-tasks-on-records) + [Navigate quickly through the app using keyboard shortcuts and search](#navigate-quickly-through-the-app-using-keyboard-shortcuts-and-search) + ## Add, filter, sort, edit, and track customers:

From dc951b1b3c0824c9a2cadba54d0df32c8dc8eea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Malfait?= Date: Thu, 12 Sep 2024 12:31:06 +0200 Subject: [PATCH 3/3] Contributing.md update --- .github/CODE_OF_CONDUCT.md | 2 +- .github/CONTIBUTING_EXAMPLE.md | 93 ---------------------------------- .github/CONTRIBUTING.md | 58 ++++++--------------- 3 files changed, 17 insertions(+), 136 deletions(-) delete mode 100644 .github/CONTIBUTING_EXAMPLE.md diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md index 10ab982ff999..8897ad01ab38 100644 --- a/.github/CODE_OF_CONDUCT.md +++ b/.github/CODE_OF_CONDUCT.md @@ -2,7 +2,7 @@ ## Twenty's Pledge -The contributors and maintainers of this project pledge to ensure a harassment-free experience for everyone in the community. This commitment applies to individuals of all backgrounds, including age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity, experience, education, socio-economic status, nationality, appearance, race, religion. It also applies to individuals of all sexual identities and orientations. +The contributors and maintainers of this project pledge to ensure a harassment-free experience for everyone in the community. The focus of both contributors and maintainers is on acting and interacting in ways that promote an open, welcoming, friendly, diverse, inclusive, and healthy community. diff --git a/.github/CONTIBUTING_EXAMPLE.md b/.github/CONTIBUTING_EXAMPLE.md deleted file mode 100644 index 76b3c2255d07..000000000000 --- a/.github/CONTIBUTING_EXAMPLE.md +++ /dev/null @@ -1,93 +0,0 @@ -# Contributing to Twenty - - -Thank you for considering contributing to Twenty! All community contributions are welcome. - -This guide outlines the process for contributing to this project. Please make sure to go through the [documentation](https://docs.twenty.com) before making your contribution. - -> And if you like the project, but just don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation: -> - Star the project -> - Tweet about it - -
- -## Getting Started - -Good first issues are a great way to start contributing to the project and get familiar with the codebase. Here's how to find them: - -1. Visit the "[Issues](https://github.com/twentyhq/twenty/issues)" tab on the main [repository](https://github.com/twentyhq/twenty). - -2. Use the "Labels" filter and select "[Good First Issue](https://github.com/twentyhq/twenty/labels/good%20first%20issue)" to see a list of beginner-friendly tasks. - -3. Choose an issue that interests you, fork the project, and start working on it. Once you solve and test the issue, open a PR for review. - -Note: We are aware that having multiple contributors address the same issue can cause frustration. To prevent this, we adhere to a specific guideline: if a core team member has assigned an issue to a contributor, either as the issue assignee or through explicit assignment in the issue comments within the past three days, that contributor's pull request takes precedence. Otherwise, the first PR submitted will be given priority. This delay is reduced to one day for PR tagged with "size: minutes" and extended to a week for PR tagged "size: days". - -Therefore, ensure you are assigned to an issue before beginning work on it. - -
- -## Contributing Guidelines - -1. **Fork the Repository:** Click on the 'Fork' button in the upper right corner of the repository's GitHub page. This will create a copy of the repository in your GitHub account. - - -2. **Clone the Repository:** Clone your forked repository to your local machine using `git clone`. - -```shell -git clone https://github.com/yourusername/twenty.git -cd twenty -``` - -3. **Create a New Branch:** Create a new branch for your changes instead of using the main branch. - -```shell -git checkout -b your-branch-name -``` - - -**Example** - -```shell -git checkout -b twenty-my-branch -``` - -4. **Make Changes:** Make your desired changes and ensure that your code adheres to Twenty's coding standards. - -5. **Test Locally:** Test your changes locally to ensure they work as expected. - -6. **Commit Changes:** Commit your changes with a clear and concise commit message. - -```shell -git commit -m "Add your detailed description here" -``` - -7. **Push Changes:** Push your changes to your forked repository. - -```shell -git push origin your-branch-name -``` - -8. **Create a Pull Request:** Go to the original Twenty repository and create a pull request. Please provide a detailed description of your changes. To have your pull request accepted, you must sign a CLA. - -9. **Code Review:** Your pull request will undergo a code review. Note that you might need to make any necessary adjustments based on feedback. - -10. **Merge:** Once approved, maintainers will merge your pull request into the main repository. - -
- -## Code of Conduct - -Please note that by contributing to this project, you're expected to follow Twenty's [Code of Conduct](./CODE_OF_CONDUCT.md). All maintainers strive to maintain a welcoming, friendly, and inclusive community for all contributors. - -
- -## Reporting Issues - -If you encounter any issues or have suggestions for improvements, please feel free to (create an issue on Twenty's GitHub repository)[https://github.com/twentyhq/twenty/issues/new]. When reporting issues, please provide as much detail as possible to help in understanding and addressing the problem effectively. - ---- - -
-Thank you for considering contributing to Twenty. Your contributions help make Twenty's CRM platform even better! - diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 46c2f1905cf5..bbaa50483fc9 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,47 +1,38 @@ # Contributing to Twenty +Thanks for considering contributing to Twenty! -Thank you for considering contributing to Twenty! All community contributions are welcome. - -This guide outlines the process for contributing to this project. Please make sure to go through the [documentation](https://docs.twenty.com) before making your contribution. - - -> And if you like the project, but just don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation: -> - Star the project -> - Tweet about it - +Please make sure to go through the [documentation](https://docs.twenty.com) before.
-## Getting Started - -Good first issues are a great way to start contributing to the project and get familiar with the codebase. Here's how to find them: - -1. Visit the "[Issues](https://github.com/twentyhq/twenty/issues)" tab on the main [repository](https://github.com/twentyhq/twenty). -2. Use the "Labels" filter and select "[Good First Issue](https://github.com/twentyhq/twenty/labels/good%20first%20issue)" to see a list of beginner-friendly tasks. -3. Choose an issue that interests you, fork the project, and start working on it. Once you solve and test the issue, open a PR for review. +## Good first issues -Note: We are aware that having multiple contributors address the same issue can cause frustration. To prevent this, we adhere to a specific guideline: if a core team member has assigned an issue to a contributor, either as the issue assignee or through explicit assignment in the issue comments within the past three days, that contributor's pull request takes precedence. Otherwise, the first PR submitted will be given priority. This delay is reduced to one day for PR tagged with "size: minutes" and extended to a week for PR tagged "size: days". +Good first issues are a great way to start contributing and get familiar with the codebase. You can find them on by filtering on the [good first issue](https://github.com/twentyhq/twenty/labels/good%20first%20issue) label. -Therefore, ensure you are assigned to an issue before beginning work on it. +## Issue assignment -
+Having multiple contributors address the same issue can cause frustration. +To avoid conflicts, we follow these guidelines: +1. If a core team member assigned you the issue within the last three days, your PR takes priority. +2. Otherwise, the first submitted PR is prioritized. +3. For "size: long" PRs, the assignment period extends to one week. -## Contributing Guidelines +Please ensure you're assigned to an issue before starting work. +## How to Contribute 1. **Fork the Repository:** Click on the 'Fork' button in the upper right corner of the repository's GitHub page. This will create a copy of the repository in your GitHub account. - 2. **Clone the Repository:** Clone your forked repository to your local machine using `git clone`. - ```shell git clone https://github.com/yourusername/twenty.git cd twenty ``` + 3. **Create a New Branch:** Create a new branch for your changes instead of using the main branch. ```shell @@ -56,41 +47,24 @@ git checkout -b your-branch-name 6. **Commit Changes:** Commit your changes with a clear and concise commit message. - ```shell git commit -m "Add your detailed description here" ``` 7. **Push Changes:** Push your changes to your forked repository. - ```shell git push origin your-branch-name ``` +8. **Create a Pull Request:** Go to the original Twenty repository and create a pull request. Please provide a detailed description of your changes. Submitting a PR means you agree to the CLA. -8. **Create a Pull Request:** Go to the original Twenty repository and create a pull request. Please provide a detailed description of your changes. To have your pull request accepted, you must sign a CLA. - - -9. **Code Review:** Your pull request will undergo a code review. Note that you might need to make any necessary adjustments based on feedback. - +9. **Code Review:** Your pull request will undergo a code review. 10. **Merge:** Once approved, maintainers will merge your pull request into the main repository. -
- -## Code of Conduct - -Please note that by contributing to this project, you're expected to follow Twenty's [Code of Conduct](./CODE_OF_CONDUCT.md). All maintainers strive to maintain a welcoming, friendly, and inclusive community for all contributors. - -
## Reporting Issues -If you encounter any issues or have suggestions for improvements, please feel free to (create an issue on Twenty's GitHub repository)[https://github.com/twentyhq/twenty/issues/new]. When reporting issues, please provide as much detail as possible to help in understanding and addressing the problem effectively. - ---- - -Thank you for considering contributing to Twenty. Your contributions help make Twenty's CRM platform even better! - +If you face any issues or have suggestions, please feel free to (create an issue on Twenty's GitHub repository)[https://github.com/twentyhq/twenty/issues/new]. Please provide as much detail as possible. \ No newline at end of file