Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ticket/12115] Use base class to reduce duplicate code | Joas Schilling | 2014-02-06 | 3 | -252/+209 |
| | | | | PHPBB3-12115 | ||||
* | [ticket/12115] Add a new migration for profilefield_interests | Joas Schilling | 2014-02-06 | 1 | -0/+146 |
| | | | | | | | With this we avoid missing to copy one, when the admin already created a phpbb_* profile field. PHPBB3-12115 | ||||
* | [ticket/12115] Also port user interests to profile fields | Joas Schilling | 2014-02-06 | 50 | -270/+18 |
| | | | | PHPBB3-12115 | ||||
* | [ticket/12115] Remove old language strings | Joas Schilling | 2014-02-06 | 1 | -2/+0 |
| | | | | PHPBB3-12115 | ||||
* | [ticket/12115] Add methods to interface | Joas Schilling | 2014-02-06 | 1 | -2/+10 |
| | | | | PHPBB3-12115 | ||||
* | [ticket/12115] Translate profile field name before displaying it in errors | Joas Schilling | 2014-02-06 | 7 | -14/+31 |
| | | | | PHPBB3-12115 | ||||
* | [ticket/12115] Remove occupation field from html files | Joas Schilling | 2014-02-06 | 5 | -17/+0 |
| | | | | PHPBB3-12115 | ||||
* | [ticket/12115] Add language entries for the profile fields | Joas Schilling | 2014-02-06 | 2 | -1/+26 |
| | | | | PHPBB3-12115 | ||||
* | [ticket/12115] Convert user occupation to a profile field | Joas Schilling | 2014-02-06 | 17 | -26/+176 |
| | | | | PHPBB3-12115 | ||||
* | Merge branch 'prep-release-3.1.0-a3' into develop | Joas Schilling | 2014-02-05 | 8 | -33/+172 |
|\ | |||||
| * | [prep-release-3.1.0-a3] Update version to 3.1.0-a4-dev for future development | Joas Schilling | 2014-02-05 | 3 | -3/+3 |
| | | |||||
| * | [prep-release-3.1.0-a3] Commit changelog for 3.1.0-a3 | Joas Schilling | 2014-02-05 | 1 | -0/+106 |
| | | |||||
| * | [prep-release-3.1.0-a3] Prepare Changelog | Joas Schilling | 2014-02-05 | 1 | -23/+26 |
| | | |||||
| * | [prep-release-3.1.0-a3] Add migration for 3.1.0-a3 | Joas Schilling | 2014-02-05 | 1 | -0/+30 |
| | | |||||
| * | [prep-release-3.1.0-a3] Update version to 3.1.0-a3 | Joas Schilling | 2014-02-05 | 6 | -10/+10 |
| | | |||||
* | | Merge pull request #1995 from EXreaction/ticket/11880 | Nils Adermann | 2014-02-05 | 9 | -26/+344 |
|\ \ | |/ |/| | Schema changes can take too long and cause a timeout | ||||
| * | [ticket/11880] migration helper file | Nathan Guse | 2014-02-05 | 1 | -0/+82 |
| | | | | | | | | PHPBB3-11880 | ||||
| * | [ticket/11880] Move get_schema_steps function to a migrator helper class | Nathan Guse | 2014-02-05 | 7 | -72/+27 |
| | | | | | | | | PHPBB3-11880 | ||||
| * | [ticket/11880] Break up schema changes in the migrator | Nathan Guse | 2014-02-03 | 4 | -21/+302 |
| | | | | | | | | PHPBB3-11880 | ||||
* | | Merge pull request #2004 from prototech/ticket/12163 | Andreas Fischer | 2014-02-04 | 1 | -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.php | Cesar G | 2014-02-04 | 1 | -1/+1 |
|/ / | | | | | | | PHPBB3-12163 | ||||
* | | [develop] Remove left over conflict marker from merge 1a31f03 | Nils Adermann | 2014-02-04 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'develop-olympus' into develop | Nils Adermann | 2014-02-04 | 2 | -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 Adermann | 2014-02-04 | 1 | -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 english | Joas Schilling | 2014-02-04 | 1 | -1/+1 |
| |/ / | | | | | | | | | | PHPBB3-12162 | ||||
| * | | Merge pull request #2001 from bantu/ticket/12161 | Nils Adermann | 2014-02-04 | 1 | -5/+5 |
| |\ \ | | | | | | | | | [ticket/12161] Do not use subdirectories in build/save directory. | ||||
| | * | | [ticket/12161] Do not use subdirectories in build/save directory. | Andreas Fischer | 2014-02-04 | 1 | -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/11509 | Nils Adermann | 2014-02-04 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | [ticket/11509] Further improvements/fixes for the Travis CI commit message checker | ||||
| | * | | [ticket/11509] Be exact when referencing the branch name. | Andreas Fischer | 2014-02-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11509 | ||||
| | * | | [ticket/11509] Run commit message checker only in one environment. | Andreas Fischer | 2014-02-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11509 | ||||
| | * | | [ticket/11509] Contrary to docs, COMMIT_RANGE is not available in PR mode. | Andreas Fischer | 2014-02-03 | 1 | -1/+1 |
| |/ / | | | | | | | | | | PHPBB3-11509 | ||||
* | | | Merge pull request #1998 from bantu/ticket/12141 | Nils Adermann | 2014-02-04 | 3 | -22/+57 |
|\ \ \ | | | | | | | | | [ticket/12141] Disable opcache extension on PHP 5.5.7 | ||||
| * | | | [ticket/12141] Disable broken opcache extension on PHP 5.5.7. | Andreas Fischer | 2014-02-04 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | PHPBB3-12141 | ||||
| * | | | [ticket/12141] PHP extension setup must happen before webserver + PHP-FPM. | Andreas Fischer | 2014-02-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-12141 | ||||
| * | | | [ticket/11985] Do not try to setup PHP extensions on HHVM. | Andreas Fischer | 2014-02-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11985 | ||||
| * | | | [ticket/11985] Rename install -> setup. This is more generic and consistent. | Andreas Fischer | 2014-02-04 | 2 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11985 | ||||
| * | | | [ticket/11985] Don't try to install APC on PHP 5.5 or higher. | Andreas Fischer | 2014-02-03 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | PHPBB3-11985 | ||||
| * | | | [ticket/11985] Enable APC on command line so it can be used by PHPUnit. | Andreas Fischer | 2014-02-03 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | | PHPBB3-11985 | ||||
| * | | | [ticket/11985] Reorganise travis/install-php-extensions.sh | Andreas Fischer | 2014-02-03 | 1 | -10/+24 |
| | | | | | | | | | | | | | | | | PHPBB3-11985 | ||||
* | | | | Merge pull request #1997 from marc1706/ticket/12159 | Andreas Fischer | 2014-02-03 | 5 | -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 passwords | Marc Alexander | 2014-02-03 | 5 | -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/11996 | Nathan Guse | 2014-02-03 | 2 | -3/+33 |
|\ \ \ \ | |_|_|/ |/| | | | [ticket/11996] Add explanation how to correctly remove and update an extension | ||||
| * | | | [ticket/11996] Remove note until we really do disable the board | Joas Schilling | 2014-02-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-11996 | ||||
| * | | | [ticket/11996] Use a table for better styling | Joas Schilling | 2014-01-13 | 2 | -14/+27 |
| | | | | | | | | | | | | | | | | PHPBB3-11996 | ||||
| * | | | [ticket/11996] Add explanation how to correctly remove and update an extension | Joas Schilling | 2013-12-27 | 2 | -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/12156 | Nathan Guse | 2014-02-03 | 2 | -2/+12 |
|\ \ \ \ | | | | | | | | | | | [ticket/12156] Add missing passwords manager to oauth | ||||
| * | | | | [ticket/12156] Add missing passwords manager to oauth | Marc Alexander | 2014-02-03 | 2 | -2/+12 |
|/ / / / | | | | | | | | | | | | | PHPBB3-12156 | ||||
* | | | | Merge pull request #1993 from bantu/ticket/11509-develop | Nathan Guse | 2014-02-03 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | [ticket/11509] Perform commit message checking after PHPUnit (fixes path... | ||||
| * | | | | [ticket/11509] Perform commit message checking after PHPUnit (fixes path). | Andreas Fischer | 2014-02-03 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | PHPBB3-11509 | ||||
* | | | | Merge pull request #1990 from nickvergessen/ticket/12154 | Nathan Guse | 2014-02-03 | 2 | -5/+5 |
|\ \ \ \ | |_|/ / |/| | | | [ticket/12154] Update schema files with lastest database schema |