Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'Marc/ticket/12170' into develop | Joas Schilling | 2014-02-10 | 4 | -5/+48 |
|\ | | | | | | | | | | | * Marc/ticket/12170: [ticket/12170] Test for 12170 [ticket/12170] Assign schema keys in migration helper with data_depth 1 | ||||
| * | Merge remote-tracking branch 'exreaction/ticket/12170' into ticket/12170 | Marc Alexander | 2014-02-07 | 1 | -4/+34 |
| |\ | |||||
| | * | [ticket/12170] Test for 12170 | Nathan Guse | 2014-02-07 | 1 | -4/+34 |
| | | | | | | | | | | | | PHPBB3-12170 | ||||
| * | | [ticket/12170] Assign schema keys in migration helper with data_depth 1 | Marc Alexander | 2014-02-07 | 3 | -1/+14 |
| |/ | | | | | | | | | | | | | | | | | The migration helper currently drops any keys with schema changes that have the data_depth 1. This change will correctly assign the keys to the steps array without dropping the keys that might contain important info like the actual table that should be created. PHPBB3-12170 | ||||
* | | Merge pull request #1988 from nickvergessen/ticket/12115 | Nils Adermann | 2014-02-10 | 61 | -321/+404 |
|\ \ | | | | | | | [ticket/12115] Convert occupation profile field to custom field | ||||
| * | | [ticket/12115] Remove space from line ending | Joas Schilling | 2014-02-06 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-12115 | ||||
| * | | [ticket/12115] Add migration file to remove old user columns | Joas Schilling | 2014-02-06 | 1 | -0/+51 |
| | | | | | | | | | | | | PHPBB3-12115 | ||||
| * | | [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 pull request #2022 from nickvergessen/ticket/12175 | Andreas Fischer | 2014-02-10 | 1 | -7/+15 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/12175 Fix and run functional upload tests * nickvergessen/ticket/12175: [ticket/12175] Do not use admin account for file size limit test [ticket/12175] Fix test for uploading a valid file [ticket/12175] Fix upload test for empty file | ||||
| * | | [ticket/12175] Do not use admin account for file size limit test | Joas Schilling | 2014-02-09 | 1 | -2/+9 |
| | | | | | | | | | | | | PHPBB3-12175 | ||||
| * | | [ticket/12175] Fix test for uploading a valid file | Joas Schilling | 2014-02-09 | 1 | -3/+5 |
| | | | | | | | | | | | | PHPBB3-12175 | ||||
| * | | [ticket/12175] Fix upload test for empty file | Joas Schilling | 2014-02-09 | 1 | -2/+1 |
| |/ | | | | | | | PHPBB3-12175 | ||||
* | | Merge pull request #2017 from nickvergessen/ticket/12141 | Andreas Fischer | 2014-02-08 | 1 | -2/+2 |
|\ \ | |/ |/| | | | | | | | | | [ticket/12141] Disable opcache on travis for php 5.5.8 aswell * nickvergessen/ticket/12141: [ticket/12141] Disable opcache on travis for php 5.5.8 aswell | ||||
| * | [ticket/12141] Disable opcache on travis for php 5.5.8 aswell | Joas Schilling | 2014-02-08 | 1 | -2/+2 |
|/ | | | | PHPBB3-12141 | ||||
* | 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 |