Commit graph

32662 commits

Author SHA1 Message Date
Marc Alexander
b779dbaf29
Merge branch '3.3.x' 2019-06-03 23:13:51 +02:00
Marc Alexander
2a69eb051d
Merge branch '3.2.x' into 3.3.x 2019-06-03 23:10:51 +02:00
Marc Alexander
0d4cd552fe
Merge pull request #5607 from senky/ticket/15974
[ticket/15974] Remove Back to previous page link
2019-06-03 23:10:46 +02:00
Marc Alexander
ff61288295
Merge branch '3.3.x' 2019-06-03 21:18:53 +02:00
Marc Alexander
5540a0f8e0
Merge branch '3.2.x' into 3.3.x 2019-06-03 21:18:46 +02:00
Marc Alexander
3632a0f4f2
Merge pull request #5613 from 3D-I/ticket/16071
[ticket/16071] Undefined index for custom attachments groups
2019-06-03 21:18:40 +02:00
Marc Alexander
3e00a8a845
Merge branch '3.3.x' 2019-06-03 21:15:22 +02:00
Marc Alexander
730e1140e3
Merge pull request #5614 from JoshyPHP/ticket/16072
[ticket/16072] Update s9e/text-formatter
2019-06-03 21:06:20 +02:00
JoshyPHP
76ea1de0ab [ticket/16072] Update s9e/text-formatter
PHPBB3-16072
2019-05-31 22:46:59 +02:00
3D-I
fa1952fd08 [ticket/16071] Undefined index for custom attachments groups
PHPBB3-16071
2019-05-29 09:03:55 +02:00
Marc Alexander
b7494fde02
Merge branch '3.3.x' 2019-05-27 21:19:19 +02:00
Marc Alexander
c04642f987
Merge branch '3.2.x' into 3.3.x 2019-05-27 21:19:13 +02:00
Marc Alexander
97e92f52d7
Merge pull request #5592 from 3D-I/ticket/16055
[ticket/16055] Fix Oauth's logins in 3.2.x
2019-05-27 21:19:05 +02:00
Marc Alexander
9a7885043b
Merge branch '3.3.x' 2019-05-27 20:51:21 +02:00
Marc Alexander
b4d36e3235
Merge branch '3.2.x' into 3.3.x 2019-05-27 20:50:53 +02:00
Marc Alexander
95ab325251
Merge pull request #5593 from JoshyPHP/ticket/16053
[ticket/16053] Update s9e/text-formatter
2019-05-27 20:44:11 +02:00
Marc Alexander
0bff98a7de
Merge branch '3.3.x' 2019-05-27 20:34:19 +02:00
Marc Alexander
b9a40be9b4
Merge pull request #5591 from rubencm/ticket/16057
[ticket/16057] Fix vagrant in 3.3
2019-05-27 20:34:13 +02:00
Jakub Senko
9c47e0eee8
[ticket/15974] Remove Back to previous page link
PHPBB3-15974
2019-05-27 15:49:49 +02:00
Marc Alexander
d98c181202
Merge branch '3.3.x' 2019-05-23 22:07:52 +02:00
Marc Alexander
00f639de7b
Merge branch '3.2.x' into 3.3.x 2019-05-23 22:07:30 +02:00
Marc Alexander
f6beabc593
Merge pull request #5598 from marc1706/ticket/16067
[ticket/16067] Specify trusty build environment
2019-05-23 22:06:50 +02:00
Marc Alexander
964cc30548
[ticket/16067] Specify trusty build environment
PHPBB3-16067
2019-05-23 19:59:13 +02:00
rubencm
84ce92896e [ticket/16057] Enable cgi.fix_pathinfo in php.ini
PHPBB3-16057
2019-05-17 20:58:54 +00:00
JoshyPHP
3208c41da8 [ticket/16053] Update s9e/text-formatter
PHPBB3-16053
2019-05-17 15:37:20 +02:00
3D-I
72be8e0870 [ticket/16055] Fix Oauth's redirects
Via forum, memberlist, topic or post etc..

PHPBB3-16055
2019-05-16 21:53:43 +02:00
rubencm
dd3330d7c9 [ticket/16057] Undo composer.json changes
PHPBB3-16057
2019-05-15 23:22:02 +00:00
rubencm
d639e107ec [ticket/16057] Enable url rewrite and composer.json rule
PHPBB3-16057
2019-05-15 23:07:29 +00:00
Marc Alexander
1c16553110
Merge branch '3.3.x' 2019-05-14 17:28:30 +02:00
Marc Alexander
9207b13224
Merge branch '3.2.x' into 3.3.x 2019-05-14 17:24:36 +02:00
Marc Alexander
8142257e31
Merge pull request #5587 from 3D-I/ticket/16048
[ticket/16048] Fix restore backup from ACP
2019-05-14 17:24:31 +02:00
Marc Alexander
156ac3c350
Merge branch '3.3.x' 2019-05-14 17:18:44 +02:00
Marc Alexander
29d40fd3d6
Merge branch '3.2.x' into 3.3.x 2019-05-14 17:18:39 +02:00
Marc Alexander
fdc04cb9ec
Merge pull request #5588 from rxu/ticket/16050
[ticket/16050] Fix PHP warning in MCP Banning tab on PHP 7.2+
2019-05-14 17:18:35 +02:00
Marc Alexander
91e2ec05f3 Merge branch '3.3.x' 2019-05-14 11:43:20 +02:00
Marc Alexander
0ebcb3f3a0 Merge branch '3.2.x' into 3.3.x 2019-05-14 11:42:43 +02:00
Marc Alexander
d6a6e86975 Merge pull request #5590 from cclauss/patch-1
[ticket/16058] Travis CI: "sudo: required" not longer is
2019-05-14 11:42:12 +02:00
cclauss
275d6ee050
[ticket/16058] Travis CI: "sudo: required" not longer is
[Travis are now recommending removing the __sudo__ tag](
https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration).

"_If you currently specify __sudo:__ in your __.travis.yml__, we recommend
removing that configuration_"

PHPBB3-16058
2019-05-13 21:54:03 +02:00
rubencm
c2841cb6e2 [ticket/16057] Fix vagrant in 3.3
PHPBB3-16057
2019-05-13 19:36:43 +00:00
Marc Alexander
53025be191
[ticket/16052] Require PHP 7.3 builds to pass
PHPBB3-16052
2019-05-12 21:24:03 +02:00
Marc Alexander
b6387c501b
[ticket/16052] Update composer dependencies for master
PHPBB3-16052
2019-05-12 20:31:41 +02:00
Marc Alexander
9314047a0d
Merge branch '3.3.x' 2019-05-12 18:33:49 +02:00
Marc Alexander
f7ec97b88e
[ticket/16052] Update composer dependencies
PHPBB3-16052
2019-05-12 18:28:08 +02:00
Marc Alexander
1035cd9ac3
Merge branch '3.3.x' 2019-05-12 18:06:03 +02:00
Marc Alexander
b6cd02bacb
[ticket/16052] Add 3.3.0-dev migration
PHPBB3-16052
2019-05-11 23:36:20 +02:00
hanakin
52ed8bfaa1
[ticket/15927] Avoid using floats
PHPBB3-15927
2019-05-11 23:36:20 +02:00
hanakin
8f0643a14c
[ticket/15927] Fix render issue
PHPBB3-15927
2019-05-11 23:36:20 +02:00
Marc Alexander
31ab3d93a2
[ticket/15828] Do not allow PHP 7.3 tests to fail
PHPBB3-15828
2019-05-11 23:36:20 +02:00
Marc Alexander
89ae1c3221
[ticket/16052] Update version numbers to 3.3
PHPBB3-16052
2019-05-11 23:36:44 +02:00
Marc Alexander
3f33d89572
[ticket/16052] Fix issues caused by merges
PHPBB3-16052
2019-05-11 23:36:20 +02:00