1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-19 23:20:22 +01:00

25205 Commits

Author SHA1 Message Date
Marc Alexander
e7be47c93d
Merge branch 'ticket/security/210' into ticket/security/210-rhea 2017-07-10 21:18:45 +02:00
Marc Alexander
fa631947f1
[ticket/security/210] Adjust regex and add tests for IPv6
SECURITY-210
2017-07-10 21:17:52 +02:00
Marc Alexander
3fc3f55d34
Merge branch 'ticket/security/210' into ticket/security/210-rhea 2017-07-09 16:24:49 +02:00
Marc Alexander
a281d526dc
[ticket/security/210] Prevent using IP addresses or ports for remote avatar
SECURITY-210
2017-07-09 15:38:18 +02:00
Marc Alexander
aef138d8bc
Merge branch '3.1.x' into 3.2.x 2017-06-25 21:26:43 +02:00
Marc Alexander
dc49a8a199
Merge pull request #4804 from rxu/ticket/15186
[ticket/15186] Fully implement the force_delete_allowed feature
2017-06-25 21:25:54 +02:00
Marc Alexander
4f81c94a95
Merge branch '3.1.x' into 3.2.x 2017-06-25 17:27:47 +02:00
David Colón
cc556122f3
[ticket/14982] Always do a ban check except on contact me form
PHPBB3-14982
2017-06-25 15:32:49 +02:00
Marc Alexander
68346e7dfb
Merge branch '3.1.x' into 3.2.x 2017-06-25 15:12:36 +02:00
Marc Alexander
8938a0ce98
Merge pull request #4852 from javiexin/ticket/15248
[ticket/15248] Make use of event parameters of core.modify_posting_auth
2017-06-25 15:12:32 +02:00
Agris
ba5a2bcb73
[ticket/15251] Use dispatcher_interface in help manager
Allow TraceableEventDispatcher for webprofiler

PHPBB3-15251
2017-06-25 12:02:25 +02:00
Marc Alexander
b28dc339f0
Merge branch '3.1.x' into 3.2.x 2017-06-25 11:06:47 +02:00
Marc Alexander
689ebd3bb6
Merge pull request #4855 from dsinn/ticket/15250
[ticket/15250] Add core event to MCP at the end of merge_posts
2017-06-25 11:05:40 +02:00
Marc Alexander
774c79c631
Merge branch '3.1.x' into 3.2.x 2017-06-25 10:32:39 +02:00
Marc Alexander
ea8334b693
Merge pull request #4850 from rxu/ticket/15246
[ticket/15246] Allow use of Unix socket as memcache(d) host
2017-06-25 10:32:35 +02:00
Marc Alexander
868ae09e1b
Merge pull request #4843 from rxu/ticket/15238
[ticket/15238] Add console command to fix forums/modules left/right IDs
2017-06-25 10:20:49 +02:00
Marc Alexander
c5501d90a4
Merge pull request #4824 from senky/ticket/15217
[ticket/15217] Add core.user_format_date_override event
2017-06-25 10:10:09 +02:00
Marc Alexander
b59073cf3e
Merge pull request #4794 from lr94/ticket/15176
[ticket/15176] Add setting for user activity display limit.
2017-06-24 21:42:39 +02:00
rxu
14cea02412 [ticket/15252] Fix editing a topic with poll by user not permitted to edit poll
Basically, decoding the original poll title and options text was missing.

PHPBB3-15252
2017-06-21 22:22:47 +07:00
Daniel Sinn
127f5a3ffa [ticket/15250] Add core event to MCP at the end of merge_posts
PHPBB3-15250
2017-06-20 17:56:48 -04:00
rxu
f3403fb10d [ticket/15238] Add missing protected keyword
PHPBB3-15238
2017-06-20 21:07:11 +07:00
rxu
9402339af9 [ticket/15238] Add missing protected keyword
PHPBB3-15238
2017-06-20 21:06:01 +07:00
javiexin
ca5243810f [ticket/15248] Make use of event parameters of core.modify_posting_auth
Fixes is_authed and error not behaving as expected by extensions.

PHPBB-15248
2017-06-19 23:29:54 +02:00
rxu
840cb510e4 [ticket/15238] More code cleanup
PHPBB3-15238
2017-06-18 23:15:05 +07:00
rxu
c1fa252fc1 [ticket/15238] Code cleanup, add docblocks
PHPBB3-15238
2017-06-18 23:14:09 +07:00
rxu
fd822ade20 [ticket/15238] Add console command to fix forums/modules left/right IDs
PHPBB3-15238
2017-06-18 23:14:09 +07:00
rxu
7f08d46aa4 [ticket/15238] More code cleanup
PHPBB3-15238
2017-06-18 23:11:44 +07:00
rxu
b0ed1f2388 [ticket/15238] Code cleanup, add docblocks
PHPBB3-15238
2017-06-18 23:11:27 +07:00
rxu
8a8d435ed4 [ticket/15238] Add console command to fix forums/modules left/right IDs
PHPBB3-15238
2017-06-18 23:11:12 +07:00
rxu
c255e1fae8 [ticket/15246] Allow use of Unix socket as memcache(d) host
PHPBB3-15246
2017-06-17 15:42:08 +07:00
Marc Alexander
7301748a3a
Merge branch '3.1.x' into 3.2.x 2017-06-16 20:18:50 +02:00
Marc Alexander
1c4f49249f
Merge pull request #4845 from javiexin/ticket/15241
[ticket/15241] Add ACP template event acp_profile_contact_last
2017-06-16 20:18:46 +02:00
Rubén Calvo
e6bdba7da1 [ticket/15243] Check permissions before installing with SQLite
PHPBB3-15243
2017-06-15 16:56:19 +02:00
Marc Alexander
c830af48bd
Merge pull request #4799 from marc1706/ticket/15179
[ticket/15179] Update dependencies and fix compatibility with newer twig
2017-06-11 16:44:15 +02:00
Marc Alexander
65c6bae91d
Merge pull request #4797 from marc1706/ticket/15178
[ticket/15178] Update dependencies for 3.1.x
2017-06-11 16:43:25 +02:00
Tristan Darricau
1571c76ccd
Merge pull request #4826 from marc1706/ticket/15219-rhea
[ticket/15219] Update hashes to bcrypt with cron -- Rhea

* github.com:phpbb/phpbb:
  [ticket/15219] Add console command for updating hashes to bcrypt
  [ticket/15219] Add missing space
  [ticket/15219] Update hashes to bcrypt with cron
2017-06-06 09:33:22 +02:00
Tristan Darricau
2a49420124
Merge pull request #4825 from marc1706/ticket/15219
[ticket/15219] Update hashes to bcrypt with cron

* github.com:phpbb/phpbb:
  [ticket/15219] Add console command for updating hashes to bcrypt
  [ticket/15219] Add missing space
  [ticket/15219] Update hashes to bcrypt with cron
2017-06-06 09:32:45 +02:00
javiexin
ecdc05a13e [ticket/15241] Add ACP template event acp_profile_contact_last
Event to place code in Profile Field configuration screen,
as additional information for Contact Profile Fields.

PHPBB-15241
2017-06-05 15:14:42 +02:00
Jakub Senko
27b2d91713
[ticket/15217] Add core.user_format_date_override event
PHPBB3-15217
2017-06-05 13:02:05 +02:00
Marc Alexander
34fb146ab5
Merge branch '3.1.x' into 3.2.x 2017-06-05 11:57:18 +02:00
Marc Alexander
05a8baffdb
Merge pull request #4840 from rmcgirr83/ticket_15237
[ticket/15237] Fix unguarded includes to functions_user
2017-06-05 11:56:22 +02:00
Marc Alexander
4177edf33a
Merge pull request #4833 from javiexin/ticket/15227
[ticket/15227] Check PHP version and remove old unused code
2017-06-05 11:53:02 +02:00
Marc Alexander
192d3932f6
Merge branch '3.1.x' into 3.2.x 2017-06-05 11:43:53 +02:00
Marc Alexander
3f6119c42b
Merge pull request #4818 from rxu/ticket/15205
[ticket/15205] Add template events prepending/appending subforum link
2017-06-05 11:22:13 +02:00
Marc Alexander
f0dbfc56d5
Merge pull request #4812 from rxu/ticket/15200-3.1.x
[ticket/15200] Allow extensions using custom templates for help/faq controllers
2017-06-05 11:18:27 +02:00
Marc Alexander
fd5a013f06
Merge pull request #4811 from rxu/ticket/15200
[ticket/15200] Allow extensions using custom templates for help/faq controllers
2017-06-05 11:16:32 +02:00
Marc Alexander
be76d582dc
Merge branch '3.1.x' into 3.2.x 2017-06-05 11:13:39 +02:00
Marc Alexander
acf9cdba01
Merge pull request #4810 from rxu/ticket/15199
[ticket/15199] Add core event to the messenger send() function
2017-06-05 11:13:35 +02:00
Marc Alexander
346c784bf3
Merge branch '3.1.x' into 3.2.x 2017-06-05 11:02:30 +02:00
Marc Alexander
a6939fcb8e
Merge pull request #4784 from rubencm/ticket/15150
[ticket/15150] Add Jabber SSL context configuration options
2017-06-05 11:00:38 +02:00