aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.2.x' into 3.3.xMarc Alexander2019-11-141-8/+6
|\
| * [ticket/16210] Ensure terms of use is not skipped by enforcing form tokenMarc Alexander2019-11-121-8/+6
| | | | | | | | PHPBB3-16210
* | Merge pull request #5726 from marc1706/ticket/12559Marc Alexander2019-11-082-1/+6
|\ \ | | | | | | | | | [ticket/12559] Add forum setting to limit subforum legend
| * | [ticket/12559] Applied DeMorgan and removed unnecessary true:falsePayBas2019-11-011-1/+1
| | | | | | | | | | | | PHPBB3-12559
| * | [ticket/12559] Add forum setting to limit subforum legendPayBas2019-11-012-1/+6
| | | | | | | | | | | | | | | | | | Squashed all commits, they were basically just typos and errors PHPBB3-12559
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-11-011-1/+2
|\ \ \ | | |/ | |/|
| * | Merge branch '3.2.x' into ticket/161533D-I2019-10-2810-39/+177
| |\ \
| * | | [ticket/16153] Enable Emojis and rich text in Topic title3D-I2019-09-101-1/+2
| | | | | | | | | | | | | | | | PHPBB3-16153
* | | | [ticket/16189] Make wrappers call native functionsrubencm2019-11-011-114/+2
| | | | | | | | | | | | | | | | PHPBB3-16189
* | | | [ticket/16189] Update versionrubencm2019-11-012-5/+6
| | | | | | | | | | | | | | | | PHPBB3-16189
* | | | [ticket/16188] Remove some legacy code and fix bugrubencm2019-11-013-8/+6
| | | | | | | | | | | | | | | | PHPBB3-16189
* | | | [ticket/16189] Deprecate inet_ntop and inet_pton wrappersrubencm2019-11-012-150/+158
| |_|/ |/| | | | | | | | PHPBB3-16189
* | | Merge pull request #5719 from rubencm/ticket/15958Marc Alexander2019-11-011-5/+5
|\ \ \ | | | | | | | | | | | | [ticket/15958] Standarize create forums default options
| * | | [ticket/15958] Standarize create forums default optionsrubencm2019-10-241-5/+5
| | | | | | | | | | | | | | | | PHPBB3-15958
* | | | [ticket/16190] Deprecate phpbb's checkdnsrr wrapperrubencm2019-10-313-167/+23
| | | | | | | | | | | | | | | | PHPBB3-16190
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-282-13/+42
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #5682 from 3D-I/ticket/16151Marc Alexander2019-10-282-13/+42
| |\ \ \ | | | | | | | | | | | | | | | [ticket/16151] Enable Emojis and rich text in forum name
| | * | | [ticket/16151] Enable Emojis and rich text in forum name3D-I2019-10-282-25/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move to a new function() PHPBB3-16151
| | * | | [ticket/16151] Enable Emojis and rich text in forum name3D-I2019-09-081-1/+21
| | | |/ | | |/| | | | | | | | | PHPBB3-16151
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-281-4/+17
|\ \ \ \ | |/ / /
| * | | Merge pull request #5672 from OxCom/ticket/16146Marc Alexander2019-10-281-4/+17
| |\ \ \ | | | | | | | | | | | | | | | [ticket/16146] New core event: after move forum
| | * | | [ticket/16146] Fix typos in event descriptionMarc Alexander2019-10-261-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-16146
| | * | | [ticket/16146] fix event name in commentoxcom2019-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-16146
| | * | | [ticket/16146] New core event: after move forumoxcom2019-09-021-0/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-16146
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-261-5/+0
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Merge pull request #5695 from 3D-I/ticket/16161Marc Alexander2019-10-261-5/+0
| |\ \ \ | | | | | | | | | | | | | | | [ticket/16161] Enable BBcodes without closing tag
| | * | | [ticket/16161] Enable BBcodes without closing tag3D-I2019-09-221-5/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-16161
* | | | | [3.3.x] Update version numbers to 3.3.0-b2-devMarc Alexander2019-10-231-1/+1
| | | | |
* | | | | Merge branch 'prep-release-3.3.0-b1' into 3.3.xMarc Alexander2019-10-233-4/+4
|\ \ \ \ \
| * \ \ \ \ Merge pull request #5716 from marc1706/ticket/15437Marc Alexander2019-10-212-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | [ticket/15437] Update jQuery and cookie consent to latest
| | * | | | | [ticket/15437] Rename jquery.min.js to jquery-3.4.1.min.jsMarc Alexander2019-10-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15437
| * | | | | | [ticket/16043] Check if not null before getting anything from the containerPaul Sohier2019-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is only happening when there is basicly an error during init of the container. PHPBB3-16043
| * | | | | | [prep-release-3.3.0-b1] Update version to 3.3.0-b1Marc Alexander2019-10-191-1/+1
| |/ / / / /
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-211-3/+23
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #5711 from kasimi/ticket/16183Marc Alexander2019-10-211-3/+23
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/16183] Add core.generate_smilies_count_sql_before
| | * | | | | [ticket/16183] Generate SQL query from arraykasimi2019-10-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16183
| | * | | | | [ticket/16183] Add core.generate_smilies_count_sql_beforekasimi2019-10-171-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16183
* | | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-201-0/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #5710 from kasimi/ticket/16182Marc Alexander2019-10-201-0/+16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/16182] Add core.generate_smilies_modify_rowset
| | * | | | | | [ticket/16182] Add core.generate_smilies_modify_rowsetkasimi2019-10-171-0/+16
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-16182
* | | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-201-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | [ticket/16184] Don't entity-encode & character in AJAX responsekasimi2019-10-171-2/+2
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-16184
* | | | | Merge pull request #5708 from marc1706/ticket/16051Marc Alexander2019-10-135-15/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/16051] Remove mysql driver as it's no longer supported in PHP >= 7.0
| * | | | | [ticket/16051] Remove mysql driver as it's no longer supported in PHP >= 7.0Marc Alexander2019-10-065-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16051
* | | | | | [ticket/14465] Remove setting for maximum password lengthMarc Alexander2019-10-035-14/+11
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-14465
* | | | | Merge pull request #5652 from marc1706/ticket/11327Marc Alexander2019-10-032-175/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/11327] Implement forgot password functionality via form
| * | | | | [ticket/11327] Split up into forgot password and reset passwordMarc Alexander2019-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11327
| * | | | | [ticket/11327] Move UCP remind functionality to a controller for password resetMarc Alexander2019-08-082-175/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11327
* | | | | | [ticket/15257] Improve readability of check_is_enableableMarc Alexander2019-09-301-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15257
* | | | | | [ticket/15257] Address validation issuesJakub Senko2019-09-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15257