aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12210] dbtools::sql_create_table incorrectly throws errorNathaniel Guse2014-02-171-1/+1
| | | | | | related to auto-increment length on non auto-increment fields PHPBB3-12210
* Merge remote-tracking branch 'github-nickvergessen/ticket/12188' into ↵Nils Adermann2014-02-131-0/+1
|\ | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/12188: [ticket/12188] Add php 5.6 to travis enviroments
| * [ticket/12188] Add php 5.6 to travis enviromentsJoas Schilling2014-02-131-0/+1
|/ | | | PHPBB3-12188
* Merge remote-tracking branch 'github-nickvergessen/ticket/12162' into ↵Nils Adermann2014-02-041-1/+1
|\ | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/12162: [ticket/12162] Set language to C before running diff to ensure its english
| * [ticket/12162] Set language to C before running diff to ensure its englishJoas Schilling2014-02-041-1/+1
|/ | | | PHPBB3-12162
* Merge pull request #2001 from bantu/ticket/12161Nils Adermann2014-02-041-5/+5
|\ | | | | [ticket/12161] Do not use subdirectories in build/save directory.
| * [ticket/12161] Do not use subdirectories in build/save directory.Andreas Fischer2014-02-041-5/+5
| | | | | | | | | | | | | | This is pretty much pointless because a new build will wipe the save directory and there are only a few files in there anyway. PHPBB3-12161
* | Merge pull request #1999 from bantu/ticket/11509Nils Adermann2014-02-041-1/+1
|\ \ | |/ |/| [ticket/11509] Further improvements/fixes for the Travis CI commit message checker
| * [ticket/11509] Be exact when referencing the branch name.Andreas Fischer2014-02-041-1/+1
| | | | | | | | PHPBB3-11509
| * [ticket/11509] Run commit message checker only in one environment.Andreas Fischer2014-02-031-1/+1
| | | | | | | | PHPBB3-11509
| * [ticket/11509] Contrary to docs, COMMIT_RANGE is not available in PR mode.Andreas Fischer2014-02-031-1/+1
|/ | | | PHPBB3-11509
* Merge remote-tracking branch 'github-bantu/ticket/11509' into develop-olympusNils Adermann2014-02-032-0/+31
|\ | | | | | | | | * github-bantu/ticket/11509: [ticket/11509] Fail on Travis CI if commit messages are improperly formatted.
| * [ticket/11509] Fail on Travis CI if commit messages are improperly formatted.Andreas Fischer2014-02-022-0/+31
| | | | | | | | PHPBB3-11509
* | Merge remote-tracking branch 'Crizz0/ticket/12146' into develop-olympusAndreas Fischer2014-02-021-1/+1
|\ \ | |/ |/| | | | | * Crizz0/ticket/12146: [ticket/12146] Added a missing # to inline css-style of <span>
| * [ticket/12146] Added a missing # to inline css-style of <span>Crizz02014-02-021-1/+1
| | | | | | | | PHPBB3-12146
* | Merge remote-tracking branch 'github-bantu/ticket/12147' into develop-olympusNils Adermann2014-02-021-7/+0
|\ \ | |/ |/| | | | | * github-bantu/ticket/12147: [ticket/12147] Remove Travis CI notifications.
| * [ticket/12147] Remove Travis CI notifications.Andreas Fischer2014-02-021-7/+0
|/ | | | | | We don't want to get notifications for branches other people are working on. PHPBB3-12147
* Merge remote-tracking branch 'naderman/ticket/12140' into develop-olympusAndreas Fischer2014-02-023-2123/+0
|\ | | | | | | | | * naderman/ticket/12140: [ticket/12140] Remove the diff class / MOD text build script
| * [ticket/12140] Remove the diff class / MOD text build scriptNils Adermann2014-02-023-2123/+0
| | | | | | | | PHPBB3-12140
* | Merge remote-tracking branch 'vinny/ticket/12119' into develop-olympusAndreas Fischer2014-01-272-4/+0
|\ \ | | | | | | | | | | | | * vinny/ticket/12119: [ticket/12119] Remove meta tags from view-print templates
| * | [ticket/12119] Remove meta tags from view-print templatesMarcus Vinicius2014-01-272-4/+0
|/ / | | | | | | PHPBB3-12119
* | Merge remote-tracking branch 'vinny/ticket/12118' into develop-olympusAndreas Fischer2014-01-262-0/+2
|\ \ | | | | | | | | | | | | * vinny/ticket/12118: [ticket/12118] Add noindex meta tag to subsilver2 view-print templates
| * | [ticket/12118] Add noindex meta tag to subsilver2 view-print templatesMarcus Vinicius2014-01-262-0/+2
|/ / | | | | | | PHPBB3-12118
* | Merge remote-tracking branch 'nickvergessen/ticket/12120' into develop-olympusCesar G2014-01-231-1/+2
|\ \
| * | [ticket/12120] Restore alphabetic orderJoas Schilling2014-01-231-1/+1
| | | | | | | | | | | | PHPBB3-12120
| * | [ticket/12120] Add prototech to authorsJoas Schilling2014-01-231-0/+1
|/ / | | | | | | PHPBB3-12120
* | Merge remote-tracking branch 'remotes/bantu/ticket/12046' into develop-olympusNathan Guse2014-01-171-5/+17
|\ \ | | | | | | | | | | | | * remotes/bantu/ticket/12046: [ticket/12046] Use PHP_BINARY environment variable in PHP lint test.
| * | [ticket/12046] Use PHP_BINARY environment variable in PHP lint test.Andreas Fischer2013-11-291-5/+17
| | | | | | | | | | | | PHPBB3-12046
* | | Merge remote-tracking branch 'Elsensee/ticket/10023' into develop-olympusJoas Schilling2013-12-162-4/+4
|\ \ \ | | | | | | | | | | | | | | | | * Elsensee/ticket/10023: [ticket/10023] Make password change notification more noticeable
| * | | [ticket/10023] Make password change notification more noticeableOliver Schramm2013-12-122-4/+4
|/ / / | | | | | | | | | PHPBB3-10023
* | | Merge remote-tracking branch 'Elsensee/ticket/12061' into develop-olympusJoas Schilling2013-12-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * Elsensee/ticket/12061: [ticket/12061] Fix keyboard shortcut in firefox
| * | | [ticket/12061] Fix keyboard shortcut in firefoxOliver Schramm2013-12-061-1/+1
|/ / / | | | | | | | | | PHPBB3-12061
* | | Merge remote-tracking branch 'bantu/ticket/12056' into develop-olympusJoas Schilling2013-12-041-1/+2
|\ \ \ | | | | | | | | | | | | | | | | * bantu/ticket/12056: [ticket/12056] Fix failure due to "Creating default object from empty value".
| * | | [ticket/12056] Fix failure due to "Creating default object from empty value".Andreas Fischer2013-12-041-1/+2
|/ / / | | | | | | | | | PHPBB3-12056
* | | Merge remote-tracking branch 'bantu/ticket/11699' into develop-olympusJoas Schilling2013-12-021-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11699: [ticket/11699] Also exclude the phpBB/cache directory. [ticket/11699] Properly exclude the .git directory. Namely missing dot prefix. [ticket/11699] Exclude build/new_version and build/old_versions from lint.
| * | | [ticket/11699] Also exclude the phpBB/cache directory.Andreas Fischer2013-11-291-0/+1
| | | | | | | | | | | | | | | | PHPBB3-11699
| * | | [ticket/11699] Properly exclude the .git directory. Namely missing dot prefix.Andreas Fischer2013-11-291-1/+2
| | | | | | | | | | | | | | | | PHPBB3-11699
| * | | [ticket/11699] Exclude build/new_version and build/old_versions from lint.Andreas Fischer2013-11-291-0/+2
| |/ / | | | | | | | | | PHPBB3-11699
* | | Merge remote-tracking branch 'prototech/ticket/12048' into develop-olympusJoas Schilling2013-12-021-2/+2
|\ \ \ | |/ / |/| | | | | | | | * prototech/ticket/12048: [ticket/12048] Fix the regexp for language keys in custom bbcodes.
| * | [ticket/12048] Fix the regexp for language keys in custom bbcodes.Cesar G2013-12-021-2/+2
|/ / | | | | | | PHPBB3-12048
* | Merge remote-tracking branch 'prototech/ticket/12037' into develop-olympusJoas Schilling2013-11-262-1/+2
|\ \ | | | | | | | | | | | | * prototech/ticket/12037: [ticket/12037] Fix hard-coded text in acp_inactive.html.
| * | [ticket/12037] Fix hard-coded text in acp_inactive.html.Cesar G2013-11-252-1/+2
|/ / | | | | | | PHPBB3-12037
* | Merge remote-tracking branch 'prototech/ticket/11814' into develop-olympusJoas Schilling2013-11-191-2/+1
|\ \ | |/ |/| | | | | * prototech/ticket/11814: [ticket/11814] Remove redundant text from the topic reply email notification.
| * [ticket/11814] Remove redundant text from the topic reply email notification.Cesar G2013-11-191-2/+1
|/ | | | PHPBB3-11814
* Merge remote-tracking branch 'github-bantu/ticket/11970' into develop-olympusNils Adermann2013-10-262-7/+9
|\ | | | | | | | | | | * github-bantu/ticket/11970: [ticket/11970] Make apt-get less quiet. [ticket/11970] Add set -x to Travis setup scripts.
| * [ticket/11970] Make apt-get less quiet.Andreas Fischer2013-10-262-7/+7
| | | | | | | | PHPBB3-11970
| * [ticket/11970] Add set -x to Travis setup scripts.Andreas Fischer2013-10-262-0/+2
|/ | | | | | Output is hidden by Travis by default and this will allow easier debugging. PHPBB3-11970
* Merge remote-tracking branch 'bantu/ticket/11920' into develop-olympusAndreas Fischer2013-10-251-1/+11
|\ | | | | | | | | * bantu/ticket/11920: [ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL.
| * [ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL.Andreas Fischer2013-10-251-1/+11
| | | | | | | | PHPBB3-11920
* | Merge branch 'task/github-readme/travis' into develop-olympusNils Adermann2013-10-241-2/+2
|\ \ | | | | | | | | | | | | * task/github-readme/travis: [task/github-readme/travis] Fix Travis-Badge and link