aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4251 from marc1706/ticket/14272-3.2.xTristan Darricau2016-03-277-25/+61
|\
| * Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.xMarc Alexander2016-03-277-25/+61
| |\
| | * [ticket/14272] Allow input of floats for filesizeMarc Alexander2016-02-031-1/+1
| | * [ticket/14272] Assign min and max values for avatar driver settingsMarc Alexander2016-01-013-0/+24
| | * [ticket/14272] Define min and max values for avatar width and heightMarc 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-061-1/+1
| | * [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-063-16/+19
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-271-0/+6
|\ \ \
| * \ \ Merge pull request #4182 from marc1706/ticket/14481Tristan Darricau2016-03-271-0/+6
| |\ \ \
| | * | | [ticket/14481] Use port 443 if https is specified in x-forwarded-protoMarc Alexander2016-02-161-0/+6
* | | | | 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.xTristan Darricau2016-03-261-4/+20
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #3874 from lavigor/ticket/14134Tristan Darricau2016-03-261-4/+20
| |\ \ \ \
| | * | | | [ticket/14134] Fix Okay in a comment.lavigor2016-03-251-1/+0
| | * | | | [ticket/14134] Fix code comments.lavigor2016-02-271-3/+2
| | * | | | [ticket/14134] Send warning notification PM in user's language.lavigor2015-09-021-4/+22
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-251-15/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4190 from marc1706/ticket/14437Tristan Darricau2016-03-251-15/+15
| |\ \ \ \ \
| | * | | | | [ticket/14437] Make sure attachments array is properly ordered before processingMarc Alexander2016-03-061-4/+4
| | * | | | | [ticket/14437] Sort attachments after assigning inline attachmentsMarc Alexander2016-03-061-13/+13
| | * | | | | [ticket/14437] Correctly assume index from attachment display orderMarc Alexander2016-02-211-2/+2
* | | | | | | Merge pull request #4218 from marc1706/ticket/14527Tristan Darricau2016-03-252-2/+3
|\ \ \ \ \ \ \
| * | | | | | | [ticket/14527] Decode automatically generated postlink without prefixMarc Alexander2016-03-132-1/+2
| * | | | | | | [ticket/14527] Retrieve link URL from href and not link textMarc Alexander2016-03-132-2/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-251-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4231 from Senky/ticket/13630Tristan Darricau2016-03-251-1/+1
| |\ \ \ \ \ \
| | * | | | | | [ticket/13630] Prevent empty parameter select_singleJakub Senko2016-03-201-1/+1
* | | | | | | | Merge pull request #4239 from marc1706/ticket/14530Tristan Darricau2016-03-252-2/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/14530] Only generate text again if sig was parsed for storageMarc Alexander2016-03-242-2/+8
* | | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-251-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | [ticket/14290] Correctly use modified since headerMarc Alexander2016-03-241-1/+1
* | | | | | | | | Merge pull request #4237 from Nicofuma/ticket/14555Marc Alexander2016-03-242-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/14555] Uniformize cache directory usagesTristan Darricau2016-03-242-4/+4
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ticket/14136' into ticket/14136-3.2.xMarc Alexander2016-03-242-0/+3
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | |_|/ / / / / / |/| | | | | | |
| * | | | | | | [ticket/14136] Add back X-UA-Compatible meta tagMarc Alexander2016-03-242-0/+3
| | |/ / / / / | |/| | | | |
* | | | | | | [ticket/14550] Fix the number of characters returned by unique_id()Tristan Darricau2016-03-231-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-101-4/+19
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4184 from lavigor/ticket/14486Marc Alexander2016-03-101-4/+19
| |\ \ \ \ \
| | * | | | | [ticket/14486] Use empty() and move error check.lavigor2016-02-271-1/+1
| | * | | | | [ticket/14486] Add an event and fix an event in login_box()lavigor2016-02-181-4/+19
| | | |_|/ / | | |/| | |
* | | | | | [ticket/13264] Don't force approved state if post visibility is known (3.2)Máté Bartus2016-03-091-4/+4
* | | | | | Merge branch '3.1.x' into 3.2.xMáté Bartus2016-03-091-1/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4205 from marc1706/ticket/13264Máté Bartus2016-03-091-1/+7
| |\ \ \ \ \
| | * | | | | [ticket/13264] Link to post if user can view itMarc Alexander2016-03-081-1/+3