aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.2.x' into 3.3.xMarc Alexander2019-09-232-0/+14
|\
| * Merge pull request #5678 from rxu/ticket/16148Marc Alexander2019-09-232-0/+14
| |\
| | * [ticket/16148] Add template events to acp_groups.htmlrxu2019-09-052-0/+14
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-09-222-2/+8
|\ \ \ | |/ /
| * | Merge pull request #5677 from mrgoldy/ticket/14815Marc Alexander2019-09-222-2/+8
| |\ \
| | * | [ticket/14815] Enable contact links in memberlistmrgoldy2019-09-042-2/+8
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-09-224-55/+5
|\ \ \ \ | |/ / /
| * | | Merge pull request #5676 from mrgoldy/ticket/15422Marc Alexander2019-09-224-55/+5
| |\ \ \
| | * | | [ticket/15422] Remove redundant BBCode helplinemrgoldy2019-09-044-55/+5
| | |/ /
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-09-221-2/+15
|\ \ \ \ | |/ / /
| * | | Merge pull request #5665 from 3D-I/ticket/16139Marc Alexander2019-09-221-2/+15
| |\ \ \
| | * | | [ticket/16139] Add core.viewtopic_modify_quick_reply_template_vars3D-I2019-08-251-2/+15
| | |/ /
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-09-221-0/+30
|\ \ \ \ | |/ / /
| * | | Merge pull request #5669 from OxCom/ticket/16143Marc Alexander2019-09-221-0/+30
| |\ \ \
| | * | | [ticket/16143] Add new events before and after move topicsoxcom2019-08-301-0/+30
| | |/ /
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-09-223-20/+63
|\ \ \ \ | |/ / /
| * | | Merge pull request #5664 from mrgoldy/ticket/16076Marc Alexander2019-09-223-20/+63
| |\ \ \
| | * | | [ticket/16076] camelCase and callbackmrgoldy2019-09-221-6/+6
| | * | | [ticket/16076] addFileFilter to check max file size per mime typemrgoldy2019-08-253-20/+63
| | |/ /
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-09-221-3/+3
|\ \ \ \ | |/ / /
| * | | Merge pull request #5673 from AlfredoRamos/ticket/15643Marc Alexander2019-09-221-3/+3
| |\ \ \
| | * | | [ticket/15643] Fix open_basedir warningsAlfredo Ramos2019-09-031-3/+3
| | | |/ | | |/|
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-09-211-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #5687 from rxu/ticket/16157Marc Alexander2019-09-211-1/+1
| |\ \ \
| | * | | [ticket/16157] Fix FORM_INVALID error in the sending email formrxu2019-09-131-1/+1
| | |/ /
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-09-211-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #5688 from rxu/ticket/16156Marc Alexander2019-09-211-1/+1
| |\ \ \
| | * | | [ticket/16156] Fix bots seeing register and logout linksrxu2019-09-131-1/+1
| | |/ /
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-09-218-9/+18
|\ \ \ \ | |/ / /
| * | | Merge pull request #5692 from stevendegroote/ticket/16159Marc Alexander2019-09-218-9/+18
| |\ \ \
| | * | | [ticket/16159] Use predefined DATE_RFC3339stevendegroote2019-09-184-8/+8
| | * | | Merge branch '3.2.x' into ticket/16159stevendegroote2019-09-17511-4030/+11295
| | |\ \ \ | | | |/ /
| | * | | [ticket/16159] Wrap post times in html time tagstevendegroote2019-09-178-9/+18
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-09-211-0/+127
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #5693 from marc1706/ticket/16160Marc Alexander2019-09-211-0/+127
| |\ \ \ \
| | * | | | [ticket/16160] Add missing trailing slashMarc Alexander2019-09-211-1/+1
| | * | | | [ticket/16160] Make script compatible with PHP 5.xMarc Alexander2019-09-191-9/+8
| | * | | | [ticket/16160] Add script for generating package json fileMarc Alexander2019-09-181-0/+128
| | | |/ / | | |/| |
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-09-2025-43/+235
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.2.8' into 3.2.xMarc Alexander2019-09-2026-44/+236
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [prep-release-3.2.8] Add migration for 3.2.8Marc Alexander2019-09-081-0/+36
| | * | | [prep-release-3.2.8] Update version numbers for 3.2.8 releaseMarc Alexander2019-09-084-5/+5
| | * | | [prep-release-3.2.8] Update changelog for 3.2.8Marc Alexander2019-09-081-1/+27
| | * | | [prep-release-3.2.8] Update CREDITS.txtMarc Alexander2019-09-081-3/+3
| | * | | Merge pull request #5679 from mrgoldy/ticket/16123Marc Alexander2019-09-083-5/+36
| | |\ \ \
| | | * | | [ticket/16123] Specify ban_id in validate email fixtureMarc Alexander2019-09-081-0/+3
| | | * | | [ticket/16123] Purge cache to ensure up to date ban list in testsMarc Alexander2019-09-071-1/+3
| | | * | | [ticket/16123] Remove redundant if checkmrgoldy2019-09-071-5/+3
| | | * | | [ticket/16123] Add tests to cover different ban reasonsMarc Alexander2019-09-072-3/+28
| | | * | | [ticket/16123] Check with empty()mrgoldy2019-09-071-1/+1