1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-18 22:50:29 +01:00

30461 Commits

Author SHA1 Message Date
Marc Alexander
f101532c09
Merge branch '3.2.x' 2017-07-16 21:42:30 +02:00
Marc Alexander
1d523531b5
Merge branch '3.1.x' into 3.2.x 2017-07-16 20:54:36 +02:00
Marc Alexander
53f186d96b
Merge branch 'prep-release-3.2.1' into 3.2.x 2017-07-16 20:53:18 +02:00
Marc Alexander
5216bf4483
[prep-release-3.2.1] Add missing .htaccess file release-3.2.1 2017-07-16 20:07:13 +02:00
Marc Alexander
c56ebb5312
Merge branch 'prep-release-3.1.11' into prep-release-3.2.1 2017-07-16 18:24:47 +02:00
Marc Alexander
d490190a99
Merge pull request #4864 from lavigor/ticket/15259
[ticket/15259] Fatal error on SQLite/Oracle database update
2017-07-16 17:33:52 +02:00
Marc Alexander
337c8451e7
Merge pull request #4865 from JoshyPHP/ticket/15261
[ticket/15261] Fix censoring HTML tags
2017-07-16 17:33:34 +02:00
Marc Alexander
4b73342669
[prep-release-3.2.1] Add migration for 3.2.1 2017-07-16 17:12:01 +02:00
Marc Alexander
0e505c6fc7
[prep-release-3.2.1] Update versions for 3.2.1 2017-07-16 17:10:46 +02:00
Marc Alexander
5b21903e66
[ticket/security/210] Fix tests for 3.2.x
SECURITY-210
2017-07-16 17:09:06 +02:00
Marc Alexander
05513b96a4
Merge pull request #39 from phpbb/ticket/security/210-rhea
[ticket/security/210] Prevent using IP addresses or ports for remote avatar -- Rhea
2017-07-16 15:49:32 +02:00
Marc Alexander
34e9b4d066
Merge pull request #35 from phpbb/ticket/security-203-rhea
[ticket/security-203] Fully validate version check data in version helper -- Rhea
2017-07-16 15:29:35 +02:00
Marc Alexander
6f897568da
Merge pull request #30 from phpbb/ticket/security-181-rhea
[ticket/security-181] Harden protection of migrations files and other directories
2017-07-16 15:08:40 +02:00
Marc Alexander
65aaef1f83
Merge branch 'prep-release-3.1.11' into 3.1.x 2017-07-16 15:00:22 +02:00
Marc Alexander
1493752536
[prep-release-3.1.11] Add migration for 3.1.11 release-3.1.11 2017-07-16 12:18:50 +02:00
Marc Alexander
3df3cb87c5
[prep-release-3.1.11] Update version numbers to 3.1.11 2017-07-16 11:54:37 +02:00
Marc Alexander
0b405a2cdc
Merge pull request #38 from phpbb/ticket/security/210
[ticket/security/210] Prevent using IP addresses or ports for remote avatar
2017-07-16 11:29:35 +02:00
Marc Alexander
4ed45c4e12
Merge pull request #32 from phpbb/ticket/security-203
[ticket/security-203] Fully validate version check data in version helper
2017-07-16 11:17:36 +02:00
Marc Alexander
c99820eb6b
Merge pull request #29 from phpbb/ticket/security-181
[ticket/security-181] Harden protection of migrations files and other directories
2017-07-16 10:59:48 +02:00
Marc Alexander
0ec5e21979
Merge pull request #37 from phpbb/ticket/security/208
[ticket/security/208] Add form key to password reset form
2017-07-16 09:58:46 +02:00
Marc Alexander
c1d835b6b4
Merge pull request #36 from phpbb/ticket/security/124
[ticket/security/124] Filter out disallowed search query items
2017-07-16 08:27:46 +02:00
Marc Alexander
8514e8be73
Merge branch '3.2.x' 2017-07-11 21:30:04 +02:00
Marc Alexander
a53c8cee79
[3.2.x] Update version numbers for 3.2.2-dev 2017-07-11 21:27:26 +02:00
Marc Alexander
8e310231bd
Merge branch 'prep-release-3.2.1' into 3.2.x 2017-07-11 21:26:12 +02:00
Marc Alexander
324d1e3c55
Merge branch '3.2.x' 2017-07-11 21:19:00 +02:00
Marc Alexander
05c47a0f4a
Merge branch '3.1.x' into 3.2.x 2017-07-11 21:18:42 +02:00
Marc Alexander
50d2e337b0
[3.1.x] Update version number to 3.1.12-dev 2017-07-11 21:15:08 +02:00
Marc Alexander
dff65f902c
Merge branch 'prep-release-3.1.11' into 3.1.x 2017-07-11 21:09:12 +02:00
Marc Alexander
e7be47c93d
Merge branch 'ticket/security/210' into ticket/security/210-rhea 2017-07-10 21:18:45 +02:00
Marc Alexander
fa631947f1
[ticket/security/210] Adjust regex and add tests for IPv6
SECURITY-210
2017-07-10 21:17:52 +02:00
Marc Alexander
3fc3f55d34
Merge branch 'ticket/security/210' into ticket/security/210-rhea 2017-07-09 16:24:49 +02:00
Marc Alexander
a281d526dc
[ticket/security/210] Prevent using IP addresses or ports for remote avatar
SECURITY-210
2017-07-09 15:38:18 +02:00
lavigor
24bde10028 [ticket/15259] Fatal error on SQLite/Oracle database update
Add a test.

PHPBB3-15259
2017-07-06 02:37:35 +03:00
JoshyPHP
329e5c5e05 [ticket/15261] Fix censoring HTML tags
PHPBB3-15261
2017-07-03 16:06:50 +02:00
lavigor
b7ce395fbe [ticket/15259] Fatal error on SQLite/Oracle database update
PHPBB3-15259
2017-07-01 23:01:34 +03:00
Marc Alexander
b99d47ce7e
[prep-release-3.2.1] Add changelog since 3.2.0 release-3.2.1-RC1 2017-06-25 22:03:32 +02:00
Marc Alexander
03cd4658d0
[prep-release-3.2.1] Add migration for 3.2.1-RC1 2017-06-25 21:59:14 +02:00
Marc Alexander
d423b2ec0d
[prep-release-3.2.1] Update version numbers for 3.2.1-RC1 2017-06-25 21:55:00 +02:00
Marc Alexander
35b7a4fae5
Merge branch 'prep-release-3.1.11' into prep-release-3.2.1 2017-06-25 21:53:12 +02:00
Marc Alexander
a5d83e12ec
[prep-release-3.1.11] Update changelog release-3.1.11-RC1 2017-06-25 21:36:40 +02:00
Marc Alexander
08c146ee34
Merge branch '3.1.x' into prep-release-3.1.11 2017-06-25 21:32:12 +02:00
Marc Alexander
5e24508280
Merge branch '3.2.x' 2017-06-25 21:27:09 +02:00
Marc Alexander
aef138d8bc
Merge branch '3.1.x' into 3.2.x 2017-06-25 21:26:43 +02:00
Marc Alexander
dc49a8a199
Merge pull request #4804 from rxu/ticket/15186
[ticket/15186] Fully implement the force_delete_allowed feature
2017-06-25 21:25:54 +02:00
Marc Alexander
d811743303
[prep-release-3.1.11] Update changelog for 3.1.11-RC1 2017-06-25 17:48:07 +02:00
Marc Alexander
65f7137825
[prep-release-3.1.11] Add migration for update to 3.1.11-RC1 2017-06-25 17:45:07 +02:00
Marc Alexander
04ef19595c
[prep-release-3.1.11] Update version numbers to 3.1.11-RC1 2017-06-25 17:42:55 +02:00
Marc Alexander
848cc8c5e6
Merge branch '3.2.x' 2017-06-25 17:27:50 +02:00
Marc Alexander
4f81c94a95
Merge branch '3.1.x' into 3.2.x 2017-06-25 17:27:47 +02:00
Marc Alexander
71f9c6ebe5
Merge pull request #4860 from marc1706/ticket/14982
[ticket/14982] Always do a ban check except on contact me form
2017-06-25 17:27:42 +02:00