mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-17 17:56:25 +02:00
Code Issues Releases Wiki Activity
31,966 Commits 10 Branches 193 Tags
86cf600d9e8085ed6c4ff8fe841fe1a5b2375bf9
Commit Graph

27119 Commits

Author SHA1 Message Date
Bob Weinand
86cf600d9e [ticket/16363] Allow replying to locked topics if user has m_lock permissions 
An user may not be able to edit - but lock and unlock.
It is terribly inconvenient for users being only able to un/lock threads to
have to first unlock a topic, then reply and then re-lock it.

Thus in reply mode we check for lock permissions instead of edit.

This also includes editing if the user could normally edit his post if it
weren't for the lock.

PHPBB3-16363
 2020-02-12 09:24:02 +01:00
Marc Alexander
3d4af04927 Merge branch '3.2.x' into 3.3.x 2020-02-09 16:29:30 +01:00
Marc Alexander
1af967b00e Merge pull request #5842 from kasimi/ticket/16149 
[ticket/16149] Always return default profile field data
 2020-02-09 16:29:24 +01:00
Marc Alexander
9cd1277d70 Merge branch '3.2.x' into 3.3.x 2020-02-09 12:49:06 +01:00
Marc Alexander
ee2a59ad59 Merge pull request #5838 from 3D-I/ticket/16339 
[ticket/16339] Fix Poll's voting options refresh
 2020-02-09 12:49:01 +01:00
Marc Alexander
e05efe8280 Merge branch '3.2.x' into 3.3.x 2020-02-09 12:24:07 +01:00
Marc Alexander
ee33976d1d Merge pull request #5835 from mrgoldy/ticket/15766 
[ticket/15766] Check for role on changing permission settings
 2020-02-09 12:24:00 +01:00
Marc Alexander
d0d1fd189b Merge pull request #5831 from marc1706/ticket/16314 
[ticket/16314] Improve handling of page_footer output for controllers
 2020-02-06 17:19:33 +01:00
mrgoldy
87fe2847f0 [ticket/15766] Docblocks, comments and longhand variable names 
PHPBB3-15766
 2020-02-03 22:42:42 +01:00
Marc Alexander
e6624c1fd5 [ticket/16314] Deprecate phpbb_check_and_display_sql_report 
PHPBB3-16314
 2020-02-02 13:48:46 +01:00
Marc Alexander
3bb2edd53d Merge branch '3.2.x' into 3.3.x 2020-02-01 08:50:19 +01:00
Marc Alexander
7de24bad2e Merge pull request #5832 from KYPREO/ticket/16329 
[ticket/16329] Add configuration options for Plupload
 2020-02-01 08:50:12 +01:00
Marc Alexander
297ac8ef4c Merge pull request #5843 from JoshyPHP/ticket/16342 
[ticket/16342] Increase default hashing costs for Argon2 passwords
 2020-01-30 21:38:29 +01:00
Marc Alexander
cd995ff45f Merge branch '3.2.x' into 3.3.x 2020-01-30 21:16:46 +01:00
Marc Alexander
e61761e9af Merge pull request #5834 from mrgoldy/ticket/15370 
[ticket/15370] Loading indicator when submitting permissions
 2020-01-30 21:16:37 +01:00
KYPREO
c927c31391 [ticket/16329] Add configuration options for Plupload 
PHPBB3-16329
PHPBB3-16330
 2020-01-28 23:57:31 +11:00
JoshyPHP
2dbcad7840 [ticket/16342] Increase default hashing costs for Argon2 passwords 
PHPBB3-16342
 2020-01-28 01:42:39 +01:00
Marc Alexander
d2a344af5d Merge pull request #5825 from AlfredoRamos/ticket/16313 
[ticket/16313] Remove http block from sample Nginx configuration file
 2020-01-27 19:45:15 +01:00
kasimi
9d5f9606a4 [ticket/16149] Always return default profile field data 
PHPBB3-16149
 2020-01-27 15:37:12 +01:00
Marc Alexander
4094d62613 Merge branch '3.2.x' into 3.3.x 2020-01-25 15:35:34 +01:00
Marc Alexander
ceaf6fcffe Merge pull request #5837 from 3D-I/ticket/16337 
[ticket/16337] Fix Emoji in BBcode Helpline
 2020-01-25 15:35:29 +01:00
3D-I
e72ae0a4b2 [ticket/16339] Fix Poll's voting options refresh 
PHPBB3-16339
 2020-01-25 02:11:40 +01:00
Marc Alexander
28620b7d93 Merge branch '3.2.x' into 3.3.x 2020-01-24 16:45:36 +01:00
Marc Alexander
65cfd74b98 Merge pull request #5836 from 3D-I/ticket/16316 
[ticket/16316] Fix breadcrumbs markup validation
 2020-01-24 16:34:44 +01:00
3D-I
11e2cd925b [ticket/16337] Fix Emoji in BBcode Helpline 
PHPBB3-16337
 2020-01-24 04:46:57 +01:00
3D-I
f7797b89ed [ticket/16337] Fix Emoji in BBcode Helpline 
PHPBB3-16337
 2020-01-24 04:38:01 +01:00
3D-I
7d80314235 [ticket/16337] Fix Emoji in BBcode Helpline 
PHPBB3-16337
 2020-01-24 02:55:12 +01:00
3D-I
3d9845ebed [ticket/16316] Fix breadcrumbs markup validation 
PHPBB3-16316
 2020-01-24 00:21:50 +01:00
Marc Alexander
b3d07e26fc Merge pull request #5822 from rxu/ticket/16307 
[ticket/16307] Fix SQL time reporting when debug.sql_explain parameter is set
 2020-01-22 21:22:38 +01:00
Marc Alexander
9b12a923f5 Merge branch '3.2.x' into 3.3.x 2020-01-22 21:21:07 +01:00
Marc Alexander
eff3b08d49 Merge pull request #5833 from mrgoldy/ticket/16332 
[ticket/16332] Code and Quote language strings globally available
 2020-01-22 21:21:01 +01:00
KYPREO
1f22248965 Merge branch '3.2.x' into ticket/16329 2020-01-22 20:24:47 +11:00
KYPREO
68677b8525 [ticket/16329] Add configuration options for Plupload 
PHPBB3-16329
PHPBB3-16330
 2020-01-22 20:21:12 +11:00
3D-I
8e538eebc5 [ticket/16316] Fix breadcrumbs markup validation 
PHPBB3-16316
 2020-01-21 22:48:20 +01:00
mrgoldy
18e75202d7 [ticket/15766] Use proper variable name for permission set 
PHPBB3-15766
 2020-01-21 17:27:03 +01:00
mrgoldy
11cf09b41a [ticket/15766] Check for role on changing permission settings 
PHPBB3-15766
 2020-01-21 17:25:27 +01:00
mrgoldy
908d04d0e8 [ticket/15370] Loading indicator when submitting permissions 
PHPBB3-15370
 2020-01-21 15:27:28 +01:00
mrgoldy
e7c028eed6 [ticket/16332] Code and Quote language strings globally available 
PHPBB3-16332
 2020-01-21 14:30:12 +01:00
Marc Alexander
8bdad7d73e [ticket/16314] Reorder controller helper constructor parameters 
PHPBB3-16314
 2020-01-20 17:28:37 +01:00
Marc Alexander
12a624330f Merge branch '3.2.x' into 3.3.x 2020-01-20 17:28:30 +01:00
Marc Alexander
d7be6e037b Merge pull request #5814 from 3D-I/ticket/15079 
[ticket/15079] Fix Emoji and rich text in subject of post draft
 2020-01-20 17:28:24 +01:00
Marc Alexander
1d90ddc0a9 Merge branch '3.2.x' into 3.3.x 2020-01-20 17:25:56 +01:00
Marc Alexander
830d16943b Merge pull request #5813 from 3D-I/ticket/15712 
[ticket/15712] Fix Emoji and rich text in PM subject & draft
 2020-01-20 17:25:48 +01:00
KYPREO
0b03fa963a [ticket/16329] Add configuration options for Plupload 
PHPBB3-16329
PHPBB3-16330
 2020-01-20 22:16:38 +11:00
KYPREO
a1617548cf [ticket/16329] Add configuration options for Plupload 
PHPBB3-16329
PHPBB3-16330
 2020-01-20 15:19:56 +11:00
Marc Alexander
2bfea20007 [ticket/16314] Create correct adm relative path for controller helper 
PHPBB3-16314
 2020-01-19 21:43:07 +01:00
Marc Alexander
843e3ae849 [ticket/16314] Improve handling of page_footer output for controllers 
Moved the common template output to controller helper and added
garbage_collection handling to kernel_terminate_subscriber.

PHPBB3-16314
 2020-01-19 16:03:32 +01:00
Marc Alexander
6f36a478a5 Merge branch '3.2.x' into 3.3.x 2020-01-18 21:46:12 +01:00
Marc Alexander
880deabac1 Merge pull request #5821 from marc1706/ticket/16296 
[ticket/16296] Adjust form token check for mark actions
 2020-01-18 21:46:07 +01:00
Marc Alexander
eba65f57ab Merge branch '3.2.x' into 3.3.x 2020-01-18 16:46:52 +01:00