aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2010 from nickvergessen/ticket/12169Nils Adermann2014-02-1134-63/+207
|\
| * [ticket/12169] Split mode==headline into it's own functionJoas Schilling2014-02-102-24/+31
| * [ticket/12169] Add new option to display profile fields on memberlistJoas Schilling2014-02-1015-7/+72
| * [ticket/12169] Allow displaying profile fields on memberlistJoas Schilling2014-02-106-15/+72
| * [ticket/12169] Convert user_from to profile field locationJoas Schilling2014-02-1024-49/+64
|/
* Merge remote-tracking branch 'Marc/ticket/12170' into developJoas Schilling2014-02-104-5/+48
|\
| * 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
| * | [ticket/12170] Assign schema keys in migration helper with data_depth 1Marc Alexander2014-02-073-1/+14
| |/
* | Merge pull request #1988 from nickvergessen/ticket/12115Nils Adermann2014-02-1061-321/+404
|\ \
| * | [ticket/12115] Remove space from line endingJoas Schilling2014-02-061-1/+1
| * | [ticket/12115] Add migration file to remove old user columnsJoas Schilling2014-02-061-0/+51
| * | [ticket/12115] Use base class to reduce duplicate codeJoas Schilling2014-02-063-252/+209
| * | [ticket/12115] Add a new migration for profilefield_interestsJoas Schilling2014-02-061-0/+146
| * | [ticket/12115] Also port user interests to profile fieldsJoas Schilling2014-02-0650-270/+18
| * | [ticket/12115] Remove old language stringsJoas Schilling2014-02-061-2/+0
| * | [ticket/12115] Add methods to interfaceJoas Schilling2014-02-061-2/+10
| * | [ticket/12115] Translate profile field name before displaying it in errorsJoas Schilling2014-02-067-14/+31
| * | [ticket/12115] Remove occupation field from html filesJoas Schilling2014-02-065-17/+0
| * | [ticket/12115] Add language entries for the profile fieldsJoas Schilling2014-02-062-1/+26
| * | [ticket/12115] Convert user occupation to a profile fieldJoas Schilling2014-02-0617-26/+176
| |/
* | Merge pull request #2022 from nickvergessen/ticket/12175Andreas Fischer2014-02-101-7/+15
|\ \
| * | [ticket/12175] Do not use admin account for file size limit testJoas Schilling2014-02-091-2/+9
| * | [ticket/12175] Fix test for uploading a valid fileJoas Schilling2014-02-091-3/+5
| * | [ticket/12175] Fix upload test for empty fileJoas Schilling2014-02-091-2/+1
| |/
* | Merge pull request #2017 from nickvergessen/ticket/12141Andreas Fischer2014-02-081-2/+2
|\ \ | |/ |/|
| * [ticket/12141] Disable opcache on travis for php 5.5.8 aswellJoas Schilling2014-02-081-2/+2
|/
* 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
|\ \ | |/ |/|
| * [ticket/11880] migration helper fileNathan Guse2014-02-051-0/+82
| * [ticket/11880] Move get_schema_steps function to a migrator helper classNathan Guse2014-02-057-72/+27
| * [ticket/11880] Break up schema changes in the migratorNathan Guse2014-02-034-21/+302
* | 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.phpCesar G2014-02-041-1/+1
|/ /
* | [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
|\ \
| * \ Merge remote-tracking branch 'github-nickvergessen/ticket/12162' into develop...Nils Adermann2014-02-041-1/+1
| |\ \
| | * | [ticket/12162] Set language to C before running diff to ensure its englishJoas Schilling2014-02-041-1/+1
| |/ /
| * | Merge pull request #2001 from bantu/ticket/12161Nils Adermann2014-02-041-5/+5
| |\ \
| | * | [ticket/12161] Do not use subdirectories in build/save directory.Andreas Fischer2014-02-041-5/+5
| * | | Merge pull request #1999 from bantu/ticket/11509Nils Adermann2014-02-041-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/11509] Be exact when referencing the branch name.Andreas Fischer2014-02-041-1/+1
| | * | [ticket/11509] Run commit message checker only in one environment.Andreas Fischer2014-02-031-1/+1
| | * | [ticket/11509] Contrary to docs, COMMIT_RANGE is not available in PR mode.Andreas Fischer2014-02-031-1/+1
| |/ /
* | | Merge pull request #1998 from bantu/ticket/12141Nils Adermann2014-02-043-22/+57
|\ \ \
generated by cgit v1.2.1 (git 2.21.0) at 2026-01-04 23:04:52 +0000