aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [prep-release-3.2.1] Update version numbers for 3.2.1-RC1Marc Alexander2017-06-255-6/+6
|
* Merge branch 'prep-release-3.1.11' into prep-release-3.2.1Marc Alexander2017-06-252-0/+188
|\
| * [prep-release-3.1.11] Update changelogMarc Alexander2017-06-251-0/+1
| |
| * Merge branch '3.1.x' into prep-release-3.1.11Marc Alexander2017-06-252-9/+50
| |\
| * | [prep-release-3.1.11] Update changelog for 3.1.11-RC1Marc Alexander2017-06-251-0/+144
| | |
| * | [prep-release-3.1.11] Add migration for update to 3.1.11-RC1Marc Alexander2017-06-251-0/+43
| | |
| * | [prep-release-3.1.11] Update version numbers to 3.1.11-RC1Marc Alexander2017-06-255-7/+7
| | |
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-252-9/+50
|\ \ \ | | |/ | |/|
| * | Merge pull request #4804 from rxu/ticket/15186Marc Alexander2017-06-252-9/+50
| |\ \ | | |/ | |/| | | | [ticket/15186] Fully implement the force_delete_allowed feature
| | * [ticket/15186] Fully implement the force_delete_allowed featurerxu2017-04-192-9/+50
| | | | | | | | | | | | PHPBB3-15186
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-251-17/+30
|\ \ \ | |/ /
| * | [ticket/14982] Always do a ban check except on contact me formDavid Colón2017-06-251-17/+30
| | | | | | | | | | | | PHPBB3-14982
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-251-8/+3
|\ \ \ | |/ /
| * | Merge pull request #4852 from javiexin/ticket/15248Marc Alexander2017-06-251-8/+3
| |\ \ | | | | | | | | | | | | [ticket/15248] Make use of event parameters of core.modify_posting_auth
| | * | [ticket/15248] Make use of event parameters of core.modify_posting_authjaviexin2017-06-191-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixes is_authed and error not behaving as expected by extensions. PHPBB-15248
* | | | [ticket/15251] Use dispatcher_interface in help managerAgris2017-06-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Allow TraceableEventDispatcher for webprofiler PHPBB3-15251
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-251-1/+15
|\ \ \ \ | |/ / /
| * | | Merge pull request #4855 from dsinn/ticket/15250Marc Alexander2017-06-251-1/+15
| |\ \ \ | | | | | | | | | | | | | | | [ticket/15250] Add core event to MCP at the end of merge_posts
| | * | | [ticket/15250] Add core event to MCP at the end of merge_postsDaniel Sinn2017-06-201-1/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-15250
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-252-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4850 from rxu/ticket/15246Marc Alexander2017-06-252-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/15246] Allow use of Unix socket as memcache(d) host
| | * | | | [ticket/15246] Allow use of Unix socket as memcache(d) hostrxu2017-06-172-4/+4
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-15246
| * | | | [ticket/15238] Add missing protected keywordrxu2017-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-15238
| * | | | [ticket/15238] More code cleanuprxu2017-06-181-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-15238
| * | | | [ticket/15238] Code cleanup, add docblocksrxu2017-06-181-11/+39
| | | | | | | | | | | | | | | | | | | | PHPBB3-15238
| * | | | [ticket/15238] Add console command to fix forums/modules left/right IDsrxu2017-06-183-0/+116
| |/ / / | | | | | | | | | | | | PHPBB3-15238
* | | | Merge pull request #4843 from rxu/ticket/15238Marc Alexander2017-06-253-0/+148
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15238] Add console command to fix forums/modules left/right IDs
| * | | | [ticket/15238] Add missing protected keywordrxu2017-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-15238
| * | | | [ticket/15238] More code cleanuprxu2017-06-181-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-15238
| * | | | [ticket/15238] Code cleanup, add docblocksrxu2017-06-181-11/+39
| | | | | | | | | | | | | | | | | | | | PHPBB3-15238
| * | | | [ticket/15238] Add console command to fix forums/modules left/right IDsrxu2017-06-183-0/+119
| | | | | | | | | | | | | | | | | | | | PHPBB3-15238
* | | | | Merge pull request #4824 from senky/ticket/15217Marc Alexander2017-06-251-3/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/15217] Add core.user_format_date_override event
| * | | | | [ticket/15217] Add core.user_format_date_override eventJakub Senko2017-06-051-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15217
* | | | | | Merge pull request #4794 from lr94/ticket/15176Marc Alexander2017-06-245-3/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/15176] Add setting for user activity display limit.
| * | | | | | [ticket/15176] Add setting for user activity display limit.lr942017-04-165-3/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up to phpBB 3.2 the maximum number of posts a user must have to have his activity shown is 5000. This limit is hardcoded in functions_display.php. It would be useful if board administrators could choose to disable the limit or to set an higher value. PHPBB3-15176
* | | | | | | [ticket/15252] Fix editing a topic with poll by user not permitted to edit pollrxu2017-06-211-0/+5
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically, decoding the original poll title and options text was missing. PHPBB3-15252
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-162-0/+8
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #4845 from javiexin/ticket/15241Marc Alexander2017-06-162-0/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/15241] Add ACP template event acp_profile_contact_last
| | * | | | | [ticket/15241] Add ACP template event acp_profile_contact_lastjaviexin2017-06-052-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Event to place code in Profile Field configuration screen, as additional information for Contact Profile Fields. PHPBB-15241
| * | | | | | Merge pull request #4797 from marc1706/ticket/15178Marc Alexander2017-06-112-68/+82
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15178] Update dependencies for 3.1.x
| * \ \ \ \ \ \ Merge pull request #4825 from marc1706/ticket/15219Tristan Darricau2017-06-067-0/+315
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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
* | | | | | | | | [ticket/15243] Check permissions before installing with SQLiteRubén Calvo2017-06-152-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15243
* | | | | | | | | Merge pull request #4799 from marc1706/ticket/15179Marc Alexander2017-06-115-188/+210
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15179] Update dependencies and fix compatibility with newer twig
| * | | | | | | | | [ticket/15179] Replace spaces with a tabMarc Alexander2017-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15179
| * | | | | | | | | Merge branch 'ticket/15178' into ticket/15179Marc Alexander2017-05-314-187/+209
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | [ticket/15178] Run update againMarc Alexander2017-05-311-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15178
| | * | | | | | | | [ticket/15178] Update dependencies for 3.1.xMarc Alexander2017-04-172-64/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15178
* | | | | | | | | | Merge pull request #4826 from marc1706/ticket/15219-rheaTristan Darricau2017-06-067-0/+316
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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
| * \ \ \ \ \ \ \ \ \ Merge branch 'ticket/15219' into ticket/15219-rheaMarc Alexander2017-06-033-0/+132
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | [ticket/15219] Add console command for updating hashes to bcryptMarc Alexander2017-06-033-0/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15219