aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* 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 pull request #4188 from marc1706/ticket/13842Tristan Darricau2016-03-251-0/+7
| |\ \
* | \ \ Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-253-17/+17
|\ \ \ \ | |/ / /
| * | | Merge pull request #4190 from marc1706/ticket/14437Tristan Darricau2016-03-253-17/+17
| |\ \ \
| | * | | [ticket/14437] Make sure attachments array is properly ordered before processingMarc Alexander2016-03-062-5/+5
| | * | | [ticket/14437] Preserve attachment ID order by ordering by attach_idMarc Alexander2016-03-061-1/+1
| | * | | [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 #4193 from marc1706/ticket/14497Tristan Darricau2016-03-251-1/+24
|\ \ \ \ \
| * | | | | [ticket/14497] Support second app.php script in install folderMarc Alexander2016-02-251-1/+24
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-253-5/+32
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #4214 from marc1706/ticket/14241Tristan Darricau2016-03-253-5/+32
| |\ \ \ \ \
| | * | | | | [ticket/14241] Log fatal captcha error to error logMarc Alexander2016-03-122-4/+9
| | * | | | | [ticket/14241] Prevent empty q&a as a result of improper settingsMarc Alexander2016-03-112-3/+25
* | | | | | | 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-252-2/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #4231 from Senky/ticket/13630Tristan Darricau2016-03-252-2/+3
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/13630] Prevent empty parameter select_singleJakub Senko2016-03-202-2/+3
* | | | | | | | | Merge pull request #4239 from marc1706/ticket/14530Tristan Darricau2016-03-253-2/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/14530] Only generate text again if sig was parsed for storageMarc Alexander2016-03-242-2/+8
| * | | | | | | | | [ticket/14530] Add accidentally removed sig_parsed flagMarc Alexander2016-03-241-0/+1
* | | | | | | | | | 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 #4242 from marc1706/ticket/14136Tristan Darricau2016-03-2423-0/+24
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge pull request #4245 from JoshyPHP/ticket/14381Tristan Darricau2016-03-259-14/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ticket/14381] Set the mode in message parser to "reparse"JoshyPHP2016-03-241-1/+2
| * | | | | | | | | | | Merge branch '3.2.x'Marc Alexander2016-03-241-0/+27
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch '3.2.x'Tristan Darricau2016-03-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Tristan Darricau2016-03-151-135/+139
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Tristan Darricau2016-03-141-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Máté Bartus2016-03-119-60/+60
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch '3.2.x'Marc Alexander2016-03-101-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-101-4/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-091-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Máté Bartus2016-03-091-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Máté Bartus2016-03-083-14/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Tristan Darricau2016-03-072-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-071-8/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Tristan Darricau2016-03-021-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-019-9/+209
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \