Skip to content

Commit

Permalink
Rename main branch into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
evilaliv3 committed Oct 27, 2024
1 parent bfdb9a6 commit 7b22d1a
Show file tree
Hide file tree
Showing 20 changed files with 47 additions and 47 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ name: Codacy Security Scan

on:
push:
branches: [ "main", "devel" ]
branches: [ "stable", "devel" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "main" ]
branches: [ "stable" ]
schedule:
- cron: '33 6 * * 2'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: "CodeQL"

on:
push:
branches: [ "main"]
branches: [ "stable"]
pull_request:
branches: [ "main", "devel"]
branches: [ "stable", "devel"]
schedule:
- cron: '15 14 * * 6'

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
name: Scorecard supply-chain security
on:
# For Branch-Protection check. Only the default branch is supported. See
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
# https://github.com/ossf/scorecard/blob/stable/docs/checks.md#branch-protection
branch_protection_rule:
# To guarantee Maintained check is occasionally updated. See
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
# https://github.com/ossf/scorecard/blob/stable/docs/checks.md#maintained
schedule:
- cron: '33 21 * * 4'
push:
branches: [ "main" ]
branches: [ "stable" ]

# Declare default permissions as read only.
permissions: read-all
Expand Down
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Copyright: 2011-2024 - GlobaLeaks

License: https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/LICENSE
License: https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/LICENSE

Original authors:
Arturo Filastò
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ As a contributor, here are the guidelines we would like you to read:
## <a name="coc"></a> Code of Conduct

Help us keep GlobaLeaks community safe and inclusive.
Please read and follow our [Code of Conduct](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/CODE_OF_CONDUCT.md).
Please read and follow our [Code of Conduct](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/CODE_OF_CONDUCT.md).

## <a name="question"></a> Got a Question or Problem?

Expand Down Expand Up @@ -81,7 +81,7 @@ Before you submit your Pull Request consider the following guidelines:

9. In GitHub, send a pull request to `GlobaLeaks:main`.

## <a name="donate"></a> Donations <img src="https://raw.githubusercontent.com/globaleaks/globaleaks-whistleblowing-software/main/brand/assets/heart.svg" alt="heart icon" width="24" />
## <a name="donate"></a> Donations <img src="https://raw.githubusercontent.com/globaleaks/globaleaks-whistleblowing-software/stable/brand/assets/heart.svg" alt="heart icon" width="24" />
As a pure community-driven project without major corporate backing, we also welcome [donations](https://github.com/sponsors/globaleaks).

- [Help Us Protect Whistleblowers—Become a GlobaLeaks Donor](https://github.com/sponsors/globaleaks)
Expand Down
14 changes: 7 additions & 7 deletions GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Introduction
[GlobaLeaks](https://www.globaleaks.org) is free, open source software enabling anyone to easily set up and maintain a secure whistleblowing platform.

The software project has been started in 2011 and [originally authored](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/AUTHORS) by Arturo Filastò, Claudio Agosti, Fabio Pietrosanti, Giovanni Pellerano and Michele Orrù.
The software project has been started in 2011 and [originally authored](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/AUTHORS) by Arturo Filastò, Claudio Agosti, Fabio Pietrosanti, Giovanni Pellerano and Michele Orrù.

Authored in 2021, this document is a responsible and tentative attempt to analyze the existing governance status, define roles and responsibilities in order to properly define a proper project governance and thus be sure to be able to continue to protect whistleblowers in the long run.

Expand All @@ -13,15 +13,15 @@ This section defines the main project roles and respective responsibilities for
### Project Lead
The Project Lead is responsible for coordinating the overall work of the GlobaLeaks team and of the GlobaLeaks FLOSS community with the aim of continuously improving the software and methodology and protecting whistleblowers.

The project is currently led by [Giovanni Pellerano](https://www.globaleaks.org/about/people/#giovanni-pellerano), who is currently the lead developer and has continuously guided and advised contributors and users since 2011. This lead role and responsibility is focused on doing what's best for this project, guiding contributors through the analysis of user requirements and the definition and execution of the [Project Roadmap](https://docs.globaleaks.org/en/main/roadmap/) in adherence to [Contributributors Guidelines](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/CONTRIBUTING.md) and the [Best Practices](https://bestpractices.coreinfrastructure.org/en/projects/3816).
The project is currently led by [Giovanni Pellerano](https://www.globaleaks.org/about/people/#giovanni-pellerano), who is currently the lead developer and has continuously guided and advised contributors and users since 2011. This lead role and responsibility is focused on doing what's best for this project, guiding contributors through the analysis of user requirements and the definition and execution of the [Project Roadmap](https://docs.globaleaks.org/en/stable/roadmap/) in adherence to [Contributributors Guidelines](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/CONTRIBUTING.md) and the [Best Practices](https://bestpractices.coreinfrastructure.org/en/projects/3816).

### Project Manager
The Project Manager is in charge of managing and coordinating the activities of the project.

[Susanna Ferro](https://www.globaleaks.org/about/people/#susanna-ferro) is the current Project Manager.

### Community Lead
The Community Lead is responsible for identifying community needs, verifying and enforcing the project’s [Code of Conduct](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/CODE_OF_CONDUCT.md), making sure everybody feels represented and safe.
The Community Lead is responsible for identifying community needs, verifying and enforcing the project’s [Code of Conduct](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/CODE_OF_CONDUCT.md), making sure everybody feels represented and safe.

[Rima Sghaier](https://www.globaleaks.org/about/people/#rima-sghaier) is the current Community Lead.

Expand All @@ -38,7 +38,7 @@ The Data Protection Officer (DPO) is responsible for educating the members of th
### Contributors
Everyone is welcome!

[Contributors](https://github.com/globaleaks/globaleaks-whistleblowing-software/graphs/contributors) are invited to adhere to the [Contributors Guidelines](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/CONTRIBUTING.md), participate in the project [Community Chat](https://community.globaleaks.org) and [Forum](https://forum.globaleaks.org) and to propose contributions opening Tickets and Pull Requests on the project’s [Ticketing System](https://github.com/globaleaks/globaleaks-whistleblowing-software/issues).
[Contributors](https://github.com/globaleaks/globaleaks-whistleblowing-software/graphs/contributors) are invited to adhere to the [Contributors Guidelines](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/CONTRIBUTING.md), participate in the project [Community Chat](https://community.globaleaks.org) and [Forum](https://forum.globaleaks.org) and to propose contributions opening Tickets and Pull Requests on the project’s [Ticketing System](https://github.com/globaleaks/globaleaks-whistleblowing-software/issues).

List of team members, current and previous contributors and related statistics can be found at:

Expand Down Expand Up @@ -79,7 +79,7 @@ Here are listed the main organizations behind the project’s governance and sus

* [Whistleblowing Solutions Impresa Sociale (S.r.l.)](https://www.whistleblowingsolutions.it/): an innovative social enterprise that carries out research and development to support whistleblowers and the fight against corruption. It was founded in 2016 to guarantee the economic sustainability of the GlobaLeaks project, through taking care of the growing number of requests for assistance, maintenance and custom deployment. WBS hosts the development activities and coordinates the community efforts.

* [Hermes Center for Transparency and Digital Human Rights (HERMES)](https://www.hermescenter.org/): a non-profit association founded in 2012 by a group of hacktivists, lawyers and digital rights defenders to host the development and implementation of open source technologies with the purpose of advocating for freedom of speech online and, more generally, the protection of human rights and personal freedom in a connected world. Fiscal sponsor for the initial GlobaLeaks development lifecycle is owner of the [AGPLv3 License](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/LICENSE) and [Trademark](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/brand/globaleaks-euipo-trademark-certificate.pdf).
* [Hermes Center for Transparency and Digital Human Rights (HERMES)](https://www.hermescenter.org/): a non-profit association founded in 2012 by a group of hacktivists, lawyers and digital rights defenders to host the development and implementation of open source technologies with the purpose of advocating for freedom of speech online and, more generally, the protection of human rights and personal freedom in a connected world. Fiscal sponsor for the initial GlobaLeaks development lifecycle is owner of the [AGPLv3 License](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/LICENSE) and [Trademark](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/brand/globaleaks-euipo-trademark-certificate.pdf).

## Possible improvements
The GlobaLeaks team looks forward to improving the project governance and is exploring the following possibilities:
Expand All @@ -93,7 +93,7 @@ Feedback is welcome by any former or new contributor.
## Annexes

* [Project Roadmap](https://docs.globaleaks.org/en/devel/roadmap/index.html)
* [Project Code of Conduct](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/CODE_OF_CONDUCT.md)
* [Contributors Guidelines](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/CONTRIBUTING.md)
* [Project Code of Conduct](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/CODE_OF_CONDUCT.md)
* [Contributors Guidelines](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/CONTRIBUTING.md)
* [Project Security Policy](https://github.com/globaleaks/globaleaks-whistleblowing-software/security/policy)
* [Project Best Practices](https://bestpractices.coreinfrastructure.org/en/projects/3816)
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div align="center">
<a href="https://www.globaleaks.org"><img src="https://raw.githubusercontent.com/globaleaks/globaleaks-whistleblowing-software/main/brand/assets/globaleaks-logo-color.png" width="400"></a>
<a href="https://www.globaleaks.org"><img src="https://raw.githubusercontent.com/globaleaks/globaleaks-whistleblowing-software/stable/brand/assets/globaleaks-logo-color.png" width="400"></a>
</div>

<div align="center">
<a href="https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-AGPLv3%2B-green" alt="License"></a> <a href="https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/CODE_OF_CONDUCT.md"><img src="https://img.shields.io/badge/Contributor%20Covenant-v2.1%20adopted-ff69b4.svg" alt="Code of Conduct"></a>
<a href="https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/LICENSE"><img src="https://img.shields.io/badge/license-AGPLv3%2B-green" alt="License"></a> <a href="https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/CODE_OF_CONDUCT.md"><img src="https://img.shields.io/badge/Contributor%20Covenant-v2.1%20adopted-ff69b4.svg" alt="Code of Conduct"></a>
</div>

[GlobaLeaks](https://www.globaleaks.org/) is free, open source whistleblowing software enabling anyone to easily set up and maintain a secure reporting platform.
Expand All @@ -13,7 +13,7 @@ The software is recognized by the [Digital Public Good Alliance](https://digital
## Continuous integration and testing
| Branch | Build Status | Test Status | Quality | Coverage | Documentation
| :---: | :---: | :---: | :---: | :---: | :---: |
| [main](https://github.com/globaleaks/globaleaks-whistleblowing-software/tree/main) | [![build workflow](https://github.com/globaleaks/globaleaks-whistleblowing-software/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/globaleaks/globaleaks-whistleblowing-software/actions/workflows/build.yml?query=branch%3Amain) | [![build workflow](https://github.com/globaleaks/globaleaks-whistleblowing-software/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/globaleaks/globaleaks-whistleblowing-software/actions/workflows/test.yml?query=branch%3Amain) | [![Codacy Badge](https://app.codacy.com/project/badge/Grade/c09f1ec9607f4546924d19798a98dd7d?branch=main)](https://app.codacy.com/gh/globaleaks/globaleaks-whistleblowing-software/dashboard) | [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/c09f1ec9607f4546924d19798a98dd7d?branch=main)](https://app.codacy.com/gh/globaleaks/globaleaks-whistleblowing-software/dashboard) | [![Build Status](https://readthedocs.org/projects/globaleaks/badge/?version=main&style=flat)](https://docs.globaleaks.org/en/main/)
| [main](https://github.com/globaleaks/globaleaks-whistleblowing-software/tree/main) | [![build workflow](https://github.com/globaleaks/globaleaks-whistleblowing-software/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/globaleaks/globaleaks-whistleblowing-software/actions/workflows/build.yml?query=branch%3Amain) | [![build workflow](https://github.com/globaleaks/globaleaks-whistleblowing-software/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/globaleaks/globaleaks-whistleblowing-software/actions/workflows/test.yml?query=branch%3Amain) | [![Codacy Badge](https://app.codacy.com/project/badge/Grade/c09f1ec9607f4546924d19798a98dd7d?branch=main)](https://app.codacy.com/gh/globaleaks/globaleaks-whistleblowing-software/dashboard) | [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/c09f1ec9607f4546924d19798a98dd7d?branch=main)](https://app.codacy.com/gh/globaleaks/globaleaks-whistleblowing-software/dashboard) | [![Build Status](https://readthedocs.org/projects/globaleaks/badge/?version=main&style=flat)](https://docs.globaleaks.org/en/stable/)
| [devel](https://github.com/globaleaks/globaleaks-whistleblowing-software/tree/devel) | [![build workflow](https://github.com/globaleaks/globaleaks-whistleblowing-software/actions/workflows/build.yml/badge.svg?branch=devel)](https://github.com/globaleaks/globaleaks-whistleblowing-software/actions/workflows/build.yml?query=branch%3Adevel) | [![test workflow](https://github.com/globaleaks/globaleaks-whistleblowing-software/actions/workflows/test.yml/badge.svg?branch=devel)](https://github.com/globaleaks/globaleaks-whistleblowing-software/actions/workflows/test.yml?query=branch%3Adevel) | [![Codacy Badge](https://app.codacy.com/project/badge/Grade/c09f1ec9607f4546924d19798a98dd7d?branch=devel)](https://app.codacy.com/gh/globaleaks/globaleaks-whistleblowing-software/dashboard?branch=devel) | [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/c09f1ec9607f4546924d19798a98dd7d?branch=devel)](https://app.codacy.com/gh/globaleaks/globaleaks-whistleblowing-software/dashboard?branch=devel) | [![Build Status](https://readthedocs.org/projects/globaleaks/badge/?version=devel&style=flat)](https://docs.globaleaks.org/en/devel/)

Project best practices and scores:
Expand All @@ -39,10 +39,10 @@ Join our [Community Chat](https://community.globaleaks.org) to get in touch with
* #development to participate in development discussions
* #community-support for the community support

In case you need to file a security report please check our [Security Policy](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/SECURITY.md).
In case you need to file a security report please check our [Security Policy](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/SECURITY.md).

## Contributions and Donations <img src="https://raw.githubusercontent.com/globaleaks/globaleaks-whistleblowing-software/main/brand/assets/heart.svg" alt="heart icon" width="24" />
Thank you! If you would like to to contribute to the project please check the [Contributors Guidelines](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/CONTRIBUTING.md).
## Contributions and Donations <img src="https://raw.githubusercontent.com/globaleaks/globaleaks-whistleblowing-software/stable/brand/assets/heart.svg" alt="heart icon" width="24" />
Thank you! If you would like to to contribute to the project please check the [Contributors Guidelines](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/CONTRIBUTING.md).

As a pure community-driven project without major corporate backing, we also welcome [donations](https://github.com/sponsors/globaleaks).

Expand All @@ -52,7 +52,7 @@ A big thank you to everyone who has already [contributed](https://github.com/glo

## Brand Guidelines and Brand Assets
Within the GlobaLeaks project we researched a nice and smooth brand style, using accessible colors and trying to communicate our values.
If you are planning some press releases, a conference, or promoting GlobaLeaks please keep at reference our official [Brand Guidelines](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/brand/globaleaks-brand-guidelines.pdf) and use our [Brand Assets](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/brand/assets/).
If you are planning some press releases, a conference, or promoting GlobaLeaks please keep at reference our official [Brand Guidelines](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/brand/globaleaks-brand-guidelines.pdf) and use our [Brand Assets](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/brand/assets/).

## License
GlobaLeaks is released under the AGPLv3 license. See [LICENSE](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/LICENSE) for more information on Additional Terms as per [7(b)](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/LICENSE#L684) and [7(c)](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/main/LICENSE#L713).
GlobaLeaks is released under the AGPLv3 license. See [LICENSE](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/LICENSE) for more information on Additional Terms as per [7(b)](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/LICENSE#L684) and [7(c)](https://github.com/globaleaks/globaleaks-whistleblowing-software/blob/stable/LICENSE#L713).
2 changes: 1 addition & 1 deletion backend/bin/globaleaks
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ from globaleaks.utils.utility import get_distribution_codename
if get_distribution_codename() not in ['bookworm', 'noble'] :
print("WARNING: The recommended up-to-date platforms are Debian 12 (Bookworm) and Ubuntu 24.04 (Noble)")
print("WARNING: Use one of these platforms to ensure best stability and security")
print("WARNING: To upgrade your system consult: https://docs.globaleaks.org/en/main/user/admin/UpgradeGuide.html")
print("WARNING: To upgrade your system consult: https://docs.globaleaks.org/en/stable/user/admin/UpgradeGuide.html")


# this import seems unused but it is required in order to load the mocks
Expand Down
Loading

0 comments on commit 7b22d1a

Please sign in to comment.