aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xTristan Darricau2016-04-021-2/+31
|\
| * Merge pull request #4270 from kasimi/ticket/14562Tristan Darricau2016-04-021-2/+31
| |\
| | * [ticket/14562] Language fallback for extension permissionskasimi2016-04-011-2/+31
* | | Merge pull request #4274 from marc1706/ticket/14495Tristan Darricau2016-04-027-11/+11
|\ \ \
| * | | [ticket/14495] Specify correct version numbers in 3.2.xMarc Alexander2016-04-027-11/+11
* | | | Merge branch 'ticket/14577' into ticket/14577-3.2.xMarc Alexander2016-04-025-12/+12
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | [ticket/14577] Do not calculate size of array in for loopMarc Alexander2016-04-025-12/+12
| |/
* | Merge pull request #4255 from CHItA/ticket/14393Tristan Darricau2016-03-313-11/+14
|\ \
| * | [ticket/14393] Fix db update progress barMáté Bartus2016-03-301-2/+1
| * | [ticket/14393] Fix init for conflict archiveMáté Bartus2016-03-271-7/+6
| * | [ticket/14393] Fix updater behaviourMáté Bartus2016-03-273-4/+9
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-3132-0/+160
|\ \ \ | | |/ | |/|
| * | Merge pull request #4264 from VSEphpbb/ticket/14570Marc Alexander2016-03-3132-0/+160
| |\ \
| | * | [ticket/14570] Use phpbb_version_compareMatt Friedman2016-03-2932-32/+32
| | * | [ticket/14570] Add effectively installed to 3.1.x versionsMatt Friedman2016-03-2932-0/+160
* | | | [ticket/14572] Fix quote notification deletionGreg Ryckman2016-03-301-2/+2
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-301-6/+7
|\ \ \ \ | |/ / /
| * | | [ticket/10356] Find inactive users in livesearch when having permissionsJakub Senko2016-03-291-6/+7
| * | | Merge pull request #4021 from marc1706/ticket/14272Tristan Darricau2016-03-2738-89/+135
| |\ \ \
* | | | | [ticket/14564] Fix cookie domain calculationMáté Bartus2016-03-271-1/+8
* | | | | Merge pull request #4252 from RMcGirr83/ticket_14329Tristan Darricau2016-03-271-0/+10
|\ \ \ \ \
| * | | | | [ticket/14329] Add missing ACP language varsRichard McGirr2016-03-271-0/+10
* | | | | | Merge pull request #4251 from marc1706/ticket/14272-3.2.xTristan Darricau2016-03-2732-83/+126
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.xMarc Alexander2016-03-2732-83/+126
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | * | | | [ticket/14272] Allow input of floats for filesizeMarc Alexander2016-02-032-2/+2
| | * | | | [ticket/14272] Use input type number instead of text in avatarsMarc Alexander2016-01-013-5/+5
| | * | | | [ticket/14272] Assign min and max values for avatar driver settingsMarc Alexander2016-01-015-4/+28
| | * | | | [ticket/14272] Define min and max values for avatar width and heightMarc Alexander2015-12-272-2/+9
| | * | | | [ticket/14272] Disable not toggled form elementsMarc Alexander2015-12-271-0/+7
| | * | | | [ticket/14272] Make sure phpbb_avatar_manager was definedMarc Alexander2015-12-033-3/+8
| | * | | | [ticket/14272] Remove useless checkMarc Alexander2015-11-081-1/+1
| | * | | | [ticket/14272] Fix invalid or missing min/max settingsMarc Alexander2015-11-064-5/+5
| | * | | | [ticket/14272] Assign min/max for all allowed typesMarc Alexander2015-11-061-4/+4
| | * | | | [ticket/14272] Only use maxlength and size for allowed input elementsMarc Alexander2015-11-0629-76/+79
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-274-3/+23
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge pull request #4182 from marc1706/ticket/14481Tristan Darricau2016-03-274-3/+23
| |\ \ \ \
| | * | | | [ticket/14481] Use port 443 if https is specified in x-forwarded-protoMarc Alexander2016-02-161-0/+6
| | * | | | [ticket/14481] Respect HTTP_X_FORWARDED headers for implying httpsMarc Alexander2016-02-153-3/+17
* | | | | | Merge pull request #4228 from Senky/ticket/9435Marc Alexander2016-03-274-27/+43
|\ \ \ \ \ \
| * | | | | | [ticket/9435] Switch "ID" and BBcode name in constants keysJakub Senko2016-03-193-39/+39
| * | | | | | [ticket/9435] Add NUM_PREDEFINED_BBCODES constantJakub Senko2016-03-182-1/+2
| * | | | | | [ticket/9435] Convert bbcode magic numbers to constantsJakub Senko2016-03-183-26/+41
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-271-5/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4246 from RMcGirr83/ticket_13625Marc Alexander2016-03-271-5/+6
| |\ \ \ \ \ \
| | * | | | | | [ticket/13625] Fix types of propertiesRichard McGirr2016-03-251-5/+6
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-271-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge pull request #4230 from Senky/ticket/13028Marc Alexander2016-03-271-1/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | [ticket/13028] Rename unanswered search labelJakub Senko2016-03-181-1/+1
* | | | | | | Merge pull request #4199 from VSEphpbb/ticket/12684Tristan Darricau2016-03-263-0/+352
|\ \ \ \ \ \ \
| * | | | | | | [ticket/12684] Use a switch statement for readabilityMatt Friedman2016-03-211-13/+13