aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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-211-2/+2
|\| |
| * | Merge pull request #5674 from JoshyPHP/ticket/16147Marc Alexander2019-10-211-2/+2
| |\ \ | | | | | | | | | | | | [ticket/16147] Updated tokens legend in BBCodes ACP
| | * | [ticket/16147] Updated tokens legend in BBCodes ACPJoshyPHP2019-09-041-2/+2
| | | | | | | | | | | | | | | | PHPBB3-16147
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-201-2/+7
|\| | |
| * | | Merge pull request #5704 from senky/ticket/16172Marc Alexander2019-10-201-2/+7
| |\ \ \ | | | | | | | | | | | | | | | [ticket/16172] Add group rank label to group view
| | * | | [ticket/16172] Use twigJakub Senko2019-10-081-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-16172
| | * | | [ticket/16172] Only display the label when rank image is not presentJakub Senko2019-10-071-1/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-16172
| | * | | [ticket/16172] Add group rank label to group viewJakub Senko2019-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-16172
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-201-1/+27
|\| | | |
| * | | | Merge pull request #5703 from senky/ticket/16174Marc Alexander2019-10-201-1/+27
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/16174] Add core.set_cookie
| | * | | | [ticket/16174] Improve event descJakub Senko2019-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16174
| | * | | | [ticket/16174] Add function params to the eventJakub Senko2019-10-071-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16174
| | * | | | [ticket/16174] Add core.set_cookieJakub Senko2019-10-041-1/+17
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-16174
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-202-11/+99
|\| | | |
| * | | | Merge pull request #5667 from EA117/ticket/16141Marc Alexander2019-10-202-11/+99
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/16141] plupload chunk_size incorrect when 'unlimited' is involved.
| | * | | | [ticket/16141] Add assertion for memory limit divided by twoMarc Alexander2019-10-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16141
| | * | | | [ticket/16141] Add tests for plupload's get_chunk_size()Marc Alexander2019-10-191-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16141
| | * | | | [ticket/16141] plupload chunk_size when 'unlimited' is involved.EA1172019-08-301-33/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change get_chunk_size() calculation to correctly calculate limits without letting a zero "unlimited" value always win. Also ensure get_chunk_size() can only return zero if all of the limits were in fact set to unlimited. PHPBB3-16141
| | * | | | [ticket/16141] plupload chunk_size when 'unlimited' is involved.EA1172019-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change get_chunk_size() calculation to correctly calculate limits without letting a zero "unlimited" value always win. Also ensure get_chunk_size() can only return zero if all of the limits were in fact set to unlimited. PHPBB3-16141
| | * | | | [ticket/16141] plupload chunk_size when 'unlimited' is involved.EA1172019-08-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change get_chunk_size() calculation to correctly calculate limits without letting a zero "unlimited" value always win. Also ensure get_chunk_size() can only return zero if all of the limits were in fact set to unlimited. PHPBB3-16141
| | * | | | [ticket/16141] plupload chunk_size incorrect when 'unlimited' is involved.EA1172019-08-281-31/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change get_chunk_size() calculation to correctly calculate limits without letting a zero "unlimited" value always win. Also ensure get_chunk_size() can only return zero if all of the limits were in fact set to unlimited. PHPBB3-16141
| | * | | | [ticket/16141] plupload chunk_size incorrect when 'unlimited' is involved.EA1172019-08-261-8/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change get_chunk_size() calculation to correctly calculate limits without letting a zero "unlimited" value always win. Also ensure get_chunk_size() can only return zero if all of the limits were in fact set to unlimited. PHPBB3-16141
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-202-1/+8
|\| | | | |
| * | | | | Merge pull request #5705 from senky/ticket/16140Marc Alexander2019-10-202-1/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/16140] Add ucp_profile_profile_info_birthday_label_append
| | * | | | | [ticket/16140] Use twigJakub Senko2019-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16140
| | * | | | | [ticket/16140] Rename event to ucp_profile_profile_info_birthday_label_appendJakub Senko2019-10-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16140
| | * | | | | [ticket/16140] Add ucp_profile_profile_info_birthday_label_afterJakub Senko2019-10-042-1/+8
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-16140
* | | | | | 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-1/+20
|\| | | | |
| * | | | | Merge pull request #5715 from marc1706/ticket/16078Marc Alexander2019-10-201-1/+20
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/16078] Try using retries for timeout issue
| | * | | | | [ticket/16078] Use while loop for visit retriesMarc Alexander2019-10-201-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16078
| | * | | | | [ticket/16078] Try using retries for timeout issueMarc Alexander2019-10-191-1/+17
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timeout only seems to occur on the first test so let's see what a retry can do to help with this issue. PHPBB3-16078
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-202-3/+3
|\| | | | |
| * | | | | Merge pull request #5712 from kasimi/ticket/16184Marc Alexander2019-10-202-3/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | [ticket/16184] Don't entity-encode & character in AJAX response
| | * | | | [ticket/16184] Don't entity-encode & character in AJAX responsekasimi2019-10-172-3/+3
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-16184
* | | | | Merge pull request #5713 from marc1706/ticket/16185Marc Alexander2019-10-193-5/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/16185] Use xenial for builds on travis
| * | | | | [ticket/16185] Add mysql, postgresql to services and use mariadb 10.1Marc Alexander2019-10-192-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated GPG key signature according to mariadb documentation. PHPBB3-16185
| * | | | | [ticket/16185] Use /mode for -perm when checking executablesMarc Alexander2019-10-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The +mode notation is no longer supported and has been deprecated since 2005. PHPBB3-16185
| * | | | | [ticket/16185] Use xenial for builds on travisMarc Alexander2019-10-181-1/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-16185
* | | | | Merge pull request #5700 from marc1706/ticket/16175Marc Alexander2019-10-151-219/+225
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/16175] Update composer dependencies for 3.3.0-b1
| * | | | | [ticket/16175] Update composer dependencies for 3.3.0-b1Marc Alexander2019-10-031-219/+225
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16175
* | | | | | Merge pull request #5708 from marc1706/ticket/16051Marc Alexander2019-10-1326-1034/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/16051] Remove mysql driver as it's no longer supported in PHP >= 7.0
| * | | | | | [ticket/16051] Automatically convert mysql driver to mysqliMarc Alexander2019-10-062-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16051
| * | | | | | [ticket/16051] Remove mysql driver as it's no longer supported in PHP >= 7.0Marc Alexander2019-10-0626-1035/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16051