aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [prep-release-3.1.0-a3] Update version to 3.1.0-a4-dev for future developmentJoas Schilling2014-02-053-3/+3
|
* [prep-release-3.1.0-a3] Commit changelog for 3.1.0-a3Joas Schilling2014-02-051-0/+106
|
* [prep-release-3.1.0-a3] Prepare ChangelogJoas Schilling2014-02-051-23/+26
|
* [prep-release-3.1.0-a3] Add migration for 3.1.0-a3Joas Schilling2014-02-051-0/+30
|
* [prep-release-3.1.0-a3] Update version to 3.1.0-a3Joas Schilling2014-02-056-10/+10
|
* Merge pull request #2004 from prototech/ticket/12163Andreas Fischer2014-02-041-1/+1
|\ | | | | | | | | | | | | [ticket/12163] Use posts_per_page to calculate current page in viewtopic.php * prototech/ticket/12163: [ticket/12163] Use posts_per_page to calculate current page in viewtopic.php
| * [ticket/12163] Use posts_per_page to calculate current page in viewtopic.phpCesar G2014-02-041-1/+1
|/ | | | PHPBB3-12163
* [develop] Remove left over conflict marker from merge 1a31f03Nils Adermann2014-02-041-1/+0
|
* Merge branch 'develop-olympus' into developNils Adermann2014-02-042-7/+8
|\ | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12162] Set language to C before running diff to ensure its english [ticket/11509] Be exact when referencing the branch name. [ticket/12161] Do not use subdirectories in build/save directory. [ticket/11509] Run commit message checker only in one environment. [ticket/11509] Contrary to docs, COMMIT_RANGE is not available in PR mode. Conflicts: .travis.yml
| * 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 pull request #1998 from bantu/ticket/12141Nils Adermann2014-02-043-22/+57
|\ \ | | | | | | [ticket/12141] Disable opcache extension on PHP 5.5.7
| * | [ticket/12141] Disable broken opcache extension on PHP 5.5.7.Andreas Fischer2014-02-041-0/+6
| | | | | | | | | | | | PHPBB3-12141
| * | [ticket/12141] PHP extension setup must happen before webserver + PHP-FPM.Andreas Fischer2014-02-041-1/+1
| | | | | | | | | | | | PHPBB3-12141
| * | [ticket/11985] Do not try to setup PHP extensions on HHVM.Andreas Fischer2014-02-041-1/+1
| | | | | | | | | | | | PHPBB3-11985
| * | [ticket/11985] Rename install -> setup. This is more generic and consistent.Andreas Fischer2014-02-042-1/+1
| | | | | | | | | | | | PHPBB3-11985
| * | [ticket/11985] Don't try to install APC on PHP 5.5 or higher.Andreas Fischer2014-02-031-3/+6
| | | | | | | | | | | | PHPBB3-11985
| * | [ticket/11985] Enable APC on command line so it can be used by PHPUnit.Andreas Fischer2014-02-031-1/+13
| | | | | | | | | | | | PHPBB3-11985
| * | [ticket/11985] Reorganise travis/install-php-extensions.shAndreas Fischer2014-02-031-10/+24
| | | | | | | | | | | | PHPBB3-11985
* | | Merge pull request #1997 from marc1706/ticket/12159Andreas Fischer2014-02-035-5/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12159] Fix codesniffer complaints due to profilefields and passwords * marc1706/ticket/12159: [ticket/12159] Fix codesniffer complaints due to profilefields and passwords
| * | | [ticket/12159] Fix codesniffer complaints due to profilefields and passwordsMarc Alexander2014-02-035-5/+3
|/ / / | | | | | | | | | | | | | | | | | | The two PRs regarding profilefields and passwords manager that were recently merged caused a few codesniffer complaints that are fixed by these changes. PHPBB3-12159
* | | Merge pull request #1942 from nickvergessen/ticket/11996Nathan Guse2014-02-032-3/+33
|\ \ \ | | | | | | | | [ticket/11996] Add explanation how to correctly remove and update an extension
| * | | [ticket/11996] Remove note until we really do disable the boardJoas Schilling2014-02-031-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11996
| * | | [ticket/11996] Use a table for better stylingJoas Schilling2014-01-132-14/+27
| | | | | | | | | | | | | | | | PHPBB3-11996
| * | | [ticket/11996] Add explanation how to correctly remove and update an extensionJoas Schilling2013-12-272-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=44001 for more information about the decision. PHPBB3-11996
* | | | Merge pull request #1991 from marc1706/ticket/12156Nathan Guse2014-02-032-2/+12
|\ \ \ \ | | | | | | | | | | [ticket/12156] Add missing passwords manager to oauth
| * | | | [ticket/12156] Add missing passwords manager to oauthMarc Alexander2014-02-032-2/+12
|/ / / / | | | | | | | | | | | | PHPBB3-12156
* | | | Merge pull request #1993 from bantu/ticket/11509-developNathan Guse2014-02-031-1/+1
|\ \ \ \ | | | | | | | | | | [ticket/11509] Perform commit message checking after PHPUnit (fixes path...
| * | | | [ticket/11509] Perform commit message checking after PHPUnit (fixes path).Andreas Fischer2014-02-031-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-11509
* | | | Merge pull request #1990 from nickvergessen/ticket/12154Nathan Guse2014-02-032-5/+5
|\ \ \ \ | |_|/ / |/| | | [ticket/12154] Update schema files with lastest database schema
| * | | [ticket/12154] Update schema files with lastest database schemaJoas Schilling2014-02-022-5/+5
| | | | | | | | | | | | | | | | PHPBB3-12154
* | | | Merge branch 'develop-olympus' into developNils Adermann2014-02-032-0/+31
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11509] Fail on Travis CI if commit messages are improperly formatted. Conflicts: .travis.yml
| * | | 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 pull request #1989 from nickvergessen/ticket/12151Nathan Guse2014-02-021-10/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | [ticket/12151] Remove old dependency from profile type in tests
| * | | | [ticket/12151] Remove old dependency from profile type in testsJoas Schilling2014-02-021-10/+0
|/ / / / | | | | | | | | | | | | PHPBB3-12151
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2014-02-021-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12146] Added a missing # to inline css-style of <span> Conflicts: phpBB/styles/prosilver/template/ucp_groups_manage.html
| * | | 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-nickvergessen/ticket/11201' into developNils Adermann2014-02-0242-1811/+3021
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-nickvergessen/ticket/11201: (50 commits) [ticket/11201] Remove empty calls section from .yml [ticket/11201] Split template file into multiple files [ticket/11201] Remove dependency from types on the manager [ticket/11201] Rename profilefields class to manager [ticket/11201] Fix parameter description [ticket/11201] Use !== null, its faster [ticket/11201] Also translate profile fields in UCP and ACP [ticket/11201] Add parameters and variables to profile field class [ticket/11201] Add commas on last array entry [ticket/11201] Allow translation of profile field name and explanation [ticket/11201] Fix some variable names [ticket/11201] Add tables to constructor in tests [ticket/11201] Add a method to return the translated full name of the type [ticket/11201] Remove db depending code from field class [ticket/11201] Add variables to classes and add constructor doc blocks [ticket/11201] Update copyright in class file [ticket/11201] Add visibility and remove unused variable [ticket/11201] Add some commas at the last array entry [ticket/11201] Cast some variables to integer [ticket/11201] Inject table names rather then using constants ... Conflicts: phpBB/config/services.yml
| * | | | [ticket/11201] Remove empty calls section from .ymlJoas Schilling2014-02-021-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-11201
| * | | | [ticket/11201] Split template file into multiple filesJoas Schilling2014-02-028-33/+36
| | | | | | | | | | | | | | | | | | | | PHPBB3-11201
| * | | | [ticket/11201] Remove dependency from types on the managerJoas Schilling2014-02-026-86/+48
| | | | | | | | | | | | | | | | | | | | PHPBB3-11201
| * | | | [ticket/11201] Rename profilefields class to managerJoas Schilling2014-02-0213-33/+33
| | | | | | | | | | | | | | | | | | | | PHPBB3-11201
generated by cgit v1.2.1 (git 2.21.0) at 2025-02-10 11:15:07 +0000