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

30420 Commits

Author SHA1 Message Date
Marc Alexander
8514e8be73
Merge branch '3.2.x' 2017-07-11 21:30:04 +02:00
Marc Alexander
a53c8cee79
[3.2.x] Update version numbers for 3.2.2-dev 2017-07-11 21:27:26 +02:00
Marc Alexander
8e310231bd
Merge branch 'prep-release-3.2.1' into 3.2.x 2017-07-11 21:26:12 +02:00
Marc Alexander
324d1e3c55
Merge branch '3.2.x' 2017-07-11 21:19:00 +02:00
Marc Alexander
05c47a0f4a
Merge branch '3.1.x' into 3.2.x 2017-07-11 21:18:42 +02:00
Marc Alexander
50d2e337b0
[3.1.x] Update version number to 3.1.12-dev 2017-07-11 21:15:08 +02:00
Marc Alexander
dff65f902c
Merge branch 'prep-release-3.1.11' into 3.1.x 2017-07-11 21:09:12 +02:00
Marc Alexander
b99d47ce7e
[prep-release-3.2.1] Add changelog since 3.2.0 release-3.2.1-RC1 2017-06-25 22:03:32 +02:00
Marc Alexander
03cd4658d0
[prep-release-3.2.1] Add migration for 3.2.1-RC1 2017-06-25 21:59:14 +02:00
Marc Alexander
d423b2ec0d
[prep-release-3.2.1] Update version numbers for 3.2.1-RC1 2017-06-25 21:55:00 +02:00
Marc Alexander
35b7a4fae5
Merge branch 'prep-release-3.1.11' into prep-release-3.2.1 2017-06-25 21:53:12 +02:00
Marc Alexander
a5d83e12ec
[prep-release-3.1.11] Update changelog release-3.1.11-RC1 2017-06-25 21:36:40 +02:00
Marc Alexander
08c146ee34
Merge branch '3.1.x' into prep-release-3.1.11 2017-06-25 21:32:12 +02:00
Marc Alexander
5e24508280
Merge branch '3.2.x' 2017-06-25 21:27:09 +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
d811743303
[prep-release-3.1.11] Update changelog for 3.1.11-RC1 2017-06-25 17:48:07 +02:00
Marc Alexander
65f7137825
[prep-release-3.1.11] Add migration for update to 3.1.11-RC1 2017-06-25 17:45:07 +02:00
Marc Alexander
04ef19595c
[prep-release-3.1.11] Update version numbers to 3.1.11-RC1 2017-06-25 17:42:55 +02:00
Marc Alexander
848cc8c5e6
Merge branch '3.2.x' 2017-06-25 17:27:50 +02:00
Marc Alexander
4f81c94a95
Merge branch '3.1.x' into 3.2.x 2017-06-25 17:27:47 +02:00
Marc Alexander
71f9c6ebe5
Merge pull request #4860 from marc1706/ticket/14982
[ticket/14982] Always do a ban check except on contact me form
2017-06-25 17:27:42 +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
6b55ae7573
Merge branch '3.2.x' 2017-06-25 15:12:39 +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
Marc Alexander
c876392b98
Merge branch '3.2.x' 2017-06-25 14:13:58 +02:00
Marc Alexander
937cc1ca14
Merge pull request #4858 from marc1706/ticket/15251
[ticket/15251] Use dispatcher_interface in help manager
2017-06-25 14:13:53 +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
797bde42aa
Merge branch '3.2.x' 2017-06-25 11:07:13 +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
fd9a084386
Merge branch '3.2.x' 2017-06-25 10:32:43 +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
3b8a155de0
Merge pull request #4848 from rubencm/ticket/15203
[ticket/15203] Include missing constants in web installer
2017-06-25 10:29:49 +02:00
Marc Alexander
1660f7e52c
Merge branch '3.2.x' 2017-06-25 10:24:15 +02:00
Marc Alexander
e45ba1d279
Merge branch '3.1.x' into 3.2.x 2017-06-25 10:23:53 +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
e50e5dbcae
Merge pull request #4842 from rxu/ticket/15238-3.1
[ticket/15238] Add console command to fix forums/modules left/right IDs
2017-06-25 10:20:19 +02:00
Marc Alexander
1b3bdddfd1
Merge branch '3.2.x' 2017-06-25 10:10:14 +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
976d799ff2
Merge branch '3.2.x' 2017-06-24 21:42:54 +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
Marc Alexander
d77c018d7f
Merge branch '3.2.x' 2017-06-24 21:32:14 +02:00
Marc Alexander
909976f076
Merge pull request #4856 from rxu/ticket/15252
[ticket/15252] Fix editing a topic with poll by user not permitted to edit poll
2017-06-24 21:31: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