1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-29 04:50:51 +02:00
Commit Graph

4623 Commits

Author SHA1 Message Date
Marc Alexander
f547024751 Merge branch '3.3.x' 2019-11-28 21:11:54 +01:00
Marc Alexander
ac6676a144 Merge branch '3.2.x' into 3.3.x 2019-11-28 21:11:48 +01:00
Marc Alexander
f26c79621b Merge branch '3.3.x' 2019-11-27 08:10:49 +01:00
Marc Alexander
380b7d0a98 [ticket/16223] Use constructor arguments instead of func_get_args()
PHPBB3-16223
2019-11-25 22:16:41 +01:00
Marc Alexander
c7d47e34e8 [ticket/16223] Ensure memcached tests are only run when available
PHPBB3-16223
2019-11-25 21:27:43 +01:00
JoshyPHP
d6f5b5ef6c [ticket/16228] Fix BBCodes merging
PHPBB3-16228
2019-11-25 18:34:04 +01:00
Marc Alexander
86085f96ab [ticket/16223] Remove no longer supported memcache driver
PHPBB3-16223
2019-11-24 16:54:57 +01:00
Marc Alexander
bf6bcad1cb Merge branch '3.3.x' 2019-11-23 14:28:28 +01:00
Marc Alexander
d55e421c0f [prep-release-3.3.0-b2] Add migration for 3.3.0-b2 2019-11-22 11:06:15 +01:00
Marc Alexander
0e0659cf34 Merge branch '3.3.x' 2019-11-22 10:56:37 +01:00
Marc Alexander
896b31272b Merge pull request #5686 from v12mike/ticket/9837
[ticket/9837] Display unapproved posts to their authors
2019-11-22 10:56:33 +01:00
Marc Alexander
0a4cc5d201 [ticket/9837] Apply suggested changes by CHItA
PHPBB3-9837
2019-11-22 09:20:18 +01:00
Marc Alexander
b6ec8c8a94 Merge branch '3.3.x' 2019-11-21 14:55:37 +01:00
v12mike
29be971fad [ticket/9837] Make unapproved posts visible to author
review comments

PHPBB3-9837
2019-11-21 13:44:22 +01:00
v12mike
0f57f3d90d [ticket/9837] Display unapproved posts to their authors
Coding guidelines fixes

PHPBB3-9837
2019-11-21 13:44:22 +01:00
v12mike
8726baea9f [ticket/9837] Display unapproved posts to their authors
Change code order to improve efficiency.

PHPBB3-9837
2019-11-21 13:44:22 +01:00
v12mike
15da5b108e [ticket/9837] Display unapproved posts to their authors
Re-order code for efficiency

PHPBB3-9837
2019-11-21 13:44:21 +01:00
v12mike
9fff4cf253 [ticket/9837] Make unapproved posts visible to posters
Add tests
Tidy up code
Improve user message formatting

PHPBB3-9837
2019-11-21 13:44:21 +01:00
v12mike
1f10cd51ff [ticket/9837] Display unapproved posts to posters
Add tests and improve style template

PHPBB3-9837
2019-11-21 13:44:21 +01:00
v12mike
46a189fa4c [ticket/9837] Display unapproved posts to originator
Fix whitespace issues

PHPBB3-9837
2019-11-21 13:44:20 +01:00
v12mike
92362441bd [ticket/9837] Make unapproved posts visible to posters
Add tests
Tidy up code
Improve user message formatting

PHPBB3-9837
2019-11-21 13:44:20 +01:00
v12mike
78a913581c [ticket/9837] Display unapproved posts to posters
Add tests and improve style template

PHPBB3-9837
2019-11-21 13:44:20 +01:00
v12mike
63b7518a0f [ticket/9837] Make unapproved posts visible to posters
Improvements for feature following review

PHPBB3-9837
2019-11-21 13:44:19 +01:00
Máté Bartus
01b0ec19c6 [ticket/9837] Small fixes
PHPBB3-9837
2019-11-21 13:44:19 +01:00
Máté Bartus
eb94fe973b [ticket/9837] Display unapproved posts to their authors
Basic functionality mock up.

PHPBB3-9837
2019-11-21 13:44:19 +01:00
Marc Alexander
9872316cac [ticket/16167] Remove uses of user_email_hash
PHPBB3-16167
2019-11-18 21:06:00 +01:00
Marc Alexander
aed7e369c3 [ticket/16167] Add migration for removing user_email_hash
PHPBB3-16167
2019-11-18 20:57:24 +01:00
Marc Alexander
6ecda5be44 Merge branch '3.3.x' 2019-11-17 14:55:30 +01:00
Marc Alexander
f460194379 [ticket/12574] Remove passwords manager & container requirement from oauth
PHPBB3-12574
2019-11-16 23:05:36 +01:00
Marc Alexander
a00b8c2920 [ticket/12574] Clean up dependencies of db auth provider
PHPBB3-12574
2019-11-16 16:02:44 +01:00
Marc Alexander
9e0c3fc81e [ticket/12574] Stop using passwords manager in apache provider
PHPBB3-12574
2019-11-16 16:02:43 +01:00
Marc Alexander
2c3a24b678 [ticket/12574] Remove passwords manager dependency from ldap
Also started to implement tests for ldap provider.

PHPBB3-12574
2019-11-16 16:02:42 +01:00
Marc Alexander
ba6d41ab70 Merge branch '3.3.x' 2019-11-16 14:35:49 +01:00
Marc Alexander
791d633b8a Merge pull request #5733 from mrgoldy/ticket/16206
[ticket/16206] Remove no longer needed workaround for PHP bug #66834
2019-11-16 14:35:45 +01:00
Marc Alexander
6574ff6b1d Merge branch '3.3.x' 2019-11-16 14:22:15 +01:00
Marc Alexander
e39c0be8f8 Merge pull request #5584 from mrgoldy/ticket/16008
[ticket/16008] Clean up OAuth system
2019-11-16 14:22:09 +01:00
Marc Alexander
4679433ae1 [ticket/16008] Adjust naming and remove typo
PHPBB3-16008
2019-11-11 18:21:18 +01:00
mrgoldy
3e22a2eebd [ticket/16206] Remove offsetExists and set non-NULL value
PHPBB3-16206
2019-11-10 22:59:55 +01:00
Marc Alexander
59b8421586 Merge branch '3.3.x' 2019-11-08 20:46:27 +01:00
Marc Alexander
79a6648b99 Merge pull request #5726 from marc1706/ticket/12559
[ticket/12559] Add forum setting to limit subforum legend
2019-11-08 20:46:21 +01:00
Marc Alexander
85837d48b2 [ticket/12559] Use short array syntax
PHPBB3-12559
2019-11-04 17:31:18 +01:00
mrgoldy
cbb5e6f765 [ticket/16008] Enforce string data type as per ticket/16181
PHPBB3-16008
2019-11-03 11:48:10 +01:00
mrgoldy
219955fa6c [ticket/16008] Remove empty line, re-add @changed and remove duplicate code
PHPBB3-16008
2019-11-03 11:48:08 +01:00
mrgoldy
95a696c4da [ticket/16008] Properly order get_external_service_provider
PHPBB3-16008
2019-11-03 11:44:56 +01:00
mrgoldy
85910fe5bc [ticket/16008] Add missing empty line
PHPBB3-16008
2019-11-03 11:44:54 +01:00
mrgoldy
0b39e4e854 [ticket/16008] Clean up phpBB OAuth system
PHPBB3-16008
2019-11-03 11:41:39 +01:00
Marc Alexander
1499e8c18e Merge branch '3.3.x' 2019-11-01 22:01:31 +01:00
Marc Alexander
729e2f5d08 [ticket/12559] Move migration to v330 folder
PHPBB3-12559
2019-11-01 16:52:36 +01:00
PayBas
e2de342d3a [ticket/12559] Update migration dependencies
PHPBB3-12559
2019-11-01 16:26:36 +01:00
PayBas
b14c7c3511 [ticket/12559] Updated copyright information
PHPBB3-12559
2019-11-01 16:26:36 +01:00