Skip to content

Commit a2389bd

Browse files
committed
Merge branch '3.2.x'
2 parents 0bc21b7 + 7878bf4 commit a2389bd

361 files changed

Lines changed: 94809 additions & 991 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
!/vendor
2+
/vendor/*
3+
!/vendor/easybook
4+
!/vendor/autoload.php
5+
!/vendor/composer

.travis.yml

Lines changed: 0 additions & 64 deletions
This file was deleted.

README.md

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,43 @@
1-
# phpBB 3.1 Extension - phpBB.de Pastebin
1+
# phpBB 3.2/3.3 Extension - phpBB.de Pastebin
22

33
## Installation
44

5-
Clone into ext/phpbbde/pastebin:
5+
Copy the content of this repository via git clone:
66

77
git clone https://github.com/phpbb-de/phpbb-ext-pastebin ext/phpbbde/pastebin
88

9-
Go to ext/phpbbde/pastebin and install dependencies:
9+
or create the following directory structure in your phpBB-root directory:
1010

11-
php composer.phar install --no-dev
11+
ext/phpbbde/pastebin
1212

13-
If you wish to contribute to development, you should also consider installing the development dependencies by leaving out --no-dev.
14-
15-
Go to "ACP" > "Customise" > "Extensions" and enable the "phpBB.de pastebin" extension.
13+
and copy the repository content to it.
1614

17-
## Development
15+
Go to "ACP" > "Customise" > "Extensions" and enable the "Pastebin" extension.
1816

19-
If you find a bug, please report it on https://github.com/phpbb-de/phpbb-ext-pastebin
17+
## Added permissions
18+
The extension adds on the first install group permissions to "user standard" role and "Standard Moderator"
19+
and "Full Moderator" roles. You will find them in the user or moderator roles tab "Pastebin".
2020

21-
## Automated Testing
21+
**New user permissions:**
22+
23+
- Can delete own pastebin entries
24+
- Can edit own pastebin entries (Storage duration, Syntax highlighting)
25+
- Can post pastebin entries
26+
- Can post non-pruned pastebin entries
27+
- Can post pastebin entries without visual confirmation
28+
- Can view pastebin entries
29+
30+
**New moderator permissions:**
2231

23-
We use automated unit tests including functional tests to prevent regressions. Check out our travis build below:
32+
- Can delete pastebin entries
33+
- Can edit pastebin entries (Storage duration, Syntax highlighting)
34+
- Can deactivate pruning of selected pastebin entries
2435

25-
master: [![Build Status](https://travis-ci.org/phpbb-de/phpbb-ext-pastebin.png?branch=master)](http://travis-ci.org/phpbb-de/phpbb-ext-pastebin)
36+
## Development and bug reports
37+
38+
If you find a bug, please report it on https://github.com/phpbb-de/phpbb-ext-pastebin
39+
40+
## Automated Testing
2641

2742
## License
2843

composer.json

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,39 @@
33
"type": "phpbb-extension",
44
"description": "Provides a pastebin including syntax highlighting",
55
"homepage": "https://www.phpbb.de/community/",
6-
"version": "1.0.0-dev",
7-
"time": "2015-01-03",
8-
"license": "GPL-2.0",
6+
"version": "2.0.6",
7+
"time": "2020-10-04",
8+
"license": "GPL-2.0-only",
99
"authors": [
1010
{
1111
"name": "Martin Beckmann",
1212
"email": "gn#36@phpbb.de",
1313
"homepage": "https://www.phpbb.de/",
1414
"role": "Lead Developer"
15+
},
16+
{
17+
"name": "Christian Schnegelberger",
18+
"email": "crizzo@phpbb.de",
19+
"homepage": "https://www.phpbb.de/",
20+
"role": "Developer"
1521
}
1622
],
1723
"require": {
18-
"php": ">=5.3.3",
24+
"php": ">=5.4.7, <=7.4",
1925
"easybook/geshi": ">=1.0.8.4"
2026
},
2127
"require-dev": {
22-
"phpbb/epv": "dev-master"
28+
"phpbb/epv": "0.0.11"
2329
},
2430
"extra": {
25-
"display-name": "phpBB.de - Pastebin",
31+
"display-name": "Pastebin",
2632
"soft-require": {
27-
"phpbb/phpbb": ">=3.1.2,<3.2@dev"
33+
"phpbb/phpbb": ">=3.2.4,<3.4.0@dev"
34+
}
35+
},
36+
"config": {
37+
"platform":{
38+
"php":"5.6"
2839
}
2940
}
3041
}

0 commit comments

Comments
 (0)