aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-074-4/+45
|\
| * Merge pull request #5574 from dark-1/ticket/16025Marc Alexander2019-06-074-4/+45
| |\
| | * [ticket/16025] Add 2 template events *_author_username_{append/prepend}Dark❶2019-05-071-6/+6
| | * [ticket/16025] Add 2 template events *_author_username_{append/prepend}Dark❶2019-04-201-1/+1
| | * [ticket/16025] Add 2 template events *_author_username_{append/prepend}Dark❶2019-04-203-189/+189
| | * [ticket/16025] Add 2 template events *_author_username_{append/prepend}Dark❶2019-04-204-190/+231
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-061-0/+24
|\ \ \ | |/ /
| * | Merge pull request #5573 from dark-1/ticket/16024Marc Alexander2019-06-061-0/+24
| |\ \
| | * | [ticket/16024] Add core.topic_review_modify_sql_aryDark❶2019-05-071-1/+1
| | * | [ticket/16024] Add core.topic_review_modify_sql_aryDark❶2019-04-201-1/+1
| | * | [ticket/16024] Add core.topic_review_modify_sql_aryDark❶2019-04-201-0/+24
| | |/
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-062-2/+2
|\ \ \ | |/ /
| * | Merge pull request #5603 from senky/ticket/16000Marc Alexander2019-06-062-2/+2
| |\ \
| | * | [ticket/16000] Do not open links in a new tabJakub Senko2019-06-042-2/+2
| | * | [ticket/16000] Link to php's date()Jakub Senko2019-05-242-2/+2
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-061-3/+3
|\ \ \ \ | |/ / /
| * | | Merge pull request #5617 from marc1706/ticket/16078Marc Alexander2019-06-061-3/+3
| |\ \ \
| | * | | [ticket/16078] Use chrome as webdriverMarc Alexander2019-06-061-3/+3
| |/ / /
* | | | Merge pull request #5583 from marc1706/ticket/15987Marc Alexander2019-06-056-1/+85
|\ \ \ \
| * | | | [ticket/15987] Go back to previous table definition typeMarc Alexander2019-05-147-93/+115
| * | | | [ticket/15987] Add missing paranthesisMarc Alexander2019-05-141-0/+2
| * | | | [ticket/15987] Add container extension to support tables "array access"Marc Alexander2019-05-142-1/+60
| * | | | [ticket/15987] Table parameters as arraymrgoldy2019-05-141-77/+78
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-051-7/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #5615 from 3D-I/ticket/16073Marc Alexander2019-06-051-7/+9
| |\ \ \ \
| | * | | | [ticket/16073] Fix warning in ACP version check3D-I2019-06-011-7/+9
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-043-9/+24
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #5612 from senky/ticket/15932Marc Alexander2019-06-043-9/+24
| |\ \ \ \ \
| | * | | | | [ticket/15932] Disallow deleting locked attachmentsJakub Senko2019-05-283-9/+24
| | |/ / / /
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-031-2/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #5607 from senky/ticket/15974Marc Alexander2019-06-031-2/+0
| |\ \ \ \ \
| | * | | | | [ticket/15974] Remove Back to previous page linkJakub Senko2019-05-271-2/+0
| | | |_|/ / | | |/| | |
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-031-1/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #5613 from 3D-I/ticket/16071Marc Alexander2019-06-031-1/+5
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | [ticket/16071] Undefined index for custom attachments groups3D-I2019-05-291-1/+5
| |/ / / /
* | | | | Merge pull request #5614 from JoshyPHP/ticket/16072Marc Alexander2019-06-033-18/+57
|\ \ \ \ \
| * | | | | [ticket/16072] Update s9e/text-formatterJoshyPHP2019-05-313-18/+57
|/ / / / /
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-05-270-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #5592 from 3D-I/ticket/16055Marc Alexander2019-05-271-1/+1
| |\ \ \ \
| | * | | | [ticket/16055] Fix Oauth's redirects3D-I2019-05-161-1/+1
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-05-274-8/+40
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #5593 from JoshyPHP/ticket/16053Marc Alexander2019-05-274-8/+40
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | [ticket/16053] Update s9e/text-formatterJoshyPHP2019-05-174-8/+40
* | | | | | Merge pull request #5591 from rubencm/ticket/16057Marc Alexander2019-05-272-21/+8
|\ \ \ \ \ \
| * | | | | | [ticket/16057] Enable cgi.fix_pathinfo in php.inirubencm2019-05-171-3/+6
| * | | | | | [ticket/16057] Undo composer.json changesrubencm2019-05-152-2/+2
| * | | | | | [ticket/16057] Enable url rewrite and composer.json rulerubencm2019-05-153-2/+5
| * | | | | | [ticket/16057] Fix vagrant in 3.3rubencm2019-05-134-24/+5
* | | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-05-231-0/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | / / | |_|_|_|/ / |/| | | | |
| * | | | | Merge pull request #5598 from marc1706/ticket/16067Marc Alexander2019-05-231-0/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |