aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-11-281-7/+18
|\ \ \ | |/ /
| * | Merge pull request #5730 from 3D-I/ticket/16203Marc Alexander2019-11-281-7/+18
| |\ \ | | |/ | |/| | | | [ticket/16203] Enable Emojis and rich text in sent Emails
| | * [ticket/16203] Enable Emojis and rich text in sent Emails3D-I2019-11-061-7/+18
| | | | | | | | | | | | PHPBB3-16203
* | | [ticket/16227] Fix undefined vars on login3D-I2019-11-251-0/+1
| | | | | | | | | | | | PHPBB3-16227
* | | [3.3.x] Update version numbers to 3.3.0-rc1-devMarc Alexander2019-11-231-1/+1
| | |
* | | [prep-release-3.3.0-b2] Update version numbers to 3.3.0-b2Marc Alexander2019-11-221-1/+1
| | |
* | | Merge pull request #5686 from v12mike/ticket/9837Marc Alexander2019-11-221-0/+1
|\ \ \ | | | | | | | | | | | | [ticket/9837] Display unapproved posts to their authors
| * | | [ticket/9837] Make unapproved posts visible to postersv12mike2019-11-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Improvements for feature following review PHPBB3-9837
* | | | [ticket/16167] Deprecate phpbb_email_hash() and remove gen_email_hash()Marc Alexander2019-11-193-22/+14
| | | | | | | | | | | | | | | | | | | | | | | | The latter one has been deprecated for 10 years now. PHPBB3-16167
* | | | [ticket/16167] Remove uses of user_email_hashMarc Alexander2019-11-184-9/+4
| | | | | | | | | | | | | | | | PHPBB3-16167
* | | | 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