-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/stable-3_4_0' into stable-3_3_0
- Loading branch information
Showing
4,258 changed files
with
549,968 additions
and
383,162 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| on: | ||
| push: | ||
| branches: | ||
| - '*' | ||
| pull_request: | ||
| branches: | ||
| ['stable-3_4_0'] | ||
|
|
||
| name: ojs | ||
| jobs: | ||
| ojs: | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| include: | ||
| - php-version: 8.1 | ||
| validate: 'validate' | ||
| - php-version: 8.1 | ||
| database: pgsql | ||
| test: 'test' | ||
| - php-version: 8.1 | ||
| database: mariadb | ||
| test: 'test' | ||
| - php-version: 8.1 | ||
| database: mysql | ||
| test: 'test' | ||
| upgrade: 'upgrade' | ||
| upgrade_test: '3.1.0,3.1.1-2,3.1.2,stable-3_2_0,stable-3_2_1,stable-3_3_0' | ||
| - php-version: 8.2 | ||
| database: mysql | ||
| test: 'test' | ||
| - php-version: 8.2 | ||
| database: pgsql | ||
| test: 'test' | ||
|
|
||
|
|
||
|
|
||
| name: ojs | ||
| steps: | ||
| - uses: pkp/pkp-github-actions@v1 | ||
| with: | ||
| node_version: 16 | ||
| dataset_branch: 'stable-3_4_0' | ||
| DATASETS_ACCESS_KEY: ${{secrets.DATASETS_ACCESS_KEY}} | ||
| DEBUG_IN_TMATE: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| <?php | ||
|
|
||
| $finder = PhpCsFixer\Finder::create() | ||
| ->in(__DIR__) | ||
| ->name('*.php') | ||
| // The next two rules are enabled by default, kept for clarity | ||
| ->ignoreDotFiles(true) | ||
| ->ignoreVCS(true) | ||
| // The pattern is matched against each found filename, thus: | ||
| // - The "/" is needed to avoid having "vendor" match "Newsvendor.php" | ||
| // - The presence of "node_modules" here doesn't prevent the Finder from recursing on it, so we merge these paths below at the "exclude()" | ||
| ->notPath($ignoredDirectories = ['cypress/', 'js/', 'locale/', 'node_modules/', 'styles/', 'templates/', 'vendor/']) | ||
| // Ignore root based directories | ||
| ->exclude(array_merge($ignoredDirectories, ['cache', 'dbscripts', 'docs', 'lib', 'public', 'registry', 'schemas'])) | ||
| // Ignores Git folders | ||
| ->notPath((function () { | ||
| $recursiveIterator = new RecursiveIteratorIterator( | ||
| new RecursiveDirectoryIterator(__DIR__ . '/plugins', FilesystemIterator::SKIP_DOTS | FilesystemIterator::UNIX_PATHS | FilesystemIterator::CURRENT_AS_FILEINFO), | ||
| RecursiveIteratorIterator::SELF_FIRST | ||
| ); | ||
| $recursiveIterator->setMaxDepth(1); | ||
| $gitFolders = new CallbackFilterIterator( | ||
| $recursiveIterator, | ||
| fn (SplFileInfo $file) => $recursiveIterator->getDepth() === $recursiveIterator->getMaxDepth() | ||
| && $file->isDir() | ||
| // Covers submodules (.git file) and external repositories (.git directory) | ||
| && file_exists("{$file}/.git") | ||
| ); | ||
| $folders = []; | ||
| foreach ($gitFolders as $folder) { | ||
| $folders[] = str_replace(__DIR__ . '/', '', $folder); | ||
| } | ||
| return $folders; | ||
| })()); | ||
|
|
||
| $rules = include './lib/pkp/.php_cs_rules'; | ||
| $config = new PhpCsFixer\Config(); | ||
| return $config->setRules($rules) | ||
| ->setFinder($finder); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,82 +1,35 @@ | ||
| # Open Journal Systems | ||
|
|
||
| ## DAI Version | ||
| This Version is based on ojs 3.1.2.4 (stable) and includes the following Plugins: | ||
| * [PKP] quickSubmit | ||
| * [DAI] zenon | ||
| * [DAI] idaitheme | ||
| * [DAI] cilantro | ||
| [](https://app.travis-ci.com/pkp/ojs) | ||
| [](https://scrutinizer-ci.com/g/pkp/ojs/?branch=main) | ||
|
|
||
| > Open Journal Systems (OJS) has been developed by the Public Knowledge Project. For general information about OJS and other open research systems, visit the [PKP web site][pkp]. | ||
| Open Journal Systems (OJS) is open source software developed by the [Public Knowledge Project](https://pkp.sfu.ca/) to manage scholarly journals. [Learn More](https://pkp.sfu.ca/software/ojs/) | ||
|
|
||
| [](https://travis-ci.org/pkp/ojs) | ||
| ## Usage | ||
|
|
||
| ### Updates | ||
| 1. Update submodule in its own repository, e.g. dainst/ojs3_theme, commit and push your changes. | ||
| 2. Checkout this repository, navigate to the updated submodule and `git pull`. Maybe you need to checkout the correct branch/commit manually. | ||
| 3. Leave the submodule and exceute `git add path/to/submodule`, `git commit -m "Update submodule xy"` and `git push`. | ||
| 4. The only thing to do on the server should be `sudo -u www-data git pull`. | ||
| Read one of these guides to get started using OJS: | ||
|
|
||
| Never update this repository on the server and remember to pull as www-data to avoid files owned by the root user. | ||
| - Read the [Admin Guide](https://docs.pkp.sfu.ca/admin-guide/) to learn how to install and configure the application from an official release package. Use this guide to deploy to production. | ||
| - Read the [Getting Started](https://docs.pkp.sfu.ca/dev/documentation/en/getting-started) guide to learn how to install the application from this source repository. Use this guide for local development. | ||
|
|
||
| Visit our [Documentation Hub](https://docs.pkp.sfu.ca/) for user guides, tutorials, and technical documentation. | ||
|
|
||
| ## Documentation | ||
| ## Bugs / Feature Requests | ||
|
|
||
| You will find detailed guides in [docs](docs) folder. | ||
| > ⚠️ If you have found a security risk or vulnerability, please read our [security policy](SECURITY.md). | ||
| ## Using Git development source | ||
| All issues should be filed at the [pkp/pkp-lib](https://github.com/pkp/pkp-lib/issues/) repository. Feature requests can be made at our [Community Forum](https://forum.pkp.sfu.ca/). Learn more about how to [report a problem](https://docs.pkp.sfu.ca/dev/contributors/#report-a-problem). | ||
|
|
||
| Checkout submodules and copy default configuration : | ||
| ## Community Code of Conduct | ||
|
|
||
| git submodule update --init --recursive | ||
| cp config.TEMPLATE.inc.php config.inc.php | ||
| This repository is a PKP community space. All activities here are governed by [PKP's Code of Conduct](https://pkp.sfu.ca/code-of-conduct/). Please review the Code and help us create a welcoming environment for all participants. | ||
|
|
||
| Install or update dependencies via Composer (https://getcomposer.org/): | ||
| ## Contributions | ||
|
|
||
| composer --working-dir=lib/pkp install | ||
| composer --working-dir=plugins/paymethod/paypal install | ||
| composer --working-dir=plugins/generic/citationStyleLanguage install | ||
|
|
||
| Install or update dependencies via [NPM](https://www.npmjs.com/): | ||
|
|
||
| # install [nodejs](https://nodejs.org/en/) if you don't already have it | ||
| npm install | ||
| npm run build | ||
|
|
||
| If your PHP version supports built-in development server : | ||
|
|
||
| php -S localhost:8000 | ||
|
|
||
| See the [Documentation Hub][doc-hub] for a more complete development guide. | ||
|
|
||
| ## Running Tests | ||
|
|
||
| We recommend using [Travis](https://travis-ci.org/) for continuous-integration | ||
| based testing. Review the Travis configuration file (`.travis.yml`) as a | ||
| reference for running the test locally, should you choose to do so. | ||
|
|
||
| The tests include an integration test suite that builds a data environment from | ||
| scratch, including the installation process. (This is the `-b` flag to the test | ||
| script `lib/pkp/tools/runAllTests.sh`; this is also executed in the Travis | ||
| environment.) | ||
|
|
||
| ## Bugs / Issues | ||
|
|
||
| See https://github.com/pkp/pkp-lib/#issues for information on reporting issues. | ||
| Read the [Contributor's Guide](https://docs.pkp.sfu.ca/dev/contributors/) to learn how to make a pull request. This document describes our code formatting guidelines as well as information about how we organize stable branches and submodules. | ||
|
|
||
| ## License | ||
|
|
||
| This software is released under the the [GNU General Public License][gpl-licence]. | ||
|
|
||
| See the file [COPYING][gpl-licence] included with this distribution for the terms | ||
| of this license. | ||
|
|
||
| Third parties are welcome to modify and redistribute OJS in entirety or parts | ||
| according to the terms of this license. PKP also welcomes patches for | ||
| improvements or bug fixes to the software. | ||
| This software is released under the the GNU General Public License. See the file `docs/COPYING` included with this distribution for the terms of this license. | ||
|
|
||
| [pkp]: https://pkp.sfu.ca/ | ||
| [readme]: docs/README.md | ||
| [doc-hub]: https://docs.pkp.sfu.ca/ | ||
| [php-unit]: https://phpunit.de/ | ||
| [gpl-licence]: docs/COPYING | ||
| Third parties are welcome to modify and redistribute OJS in entirety or parts according to the terms of this license. PKP also welcomes patches for improvements or bug fixes to the software. |
Oops, something went wrong.