aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2013-02-241-1/+2
|\
| * Merge remote-tracking branch 'github-bantu/ticket/11122' into develop-olympusNils Adermann2013-02-241-1/+2
| |\
| | * [ticket/11122] Move rxu to 'Former Contributors' section.Andreas Fischer2013-02-241-1/+1
| | * [ticket/11122] Add EXreaction to docs/AUTHORS.Andreas Fischer2013-02-241-0/+1
* | | Merge branch 'develop-olympus' into developNils Adermann2013-02-241-3/+22
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'github-bantu/ticket/7262' into develop-olympusNils Adermann2013-02-241-2/+21
| |\ \ | | |/ | |/|
| | * [ticket/7262] Add note about set_config() not updating is_dynamic.Andreas Fischer2013-02-241-0/+3
| | * [ticket/7262] Add $is_dynamic example to set_config() and set_config_count().Andreas Fischer2013-02-241-4/+6
| | * [ticket/7262] Backport set_config() and set_config_count() docs from develop.Andreas Fischer2013-02-241-2/+16
| |/
* | Merge remote-tracking branch 'imkingdavid/ticket/11298' into developAndreas Fischer2013-02-242-3/+3
|\ \
| * | [ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSIONDavid King2013-02-232-3/+3
|/ /
* | Merge remote-tracking branch 'EXreaction/feature/migrations-extensions' into ...David King2013-02-2311-44/+175
|\ \
| * | [feature/migrations] Use getLocalisedMessage() function to get error messageNathan Guse2013-02-151-2/+2
| * | [feature/migrations] Fix failing tests (again)Nathaniel Guse2013-02-133-38/+39
| * | [feature/migrations] Fix failing testsNathaniel Guse2013-02-111-4/+12
| * | [feature/migrations] Catch and display errors from the migratorNathaniel Guse2013-02-093-9/+35
| * | [feature/migrations] Call revert correctly when purging an extensionNathaniel Guse2013-02-091-8/+13
| * | [feature/migrations] Inject Migrator instead of using the container to fetchNathaniel Guse2013-02-092-7/+9
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/migrat...Nathaniel Guse2013-02-091-1/+1
| |\ \
| * | | [feature/migrations] Fix path to extension migrationsNathaniel Guse2013-02-061-1/+1
| * | | [feature/migrations] Automatically install/revert migrations for extensionsNathan Guse2013-02-061-0/+62
| * | | [feature/migrations] Make the container available to extension installersNathan Guse2013-02-068-7/+34
* | | | Merge remote-tracking branch 'EXreaction/ticket/11351' into developDavid King2013-02-236-14/+96
|\ \ \ \
| * | | | [feature/migrations] getLocalisedMessage function for migration exceptionNathan Guse2013-02-151-0/+14
| * | | | [feature/migrations] Fix unfulfillable functionNathaniel Guse2013-02-091-2/+2
| * | | | [feature/migrations] getParameters function for migration exceptionNathaniel Guse2013-02-091-0/+10
| * | | | [feature/migrations] Add explanatory language string for migration errorsNathaniel Guse2013-02-091-0/+1
| * | | | [feature/migrations] Add language strings for migrations errorsNathaniel Guse2013-02-095-14/+71
| | |/ / | |/| |
* | | | Merge PR #1062 branch 'dhruvgoel92/ticket/11179' into developOleg Pudeyev2013-02-185-36/+157
|\ \ \ \
| * | | | [ticket/11179] remove extra & in function callDhruv2013-02-191-1/+1
| * | | | [ticket/11179] correct start parameter in sphinx searchDhruv2013-02-191-3/+20
| * | | | [ticket/11179] correct start parameter in native author searchDhruv2013-02-191-5/+18
| * | | | [ticket/11179] correct start parameter in native keyword searchDhruv2013-02-191-9/+19
| * | | | [ticket/11179] fix success query path for postgresDhruv2013-02-191-16/+16
| * | | | [ticket/11179] fix success query path for mysqlDhruv2013-02-191-16/+16
| * | | | [ticket/11179] minor fixesDhruv2013-02-192-1/+3
| * | | | [ticket/11179] pass start param by reference in postgresDhruv2013-02-191-2/+2
| * | | | [ticket/11179] correct start param in author search of postgresDhruv2013-02-191-0/+19
| * | | | [ticket/11179] correct start parameter in psql keyword searchDhruv2013-02-191-5/+20
| * | | | [ticket/11179] pass start param by reference in author searchDhruv2013-02-191-2/+2
| * | | | [ticket/11179] correct start parameter for author searchDhruv2013-02-191-2/+21
| * | | | [ticket/11179] use FOUND_ROWS query to re-search with changed start paramDhruv2013-02-191-38/+22
| * | | | [ticket/11179] pass start parameter by referenceDhruv2013-02-192-2/+2
| * | | | [ticket/11179] correct the start parameter while retrieving from cacheDhruv2013-02-191-1/+13
| * | | | [ticket/11179] add search query in case initial one failsDhruv2013-02-191-2/+32
|/ / / /
* | | | Merge PR #1236 branch 'dhruvgoel92/ticket/11359' into developOleg Pudeyev2013-02-181-2/+2
|\ \ \ \
| * | | | [ticket/11359] html escape sphinx config dataDhruv2013-02-181-1/+1
| * | | | [ticket/11359] add id attribute to textareaDhruv2013-02-181-1/+1
| * | | | [ticket/11359] close spanDhruv2013-02-181-1/+1
|/ / / /
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-02-121-1/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|