aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'Noxwizard/ticket/11043' into developAndreas Fischer2012-08-072-6/+7
|\
| * [ticket/11043] Change hook name back to display, since that's where we hook in.Andreas Fischer2012-08-031-1/+1
| * [ticket/11043] Allow call_hook() to be called from more than one location.Andreas Fischer2012-08-031-5/+6
| * [ticket/11043] Update template hook namePatrick Webster2012-08-031-1/+1
* | Merge remote-tracking branch 'Fyorl/ticket/11044' into developAndreas Fischer2012-08-061-0/+37
|\ \
| * | [ticket/11044] Added comment explaining filename splittingFyorl2012-08-061-1/+4
| * | [ticket/11044] Preserve the file extension in unique filenamesFyorl2012-08-051-1/+9
| * | [ticket/11044] Minor adjustments as per PR commentsFyorl2012-08-051-6/+7
| * | [ticket/11044] Compress class now deals with file conflictsFyorl2012-08-041-0/+25
* | | Merge remote-tracking branch 'bantu/ticket/11041' into developIgor Wiedler2012-08-062-5/+5
|\ \ \
| * | | [ticket/11041] Correctly import PHP file extension from global space.Andreas Fischer2012-08-022-5/+5
| |/ /
* | | Merge remote-tracking branch 'EXreaction/ticket/10885' into developAndreas Fischer2012-08-061-9/+8
|\ \ \
| * | | [ticket/10885] Fix UCP Main Error if no forums existNathan Guse2012-08-061-9/+8
* | | | Merge remote-tracking branch 'EXreaction/ticket/11029' into developAndreas Fischer2012-08-061-8/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | [ticket/11029] Remove $reparse variableNathan Guse2012-08-061-7/+2
| * | | [ticket/11029] Return $parsed_array (may have loaded from the cache)Nathan Guse2012-08-061-1/+1
| * | | [ticket/11029] Cache obtain_cfg_items should return empty array on failureNathan Guse2012-07-301-1/+1
| |/ /
* | | Merge remote-tracking branch 'nickvergessen/ticket/11004' into developAndreas Fischer2012-08-023-10/+23
|\ \ \ | |_|/ |/| |
| * | [ticket/11004] Always update suggestion button in timezone_preselect_selectJoas Schilling2012-07-241-6/+8
| * | [ticket/11003] Ability to show full list of timezones with JavaScript enabledJoas Schilling2012-07-231-2/+13
| * | [ticket/11004] Make suggestion button a real button and fix it's valueJoas Schilling2012-07-232-2/+2
* | | Merge remote-tracking branch 'EXreaction/ticket/10875' into developAndreas Fischer2012-07-3010-20/+19
|\ \ \ | |_|/ |/| |
| * | [ticket/10875] method_exists check is not required, interface declares themNathan Guse2012-07-3010-20/+19
| * | [ticket/10875] Changes to Cache Driver caused method_exists checks to failNathan Guse2012-07-3010-19/+19
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-301-4/+2
|\ \ \ | |/ / |/| |
| * | Merge remote-tracking branch 'Fyorl/ticket/11034' into develop-olympusAndreas Fischer2012-07-301-4/+2
| |\ \
| | * | [ticket/11034] Re-arranged install order to emulate real installFyorl2012-07-301-4/+2
| |/ /
* | | Merge PR #865 branch 'dhruvgoel92/feature/sphinx-fulltext-search' into developOleg Pudeyev2012-07-2714-2/+3222
|\ \ \
| * | | [feature/sphinx-fulltext-search] add sphinx to Authors fileDhruv2012-07-271-0/+1
| * | | [feature/sphinx-fulltext-search] add sphinxapi.php fileDhruv2012-07-271-0/+1712
| * | | [feature/sphinx-fulltext-search] fix auth bugDhruv2012-07-271-1/+1
| * | | [feature/sphinx-fulltext-search] remove unused propertyDhruv2012-07-271-1/+0
| * | | [feature/sphinx-fulltext-search] use 9312 as default portDhruv2012-07-272-5/+5
| * | | [feature/sphinx-fulltext-search] fix language of host configDhruv2012-07-271-3/+3
| * | | [feature/sphinx-fulltext-search] fix sphinx for arbitary hostDhruv2012-07-261-4/+4
| * | | [feature/sphinx-fulltext-search] coding changes acc to phbb conventionsDhruv2012-07-261-2/+12
| * | | [feature/sphinx-fulltext-search] fixing commentsDhruv2012-07-262-18/+18
| * | | [feature/sphinx-fulltext-search] add trailing slash in languageDhruv2012-07-261-1/+1
| * | | [feature/sphinx-fulltext-search] improve port optionDhruv2012-07-223-8/+6
| * | | [feature/sphinx-fulltext-search] remove stopwords and config pathDhruv2012-07-222-16/+2
| * | | [feature/sphinx-fulltext-search] makes sql host configurableDhruv2012-07-223-4/+11
| * | | [feature/sphinx-fulltext-search] use readonly instead of disabledDhruv2012-07-221-1/+1
| * | | [feature/sphinx-fulltext-search] fix language keys' typoDhruv2012-07-221-4/+4
| * | | [feature/sphinx-fulltext-search] remove note from db_toolsDhruv2012-07-211-1/+0
| * | | [feature/sphinx-fulltext-search] add support for postgresDhruv2012-07-191-3/+20
| * | | [feature/sphinx-fulltext-search] add pgsql functionalityDhruv2012-07-192-2/+2
| * | | [feature/sphinx-fulltext-search] use Update in sphinx queryDhruv2012-07-192-4/+11
| * | | [feature/sphinx-fulltext-search] use CASE instead of IFDhruv2012-07-192-4/+4
| * | | [feature/sphinx-fulltext-search] minor changes in sphinx.confDhruv2012-07-192-3/+3
| * | | [feature/sphinx-fulltext-search] use sql_table_existsDhruv2012-07-191-6/+1