aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-262-6/+0
|\
| * Merge pull request #5695 from 3D-I/ticket/16161Marc Alexander2019-10-262-6/+0
| |\
| | * [ticket/16161] Enable BBcodes without closing tag3D-I2019-09-222-6/+0
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-269-13/+13
|\ \ \ | |/ /
| * | Merge pull request #5681 from v12mike/ticket/16150Marc Alexander2019-10-269-13/+13
| |\ \
| | * | [ticket/16150] Make post subject links reliablev12mike2019-09-088-12/+12
| | * | [ticket/16150] Make post subject link an absolute urlv12mike2019-09-071-1/+1
* | | | [3.3.x] Update version numbers to 3.3.0-b2-devMarc Alexander2019-10-234-6/+6
* | | | Merge branch 'prep-release-3.3.0-b1' into 3.3.xMarc Alexander2019-10-2318-26/+210
|\ \ \ \
| * | | | [prep-release-3.3.0-b1] Add jquery update migration to 330b1 dependenciesMarc Alexander2019-10-211-0/+1
| * | | | Merge pull request #5716 from marc1706/ticket/15437Marc Alexander2019-10-2113-20/+54
| |\ \ \ \
| | * | | | [ticket/15437] Rename jquery.min.js to jquery-3.4.1.min.jsMarc Alexander2019-10-209-8/+8
| | * | | | [ticket/15437] Add migration for updating jQuery to 3.4.1Marc Alexander2019-10-201-0/+37
| | * | | | [ticket/15437] Update cookie consent to 3.3.1Marc Alexander2019-10-202-7/+7
| | * | | | [ticket/15437] Update jQuery to 3.4.1Marc Alexander2019-10-201-5/+2
| * | | | | Merge pull request #5714 from marc1706/ticket/16043Marc Alexander2019-10-201-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/16043] Check if not null before getting anything from the containerPaul Sohier2019-10-191-1/+1
| |/ / / / /
| * | | | | [prep-release-3.3.0-b1] Add changelog for 3.3.0-b1Marc Alexander2019-10-191-0/+109
| * | | | | [prep-release-3.3.0-b1] Add migration for 3.3.0-b1Marc Alexander2019-10-191-0/+40
| * | | | | [prep-release-3.3.0-b1] Update version to 3.3.0-b1Marc Alexander2019-10-193-5/+5
| |/ / / /
* | | | | 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] Generate SQL query from arraykasimi2019-10-201-0/+1
| | * | | | [ticket/16183] Add core.generate_smilies_count_sql_beforekasimi2019-10-171-3/+22
* | | | | | 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 ACPJoshyPHP2019-09-041-2/+2
| | | |_|/ / | | |/| | |
* | | | | | 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] Use twigJakub Senko2019-10-081-6/+6
| | * | | | | [ticket/16172] Only display the label when rank image is not presentJakub Senko2019-10-071-1/+6
| | * | | | | [ticket/16172] Add group rank label to group viewJakub Senko2019-10-041-1/+1
* | | | | | | 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] Improve event descJakub Senko2019-10-081-1/+1
| | * | | | | | [ticket/16174] Add function params to the eventJakub Senko2019-10-071-2/+12
| | * | | | | | [ticket/16174] Add core.set_cookieJakub Senko2019-10-041-1/+17
| | |/ / / / /
* | | | | | | 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] Add assertion for memory limit divided by twoMarc Alexander2019-10-191-0/+5
| | * | | | | | [ticket/16141] Add tests for plupload's get_chunk_size()Marc Alexander2019-10-191-0/+68
| | * | | | | | [ticket/16141] plupload chunk_size when 'unlimited' is involved.EA1172019-08-301-33/+23
| | * | | | | | [ticket/16141] plupload chunk_size when 'unlimited' is involved.EA1172019-08-291-1/+1
| | * | | | | | [ticket/16141] plupload chunk_size when 'unlimited' is involved.EA1172019-08-281-2/+2
| | * | | | | | [ticket/16141] plupload chunk_size incorrect when 'unlimited' is involved.EA1172019-08-281-31/+20
| | * | | | | | [ticket/16141] plupload chunk_size incorrect when 'unlimited' is involved.EA1172019-08-261-8/+44
* | | | | | | | 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] Use twigJakub Senko2019-10-081-1/+1
| | * | | | | | | [ticket/16140] Rename event to ucp_profile_profile_info_birthday_label_appendJakub Senko2019-10-072-2/+2