aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | [ticket/12184] Fix undefined variable tpl_fields in profile field managerJoas Schilling2014-02-111-0/+2
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12184
* | | | | | | | | | Merge pull request #2010 from nickvergessen/ticket/12169Nils Adermann2014-02-1134-63/+207
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Ticket/12169 Convert location user field to profile field
| * | | | | | | | | | [ticket/12169] Split mode==headline into it's own functionJoas Schilling2014-02-102-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12169
| * | | | | | | | | | [ticket/12169] Add new option to display profile fields on memberlistJoas Schilling2014-02-1015-7/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12169
| * | | | | | | | | | [ticket/12169] Allow displaying profile fields on memberlistJoas Schilling2014-02-106-15/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can not sort by profile field values atm. And also I'm not sure whether this is possible at all. PHPBB3-12169
| * | | | | | | | | | [ticket/12169] Convert user_from to profile field locationJoas Schilling2014-02-1024-49/+64
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing changes on memberlist view due to missing functionality PHPBB3-12169
* | | | | | | | | | Merge remote-tracking branch 'Marc/ticket/12170' into developJoas Schilling2014-02-104-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/12170Marc Alexander2014-02-071-4/+34
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | [ticket/12170] Test for 12170Nathan Guse2014-02-071-4/+34
| | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12170
| * | | | | | | | | | [ticket/12170] Assign schema keys in migration helper with data_depth 1Marc Alexander2014-02-073-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/12115Nils Adermann2014-02-1061-321/+404
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | [ticket/12115] Convert occupation profile field to custom field
| * | | | | | | | | [ticket/12115] Remove space from line endingJoas Schilling2014-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12115
| * | | | | | | | | [ticket/12115] Add migration file to remove old user columnsJoas Schilling2014-02-061-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12115
| * | | | | | | | | [ticket/12115] Use base class to reduce duplicate codeJoas Schilling2014-02-063-252/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12115
| * | | | | | | | | [ticket/12115] Add a new migration for profilefield_interestsJoas Schilling2014-02-061-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 fieldsJoas Schilling2014-02-0650-270/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12115
| * | | | | | | | | [ticket/12115] Remove old language stringsJoas Schilling2014-02-061-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12115
| * | | | | | | | | [ticket/12115] Add methods to interfaceJoas Schilling2014-02-061-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12115
| * | | | | | | | | [ticket/12115] Translate profile field name before displaying it in errorsJoas Schilling2014-02-067-14/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12115
| * | | | | | | | | [ticket/12115] Remove occupation field from html filesJoas Schilling2014-02-065-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12115
| * | | | | | | | | [ticket/12115] Add language entries for the profile fieldsJoas Schilling2014-02-062-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12115
| * | | | | | | | | [ticket/12115] Convert user occupation to a profile fieldJoas Schilling2014-02-0617-26/+176
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12115
* | | | | | | | | Merge pull request #2022 from nickvergessen/ticket/12175Andreas Fischer2014-02-101-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 testJoas Schilling2014-02-091-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12175
| * | | | | | | | | [ticket/12175] Fix test for uploading a valid fileJoas Schilling2014-02-091-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12175
| * | | | | | | | | [ticket/12175] Fix upload test for empty fileJoas Schilling2014-02-091-2/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12175
* | | | | | | | | Merge pull request #2017 from nickvergessen/ticket/12141Andreas Fischer2014-02-081-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 aswellJoas Schilling2014-02-081-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12141
* | | | | | | | Merge branch 'prep-release-3.1.0-a3' into developJoas Schilling2014-02-058-33/+172
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | [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 #1995 from EXreaction/ticket/11880Nils Adermann2014-02-059-26/+344
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Schema changes can take too long and cause a timeout
| * | | | | | | [ticket/11880] migration helper fileNathan Guse2014-02-051-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11880
| * | | | | | | [ticket/11880] Move get_schema_steps function to a migrator helper classNathan Guse2014-02-057-72/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11880
| * | | | | | | [ticket/11880] Break up schema changes in the migratorNathan Guse2014-02-034-21/+302
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-11880
* | | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-01-15 16:14:29 +0000