From 2740ff8c4c786381f45a48cf0437bc3f9005067e Mon Sep 17 00:00:00 2001 From: Diogo Cordeiro Date: Wed, 12 Jun 2019 00:39:50 +0100 Subject: [PATCH] [DOCUMENTATION] Minor corrections Add two missing contributors Bumped patch due to changed introduced with 0583a6a904 --- CODE_OF_CONDUCT.md | 95 +++++++++++++++++++ .../CONTRIBUTING/README.md => CONTRIBUTING.md | 92 +----------------- CREDITS.md | 3 + README.md | 26 ++++- lib/framework.php | 2 +- 5 files changed, 123 insertions(+), 95 deletions(-) create mode 100644 CODE_OF_CONDUCT.md rename DOCUMENTATION/DEVELOPERS/CONTRIBUTING/README.md => CONTRIBUTING.md (57%) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000000..038e00418a --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,95 @@ +## Code of Conduct + +### Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +nationality, personal appearance, race, religion, or sexual identity and +orientation. + +### Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or +advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +### Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +### Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +### Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at mattl@gnu.org. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +### Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ + + +## The Code of Conflict + +GNU social has a high submission standard and we want to keep quality code in the +codebase and bad code out of it. As such your code will be closely scrutinized, +and you might take this criticism personally. Please understand that this is +meant to keep the standards of the codebase up, and isn't meant personally. All +the same, this isn't an excuse for poor behaviour, and a reviewer shouldn't be +misbehaving towards submitters. + + +If however, anyone feels personally abused, threatened, or otherwise +uncomfortable due to this process, that is not acceptable. If so, please +contact the project team at mattl@gnu.org, and they will work to resolve the issue +to the best of their ability. + +As a reviewer of code, please strive to keep things civil and focused on the +technical issues involved. We are all humans, and frustrations can be high on +both sides of the process. Try to keep in mind the immortal words of Bill and +Ted, "Be excellent to each other." diff --git a/DOCUMENTATION/DEVELOPERS/CONTRIBUTING/README.md b/CONTRIBUTING.md similarity index 57% rename from DOCUMENTATION/DEVELOPERS/CONTRIBUTING/README.md rename to CONTRIBUTING.md index 1c7d0d9c15..5911177970 100644 --- a/DOCUMENTATION/DEVELOPERS/CONTRIBUTING/README.md +++ b/CONTRIBUTING.md @@ -13,9 +13,10 @@ There's a few files you should read before going forward with a merge request or a patch submission. They detail what this file touches on in brief. They are: -* coding_standards.md: How your code should be structured and formatted to be +* `DOCUMENTATION/DEVELOPERS/CONTRIBUTING/coding_standards.md`: How your code should be structured and formatted to be accepted into the GNU social codebase. -* merge_request_checklist.md: A quick checklist to review before submission. +* `/DOCUMENTATION/DEVELOPERS/CONTRIBUTING/merge_request_checklist.md`: A quick checklist to review before submission. + ## Merge Request Process @@ -26,93 +27,6 @@ are: do not have permission to do that, you may request the second reviewer to merge it for you. -## Code of Conduct - -### Our Pledge - -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to making participation in our project and -our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, gender identity and expression, level of experience, -nationality, personal appearance, race, religion, or sexual identity and -orientation. - -### Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or -advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic - address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -### Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable -behavior and are expected to take appropriate and fair corrective action in -response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or -reject comments, commits, code, wiki edits, issues, and other contributions -that are not aligned to this Code of Conduct, or to ban temporarily or -permanently any contributor for other behaviors that they deem inappropriate, -threatening, offensive, or harmful. - -### Scope - -This Code of Conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. Examples of -representing a project or community include using an official project e-mail -address, posting via an official social media account, or acting as an appointed -representative at an online or offline event. Representation of a project may be -further defined and clarified by project maintainers. - -### Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at [INSERT EMAIL ADDRESS]. All -complaints will be reviewed and investigated and will result in a response that -is deemed necessary and appropriate to the circumstances. The project team is -obligated to maintain confidentiality with regard to the reporter of an incident. -Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by other -members of the project's leadership. - -### Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at [http://contributor-covenant.org/version/1/4][version] - -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ - - -## The Code of Conflict - -GNU social has a high submission standard and we want to keep quality code in the -codebase and bad code out of it. As such your code will be closely scrutinized, -and you might take this criticism personally. Please understand that this is -meant to keep the standards of the codebase up, and isn't meant personally. All -the same, this isn't an excuse for poor behaviour, and a reviewer shouldn't be -misbehaving towards submitters. The Code of Conflict outlines the dispute -resolution mechanism if something does come up, so give it a read. - - ## Coding Standards Since we will be expected to maintain your code once it's submitted, we ask you diff --git a/CREDITS.md b/CREDITS.md index 172e16d930..79651fbbf4 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -13,6 +13,7 @@ Current team * Diogo Cordeiro * Bruno Casteleiro * Miguel Dantas +* Alexei Sorokin Additional Contributors ----------------------- @@ -54,6 +55,8 @@ Additional Contributors * Moonman * Normandy * Verius +* Alexei Sorokin +* Daniel Supernault Credits for StatusNet -------------- diff --git a/README.md b/README.md index b04a465e04..b6d1dd89d1 100644 --- a/README.md +++ b/README.md @@ -9,14 +9,14 @@ project. The file INSTALL.md has useful instructions on how to install this software. -System administrators may find the DOCUMENTATION/SYSTEM_ADMINISTRATORS +System administrators may find the `DOCUMENTATION/SYSTEM_ADMINISTRATORS` directory useful, namely: - upgrade_from: upgrading from different software - CONFIGURE.md: configuration options in gruesome detail. - PLUGINS.md: how to install and configure plugins. -Developers may find the DOCUMENTATION/DEVELOPERS directory useful. +Developers may find the `DOCUMENTATION/DEVELOPERS` directory useful. ## About @@ -121,12 +121,13 @@ In the current phase of development it is probably recommended to use git as a means to stay up to date with the source code. You can choose between these branches: -- master "stable", usually working well -- nightly "unstable", most updates, not always working as expected +* 1.20.x "oldstable", few updates, well tested coded +* master "stable", usually working well +* nightly "testing", most updates, not always working as expected To keep it up-to-date, use `git pull`. Watch for conflicts! -As in any upgrade, do `not` forget to run `/scripts/upgrade.php`. +As in any upgrade, do __not__ forget to run `/scripts/upgrade.php`. ## Further information @@ -139,3 +140,18 @@ There are several ways to get more information about GNU social. * GNU social has a bug tracker for any defects you may find, or ideas for making things better. * Patches are welcome, preferrably to our repository on notabug.org. + +## Credits + +An incomplete list of developers who've worked on GNU social, +or its predecessors StatusNet and Free Social has been made available +in `CREDITS.md`. + +### Current team + +* Matt Lee +* Mikael Nordfeldth +* Diogo Cordeiro +* Bruno Casteleiro +* Miguel Dantas +* Alexei Sorokin diff --git a/lib/framework.php b/lib/framework.php index d9149c1945..43aa0ade08 100644 --- a/lib/framework.php +++ b/lib/framework.php @@ -32,7 +32,7 @@ defined('GNUSOCIAL') || die(); define('GNUSOCIAL_ENGINE', 'GNU social'); define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/social/'); -define('GNUSOCIAL_BASE_VERSION', '1.20.0'); +define('GNUSOCIAL_BASE_VERSION', '1.20.1'); define('GNUSOCIAL_LIFECYCLE', 'release'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release' define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE);