Matt Friedman
a6b45ff0fd
[ticket/15369] Update composer to 1.6.x
...
PHPBB3-15369
2018-01-06 09:36:16 -08:00
Matt Friedman
3c143e7ae8
[ticket/15369] Update composer to 1.5
...
PHPBB3-15369
2018-01-02 12:27:41 -08:00
Marc Alexander
9e3432cd7b
Merge branch '3.2.x'
2017-12-28 22:06:33 +01:00
Marc Alexander
0ff5f9fa0e
[3.2.x] Update version number to 3.2.3-dev
2017-12-28 22:03:10 +01:00
Marc Alexander
39b1420774
[prep-release-3.2.2] Update changelog for 3.2.2-RC1
2017-12-28 15:10:03 +01:00
Marc Alexander
bd52c64e68
[prep-release-3.2.2] Add migration for 3.2.2-RC1
2017-12-28 15:02:37 +01:00
Marc Alexander
adad3aac66
[prep-release-3.2.2] Update version to 3.2.2
2017-12-28 14:59:00 +01:00
Marc Alexander
ca4a3f4698
[prep-release-3.2.2] Update version to 3.2.2-RC1
2017-12-28 14:58:01 +01:00
Marc Alexander
7bb7bbc54c
Merge branch '3.2.x'
2017-12-28 14:51:05 +01:00
Marc Alexander
e90e3ec368
[ticket/15179] Update dependencies for 3.2.x
...
PHPBB3-15179
2017-12-28 13:52:51 +01:00
Marc Alexander
f9da4f10ae
Merge pull request #5017 from Elsensee/ticket/15339-33
...
[ticket/15339] Use manual method when adding modules
2017-12-28 11:14:13 +01:00
Marc Alexander
d90680d685
Merge pull request #4971 from Elsensee/ticket/15339
...
[ticket/15339] Use manual method when adding modules
2017-12-28 10:50:55 +01:00
Marc Alexander
ea1d911508
Merge branch '3.2.x'
2017-12-28 10:43:31 +01:00
Marc Alexander
7c0ff6ddd4
Merge pull request #5045 from senky/ticket/15454
...
[ticket/15454] Add core.mcp_queue_approve_details_template
2017-12-28 10:43:27 +01:00
Marc Alexander
b6ac183a32
[ticket/15454] Add post template data to event
...
PHPBB3-15454
2017-12-28 09:09:21 +01:00
Marc Alexander
19c8112e99
Merge branch '3.2.x'
2017-12-28 08:29:32 +01:00
Marc Alexander
0b52923129
Merge pull request #5044 from hubaishan/ticket/15453
...
[ticket/15453] Add core event after language deleted in acp_language.php
2017-12-28 08:29:28 +01:00
Marc Alexander
15033667da
Merge branch '3.2.x'
2017-12-28 08:22:40 +01:00
Marc Alexander
53ce1330d6
Merge pull request #5063 from vinny/ticket/15485
...
[ticket/15485] Add template event for forum images
2017-12-28 08:22:36 +01:00
Marc Alexander
a12ad9c914
Merge branch '3.2.x'
2017-12-27 21:31:36 +01:00
Marc Alexander
01181f1e4e
Merge pull request #5040 from kasimi/ticket/15446
...
[ticket/15446] Add event core.acp_profile_action
2017-12-27 21:31:31 +01:00
Marc Alexander
59c7a5506b
Merge branch '3.2.x'
2017-12-27 21:27:15 +01:00
Marc Alexander
d8f9cb4961
Merge pull request #5041 from kasimi/ticket/15447
...
[ticket/15447] Add event core.acp_profile_modify_profile_row
2017-12-27 21:27:11 +01:00
Marc Alexander
475b85200b
Merge branch '3.2.x'
2017-12-27 21:14:02 +01:00
Marc Alexander
20a6182a86
Merge pull request #5042 from kinerity/ticket/15451
...
[ticket/15451] Add template event mcp_topic_postrow_attachments_before/after
2017-12-27 21:13:38 +01:00
Marc Alexander
f0284ddbdf
Merge branch '3.2.x'
2017-12-27 20:56:51 +01:00
Marc Alexander
dddcf28a2d
Merge pull request #5043 from kinerity/ticket/15452
...
[ticket/15452] Add template event mcp_topic_postrow_post_before
2017-12-27 20:56:47 +01:00
hubaishan
c906335ce4
[ticket/15453] Add core event after language deleted in acp_language.php
...
Add core event after language deleted in acp_language.php
PHPBB3-15453
2017-12-27 20:54:15 +01:00
Marc Alexander
a89fdabb35
Merge branch '3.2.x'
2017-12-27 20:44:44 +01:00
Marc Alexander
d1f10d54fc
Merge pull request #5055 from dsinn/ticket/15471
...
[ticket/15471] Add core events to ACP when pruning a forum
2017-12-27 20:44:40 +01:00
Marc Alexander
69416b65f3
[ticket/15485] Add missing separation below event title
...
PHPBB3-15485
2017-12-27 20:40:55 +01:00
Marc Alexander
3bc3c7febc
Merge branch '3.2.x'
2017-12-27 20:28:14 +01:00
Marc Alexander
bdda36798b
Merge pull request #5064 from rxu/ticket/15486
...
[ticket/15486] Add core event to the user_add() to modify notifications data
2017-12-27 20:28:10 +01:00
Derky
c94c2a1ec2
Merge branch '3.2.x'
2017-12-27 19:32:20 +01:00
Derky
8e19bb83b5
Merge pull request #5061 from marc1706/ticket/15322
...
[ticket/15322] Add config for envelope sender & remove mail function setting
2017-12-27 19:30:27 +01:00
Marc Alexander
a4a57b5860
Merge branch '3.2.x'
2017-12-27 19:14:03 +01:00
Marc Alexander
8f662eac40
Merge pull request #5037 from hubaishan/ticket/14857
...
[ticket/14857] Throw `S` from dateformat for non English languages
2017-12-27 19:13:59 +01:00
Marc Alexander
c596383592
Merge branch '3.2.x'
2017-12-27 19:08:16 +01:00
Marc Alexander
64dad1a362
Merge pull request #5038 from JoshyPHP/ticket/15444
...
[ticket/15444] Merge duplicate BBCodes via a migration
2017-12-27 19:08:12 +01:00
Marc Alexander
52cde712f2
Merge branch '3.2.x'
2017-12-27 18:39:20 +01:00
Marc Alexander
9d5c81ea7a
Merge pull request #5053 from JoshyPHP/ticket/15468
...
Add a service to merge duplicate BBCodes
2017-12-27 18:39:16 +01:00
Marc Alexander
1656ca4011
Merge branch '3.2.x'
2017-12-27 18:16:29 +01:00
Marc Alexander
9632294730
Merge pull request #5046 from JoshyPHP/ticket/15457
...
[ticket/15457] Updated s9e/text-formatter dependency
2017-12-27 18:11:18 +01:00
Marc Alexander
93beaa8a3a
Merge branch '3.2.x'
2017-12-27 14:39:46 +01:00
Marc Alexander
6acfe2a0cb
Merge pull request #4868 from javiexin/ticket/15266
...
[ticket/15266] Fix events in content_visibility
2017-12-27 14:15:27 +01:00
Marc Alexander
9567162295
[ticket/15322] Adjust language variables as suggested
...
PHPBB3-15322
2017-12-27 13:31:09 +01:00
Marc Alexander
dc48f28da1
[ticket/15266] Update since, add changed, and use empty where applicable
...
PHPBB3-15266
2017-12-27 13:28:04 +01:00
javiexin
bd81af3b9e
[ticket/15266] Expand functionality of content_visibility
...
Added new function "is_visible", and replaced several immediate
uses of the above, including a single event in the new function
to handle change in all places consistently, and much simpler.
PHPBB3-15266
2017-12-27 13:27:38 +01:00
Oliver Schramm
1702219629
Merge branch 'ticket/15339' into ticket/15339-33
2017-12-24 19:55:46 +01:00
Oliver Schramm
2b16b7cada
[ticket/15339] Fix tests
...
PHPBB3-15339
2017-12-24 19:55:03 +01:00
