aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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 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
|\ \ \
| * | | [ticket/12141] Disable broken opcache extension on PHP 5.5.7.Andreas Fischer2014-02-041-0/+6
| * | | [ticket/12141] PHP extension setup must happen before webserver + PHP-FPM.Andreas Fischer2014-02-041-1/+1
| * | | [ticket/11985] Do not try to setup PHP extensions on HHVM.Andreas Fischer2014-02-041-1/+1
| * | | [ticket/11985] Rename install -> setup. This is more generic and consistent.Andreas Fischer2014-02-042-1/+1
| * | | [ticket/11985] Don't try to install APC on PHP 5.5 or higher.Andreas Fischer2014-02-031-3/+6
| * | | [ticket/11985] Enable APC on command line so it can be used by PHPUnit.Andreas Fischer2014-02-031-1/+13
| * | | [ticket/11985] Reorganise travis/install-php-extensions.shAndreas Fischer2014-02-031-10/+24
* | | | Merge pull request #1997 from marc1706/ticket/12159Andreas Fischer2014-02-035-5/+3
|\ \ \ \
| * | | | [ticket/12159] Fix codesniffer complaints due to profilefields and passwordsMarc Alexander2014-02-035-5/+3
|/ / / /
* | | | Merge pull request #1942 from nickvergessen/ticket/11996Nathan Guse2014-02-032-3/+33
|\ \ \ \ | |_|_|/ |/| | |
| * | | [ticket/11996] Remove note until we really do disable the boardJoas Schilling2014-02-031-1/+1
| * | | [ticket/11996] Use a table for better stylingJoas Schilling2014-01-132-14/+27
| * | | [ticket/11996] Add explanation how to correctly remove and update an extensionJoas Schilling2013-12-272-3/+20
* | | | Merge pull request #1991 from marc1706/ticket/12156Nathan Guse2014-02-032-2/+12
|\ \ \ \
| * | | | [ticket/12156] Add missing passwords manager to oauthMarc Alexander2014-02-032-2/+12
|/ / / /
* | | | Merge pull request #1993 from bantu/ticket/11509-developNathan Guse2014-02-031-1/+1
|\ \ \ \
| * | | | [ticket/11509] Perform commit message checking after PHPUnit (fixes path).Andreas Fischer2014-02-031-1/+1
|/ / / /
* | | | Merge pull request #1990 from nickvergessen/ticket/12154Nathan Guse2014-02-032-5/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | [ticket/12154] Update schema files with lastest database schemaJoas Schilling2014-02-022-5/+5
* | | | Merge branch 'develop-olympus' into developNils Adermann2014-02-032-0/+31
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge remote-tracking branch 'github-bantu/ticket/11509' into develop-olympusNils Adermann2014-02-032-0/+31
| |\ \ \