aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-201-1/+1
|\
| * Merge pull request #4511 from senky/ticket/14842Marc Alexander2016-11-201-1/+1
| |\
| | * [ticket/14842] Don't display filesize limit if there is noneJakub Senko2016-11-151-1/+1
* | | Merge remote-tracking branch 'senky/ticket/14739' into 3.2.xMarc Alexander2016-11-174-6/+0
|\ \ \
| * | | [ticket/14739] Remove SQLite 2.8.x database driverJakub Senko2016-11-164-6/+0
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-161-1/+17
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #4497 from senky/ticket/14849Marc Alexander2016-11-161-1/+17
| |\ \ \
| | * | | [ticket/14849] Add core.acp_extensions_run_actionJakub Senko2016-11-131-1/+17
| | | |/ | | |/|
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-161-1/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge pull request #4510 from senky/ticket/14864Marc Alexander2016-11-161-1/+1
| |\ \
| | * | [ticket/14864] Set maxlength=64 to dateformat in ACPJakub Senko2016-11-131-1/+1
| | |/
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-1/+13
|\ \ \ | |/ /
| * | Merge pull request #4495 from senky/ticket/14847Marc Alexander2016-11-121-1/+13
| |\ \
| | * | [ticket/14847] Add core.acp_attachments_config_edit_addJakub Senko2016-11-021-1/+13
| | |/
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-11-061-6/+11
|\ \ \ | |/ /
| * | Merge pull request #4486 from marc1706/ticket/11483Tristan Darricau2016-11-061-6/+11
| |\ \ | | |/ | |/|
| | * [ticket/11483] Generate user act key if database entry is emptyMarc Alexander2016-10-161-6/+11
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-282-18/+13
|\ \ \ | |/ /
| * | [ticket/14823] Move check_form_key() inside actual save data stepMarc Alexander2016-10-281-5/+5
| * | [ticket/14830] Fix FORM_INVALID error on cpf settings changingrxu2016-10-241-1/+1
| * | [ticket/14830] Fix FORM_INVALID error during AСP search index deletionrxu2016-10-211-1/+1
| * | [ticket/14830] Fix FORM_INVALID error on search backend changingrxu2016-10-211-5/+3
| * | [ticket/14830] Fix link hash checking caserxu2016-10-211-1/+1
| * | [ticket/14830] Fix FORM_INVALID error during AXP search index creation/deletionrxu2016-10-211-8/+5
| |/
* | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-023-13/+29
|\ \ | |/
| * [ticket/14789] Remove obsolete check_form_key() and add missing hashesMarc Alexander2016-09-302-7/+8
| * [ticket/14789] Move form key checks to where they actually do somethingMarc Alexander2016-09-302-11/+26
* | Merge pull request #4265 from Senky/ticket/10809Tristan Darricau2016-09-252-3/+0
|\ \
| * | [ticket/10809] Remove MSSQL supportJakub Senko2016-08-022-3/+0
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-09-188-16/+110
|\ \ \ | | |/ | |/|
| * | [ticket/14789] Add form tokens to tests and uncomment add_form_keyMarc Alexander2016-09-181-1/+1
| * | [ticket/14789] Add link hashes and form tokens to all acp links/buttonsMarc Alexander2016-09-188-17/+111
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-171-4/+20
|\ \ \ | |/ /
| * | [ticket/14738] Add core events to improve modifying forum listsrxu2016-08-071-4/+20
* | | Merge pull request #4435 from Crizz0/ticket/14764Marc Alexander2016-09-061-1/+1
|\ \ \
| * | | [ticket/14764] Wrong link to database update script has been fixedCrizzo2016-09-021-1/+1
| | |/ | |/|
* | | [ticket/10961] Send HTTP 403 when applicableJakub Senko2016-09-015-0/+15
|/ /
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-061-1/+1
|\ \ | |/
| * Merge pull request #4354 from Stanzilla/smtp_explainMarc Alexander2016-07-061-1/+1
| |\
| | * [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server optionBenjamin Staneck2016-06-171-1/+1
* | | Merge pull request #4357 from rxu/ticket/14660Marc Alexander2016-06-191-0/+3
|\ \ \
| * | | [ticket/14660] Fix parsing board email messages through template engine.rxu2016-06-181-0/+3
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-192-0/+18
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | [ticket/13716] Fix verbosenessRichard McGirr2016-04-121-1/+1
| * | [ticket/13716] Remove extraneous blank lineRMcGirr832016-04-051-1/+0
| * | [ticket/13716] Check phpBB version against config versionRichard McGirr2016-04-052-0/+19
| |/
* | Merge branch 'ticket/14577' into ticket/14577-3.2.xMarc Alexander2016-04-022-2/+2
|\ \ | |/
| * [ticket/14577] Do not calculate size of array in for loopMarc Alexander2016-04-023-3/+3
| * Merge pull request #4021 from marc1706/ticket/14272Tristan Darricau2016-03-274-6/+25
| |\
* | \ Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.xMarc Alexander2016-03-274-8/+25
|\ \ \ | | |/ | |/|