1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Commit Graph

34498 Commits

Author SHA1 Message Date
Marc Alexander
8195035363 [prep-release-3.2.10] Add changelog for 3.2.10-RC1 release-3.2.10-RC1 2020-06-01 13:15:42 +02:00
Marc Alexander
eb7019d54a [prep-release-3.2.10] Add migration for 3.2.10-RC1 2020-06-01 13:14:06 +02:00
Marc Alexander
ab5ab01496 [prep-release-3.2.10] Update version numbers to 3.2.10 2020-06-01 13:12:35 +02:00
Marc Alexander
9d2c1f7602 [prep-release-3.2.10] Update version numbers to 3.2.10-RC1 2020-06-01 13:09:27 +02:00
Marc Alexander
e59d7b5241 Merge branch '3.3.x' 2020-06-01 12:54:01 +02:00
Marc Alexander
195f6460e0 Merge branch '3.2.x' into 3.3.x 2020-06-01 12:53:51 +02:00
Marc Alexander
e9a6f46bef Merge pull request #5996 from marc1706/ticket/16506
[ticket/16506] Update credits to latest state
2020-06-01 12:53:42 +02:00
Marc Alexander
5331a555f6 [ticket/16506] Update credits to latest state
PHPBB3-16506
2020-06-01 12:50:49 +02:00
Marc Alexander
913223dca9 Merge branch '3.3.x' 2020-06-01 11:45:56 +02:00
Marc Alexander
3bd612ad81 Merge branch '3.2.x' into 3.3.x 2020-06-01 11:45:47 +02:00
Marc Alexander
dcae4f330e Merge pull request #5990 from 3D-I/ticket/16496
[ticket/16496] Fix html special chars in custom BBcode help line
2020-06-01 11:45:34 +02:00
Marc Alexander
6c970be53c Merge branch '3.3.x' 2020-06-01 11:22:45 +02:00
Marc Alexander
642f990fbc Merge branch '3.2.x' into 3.3.x 2020-06-01 11:22:37 +02:00
Marc Alexander
7268c5ebfb Merge pull request #5993 from 3D-I/ticket/16503
[ticket/16503] Fix WhoIs lookup
2020-06-01 11:22:27 +02:00
Marc Alexander
6f5d640e2e Merge branch '3.3.x' 2020-06-01 11:19:40 +02:00
Marc Alexander
68e6e8ca90 Merge branch '3.2.x' into 3.3.x 2020-06-01 11:19:30 +02:00
Marc Alexander
fa13f06e64 Merge pull request #5994 from rxu/ticket/16500
[ticket/16500] Fix attachments ordering for copy topic feature
2020-06-01 11:19:14 +02:00
rxu
e2ced58517 [ticket/16500] Fix attachments ordering for copy topic feature
PHPBB3-16500
2020-06-01 14:40:49 +07:00
Marc Alexander
2bf92024c7 Merge branch '3.3.x' 2020-05-31 12:05:05 +02:00
Marc Alexander
838e488134 Merge pull request #5967 from rxu/ticket/16435
[ticket/16435] Restore calling page_footer() events in controllers
2020-05-31 12:04:34 +02:00
3D-I
555624decf [ticket/16503] Fix WhoIs lookup
PHPBB3-16503
2020-05-30 21:26:45 +02:00
Marc Alexander
cc96f68e1a Merge branch '3.3.x' 2020-05-29 12:08:07 +02:00
Marc Alexander
528b1b10b7 Merge pull request #5991 from 3D-I/ticket/16487-3.3
[ticket/16487] Fix URL for fontawesome 3.2.0 migration - for 3.3.x
2020-05-29 12:07:55 +02:00
3D-I
e9e9ab8919 [ticket/16496] Fix html special chars in custom BBcode help line
PHPBB3-16496
2020-05-28 13:09:54 +02:00
Marc Alexander
a2aff13743 Merge branch '3.3.x' 2020-05-27 21:38:16 +02:00
Marc Alexander
f4f749f130 Merge branch '3.2.x' into 3.3.x 2020-05-27 21:37:59 +02:00
Marc Alexander
c66dd87f68 Merge pull request #5986 from 3D-I/ticket/16487
[ticket/16487] Fix URL for fontawesome 3.2.0 migration
2020-05-27 21:37:16 +02:00
rxu
3b3dfebd82 [ticket/16435] Fix Lint test for nightly build
PHPBB3-16435
2020-05-27 16:28:07 +07:00
rxu
5afda415d1 [ticket/16435] Fix test_session_gc() test
PHPBB3-16435
2020-05-27 16:06:19 +07:00
rxu
7481cf9ffe [ticket/16435] Restore calling page_footer() events in controllers
PHPBB3-16435
2020-05-27 15:49:07 +07:00
Marc Alexander
37b90d7e3b Merge branch '3.3.x' 2020-05-27 10:10:13 +02:00
Marc Alexander
850179e6f0 Merge pull request #5989 from marc1706/ticket/16494-master
[ticket/16494] Update composer & composer dependencies - master branch
2020-05-27 10:10:06 +02:00
Marc Alexander
bb6d4d67d5 Merge branch '3.2.x' into 3.3.x 2020-05-27 10:08:50 +02:00
Marc Alexander
22331c8951 Merge pull request #5988 from marc1706/ticket/16494-3.3
[ticket/16494] Update composer & dependencies for 3.3.x
2020-05-27 10:08:43 +02:00
Marc Alexander
6db29a7ae1 Merge pull request #5987 from marc1706/ticket/16494
[ticket/16494] Update composer & dependencies for 3.2.x
2020-05-27 10:08:08 +02:00
3D-I
c27b049ca0 [ticket/16487] Fix URL for fontawesome 3.2.0 migration
PHPBB3-16487
2020-05-26 22:19:57 +02:00
3D-I
bb32ec38da [ticket/16487] Fix URL for fontawesome 3.2.0 migration
PHPBB3-16487
2020-05-26 21:54:11 +02:00
3D-I
d40cb5f618 [ticket/16496] Fix html special chars in custom BBcode help line
PHPBB3-16496
2020-05-26 20:42:21 +02:00
3D-I
599adb3003 [ticket/16496] Fix html special chars in custom BBcode help line
PHPBB3-16496
2020-05-26 13:34:20 +02:00
3D-I
13914b91df [ticket/16496] Fix html special chars in custom BBcode help line
PHPBB3-16496
2020-05-25 02:01:58 +02:00
Marc Alexander
21ab9ad66c [ticket/16494] Update dependencies for master branch
PHPBB3-16494
2020-05-24 22:07:17 +02:00
Marc Alexander
fa98acf549 Merge branch 'ticket/16494-3.3' into ticket/16494-master 2020-05-24 21:38:30 +02:00
Marc Alexander
01284ef6a0 [ticket/16494] Update dependencies for 3.3.x
PHPBB3-16494
2020-05-24 20:59:32 +02:00
Marc Alexander
7f9792b571 Merge branch 'ticket/16494' into ticket/16494-3.3 2020-05-24 20:53:43 +02:00
Marc Alexander
5882a9a3a2 [ticket/16494] Update composer dependencies to latest versions
PHPBB3-16494
2020-05-24 18:08:08 +02:00
Marc Alexander
a673858e13 [ticket/16494] Update composer to 1.10.6
PHPBB3-16494
2020-05-24 17:53:32 +02:00
Marc Alexander
447ec9b5cc Merge branch '3.3.x' 2020-05-24 14:16:05 +02:00
Marc Alexander
c27a6472af Merge branch '3.2.x' into 3.3.x 2020-05-24 14:15:52 +02:00
Marc Alexander
4a4f62f29e Merge pull request #5985 from 3D-I/ticket/16486
[ticket/16486] Fix migration 3.2.0-a1
2020-05-24 14:15:37 +02:00
Marc Alexander
dbd17feb5f Merge branch '3.3.x' 2020-05-24 14:07:47 +02:00