1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 20:56:40 +02:00
Commit Graph

2291 Commits

Author SHA1 Message Date
5f0b3c2141 Merge branch '3.3.x' 2020-08-06 17:44:03 +02:00
21d656907a Merge branch '3.3.x' 2020-08-06 17:23:05 +02:00
2a8239075e Merge branch '3.2.x' into 3.3.x 2020-08-06 17:21:58 +02:00
800bd98ae6 [prep-release-3.3.1] Update changelog for 3.3.1 2020-08-02 18:04:28 +02:00
eb4186add4 Merge branch 'prep-release-3.2.10' into prep-release-3.3.1 2020-07-29 21:42:16 +02:00
fdc827e066 [prep-release-3.2.10] Update Changelog for 3.2.10 2020-07-27 22:46:48 +02:00
2828d57f5f Merge branch '3.3.x' 2020-06-21 21:32:09 +02:00
3905227758 [prep-release-3.3.1] Update changelog for 3.3.1-RC1 2020-06-21 14:43:00 +02:00
60c477cd06 Merge branch '3.3.x' 2020-06-07 22:32:02 +02:00
6e05cb38f6 Merge branch '3.2.x' into 3.3.x 2020-06-07 22:31:49 +02:00
47fcf3403f [prep-release-3.2.10] Update changelog for 3.2.10-RC2 2020-06-07 12:11:24 +02:00
ec0423bf82 Merge branch '3.3.x' 2020-06-01 20:41:26 +02:00
fe7c833c8b Merge branch '3.2.x' into 3.3.x 2020-06-01 20:40:12 +02:00
8195035363 [prep-release-3.2.10] Add changelog for 3.2.10-RC1 2020-06-01 13:15:42 +02:00
e59d7b5241 Merge branch '3.3.x' 2020-06-01 12:54:01 +02:00
195f6460e0 Merge branch '3.2.x' into 3.3.x 2020-06-01 12:53:51 +02:00
5331a555f6 [ticket/16506] Update credits to latest state
PHPBB3-16506
2020-06-01 12:50:49 +02:00
209c72a97b Merge branch '3.3.x' 2020-05-04 22:53:34 +02:00
cb0583df1d Merge branch '3.2.x' into 3.3.x 2020-05-04 22:53:29 +02:00
rxu
c55d59e70a [ticket/16458] Add template events to acp_profile.html
PHPBB3-16458
2020-04-24 11:32:19 +07:00
b7c5e6c49f Merge branch '3.3.x' 2020-04-17 21:10:42 +02:00
724b3682d1 Merge branch '3.2.x' into 3.3.x 2020-04-17 21:10:32 +02:00
rxu
45f0c77761 [ticket/16421] Add contact field icon template events to viewtopic_body.html
PHPBB3-16421
2020-04-02 12:31:38 +07:00
c71d624a35 Merge branch '3.3.x' 2020-03-29 12:02:42 +02:00
669c45125c Merge branch '3.2.x' into 3.3.x 2020-03-29 12:01:13 +02:00
a267db851a [ticket/16419] Add mrgoldy to CREDITS.txt
PHPBB3-16419
2020-03-29 11:23:05 +02:00
5ab5b949d2 Merge branch '3.3.x' 2020-03-16 17:24:33 +01:00
f830f0f6df Merge branch '3.2.x' into 3.3.x 2020-03-16 17:24:28 +01:00
4721a4ae19 Merge pull request #5899 from 3D-I/ticket/16400
[ticket/16400] Add posting_editor_* events
2020-03-16 17:24:23 +01:00
b0fae02633 Merge branch '3.3.x' 2020-03-15 15:44:46 +01:00
671efc0726 Merge branch '3.2.x' into 3.3.x 2020-03-15 15:44:41 +01:00
b0e7221b3a [ticket/16400] Add posting_editor_* events
PHPBB3-16400
2020-03-12 23:35:29 +01:00
f6b121758b [ticket/16400] Add posting_editor_* events
PHPBB3-16400
2020-03-12 23:27:23 +01:00
3b82c8cb10 [ticket/16388] Add online_list_before template events
PHPBB3-16388
2020-03-09 22:04:20 +01:00
10f6d65469 Merge branch '3.3.x' 2020-03-02 21:01:49 +01:00
c06f224ace Merge branch '3.2.x' into 3.3.x 2020-03-02 20:52:11 +01:00
1e607a8041 [ticket/16384] Add template events friends list username {prepend/append}
PHPBB3-16384
2020-02-27 22:00:02 +05:30
90cdab3c0f Merge branch '3.3.x' 2020-02-14 07:00:58 +01:00
685c41689e Merge branch '3.2.x' into 3.3.x 2020-02-14 07:00:53 +01:00
8fcb5dcc4d Merge pull request #5815 from KYPREO/ticket/16234
[ticket/16234] Fix & enhance Sphinx search backend functionality
2020-02-14 07:00:48 +01:00
a4855decb8 [ticket/16234] Fix & enhance Sphinx search backend functionality
PHPBB3-16234
PHPBB3-16233
PHPBB3-15367
PHPBB3-13958
2020-02-12 22:29:17 +11:00
0bbe959fbd Merge branch '3.3.x' 2020-01-27 19:49:01 +01:00
5d5f34518d [ticket/16313] Remove http block from sample Nginx configuration file
Change placeholder domain to example.com

Also prefer fastcgi.conf over fastcgi_params as per Nginx documentation.

PHPBB3-16313
2020-01-09 19:10:25 -06:00
417ec86d8a Merge branch '3.3.x' 2020-01-06 12:01:26 +01:00
8d00784dfe [prep-release-3.3.0] Update changelog 2020-01-06 11:21:43 +01:00
433a23feb4 [prep-release-3.3.0] Rename 3.3 to Proteus 2020-01-05 16:12:15 +01:00
4591cf9afa [prep-release-3.3.0] Update changelog 2020-01-04 22:49:40 +01:00
ed34079452 Merge pull request #5817 from marc1706/ticket/16290
[ticket/16290] Update to new SVG logo in package docs
2020-01-04 22:48:05 +01:00
f6b47e2ee3 [ticket/16290] Update to new SVG logo in package docs
PHPBB3-16290
2020-01-04 22:32:59 +01:00
e900104e10 [prep-release-3.3.0] Add changelog for 3.3.0 2020-01-04 22:01:09 +01:00