aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge PR #944 branch 'dhruvgoel92/ticket/11032' into developOleg Pudeyev2012-08-102-0/+10
|\ | | | | | | | | * dhruvgoel92/ticket/11032: [ticket/11032] trigger error in case search fails
| * [ticket/11032] trigger error in case search failsDhruv2012-08-102-0/+10
|/ | | | | | | Admins are shown actual error while users are shown a search failed error in case sphinx search fails. PHPBB3-11032
* Merge remote-tracking branch 'mvinny/ticket/11046' into developAndreas Fischer2012-08-081-1/+2
|\ | | | | | | | | * mvinny/ticket/11046: [ticket/11046] Add border-radius for UCP message colours block
| * [ticket/11046] Add border-radius for UCP message colours blockVinny2012-08-071-1/+2
| | | | | | | | PHPBB3-11046
* | Merge remote-tracking branch 'mvinny/ticket/11047' into developAndreas Fischer2012-08-081-1/+1
|\ \ | | | | | | | | | | | | * mvinny/ticket/11047: [ticket/11047] Close TOTAL_MESSAGES at ucp_pm_viewfolder.html
| * | [ticket/11047] Close TOTAL_MESSAGES at ucp_pm_viewfolder.htmlVinny2012-08-071-1/+1
| |/ | | | | | | | | | | | | This problem only occurs in prosilver With the variable unclosed, the language key isnt displayed PHPBB3-11047
* | Merge PR #916 branch 'dhruvgoel92/ticket/11011' into developOleg Pudeyev2012-08-086-318/+314
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11011: [ticket/11011] rename property phpEx to php_ext [ticket/11011] pass $auth to search backend constructor [ticket/11011] remove global keyword from sphinx [ticket/11011] pass global variables in construct [ticket/11011] passing global variables [ticket/11011] remove global keyword in native search [ticket/11011] remove global keyword in pgsql search [ticket/11011] global variables as constructor parameters [ticket/11011] add access specifiers and docblocks
| * | [ticket/11011] rename property phpEx to php_extDhruv2012-08-082-9/+9
| | | | | | | | | | | | PHPBB3-11011
| * | [ticket/11011] pass $auth to search backend constructorDhruv2012-08-086-7/+7
| | | | | | | | | | | | | | | | | | | | | $auth global var is passed to search backend constructor, as it is used by sphinx backend. PHPBB3-11011
| * | [ticket/11011] remove global keyword from sphinxDhruv2012-07-281-7/+6
| | | | | | | | | | | | PHPBB3-11011
| * | [ticket/11011] pass global variables in constructDhruv2012-07-281-6/+7
| | | | | | | | | | | | | | | | | | | | | Use global variables passed through constructor instead of using global keyword in sphinx search backend. PHPBB3-11011
| * | [ticket/11011] passing global variablesDhruv2012-07-283-7/+3
| | | | | | | | | | | | | | | | | | Pass global variables to class constructor when making a new object. PHPBB3-11011
| * | [ticket/11011] remove global keyword in native searchDhruv2012-07-281-142/+132
| | | | | | | | | | | | | | | | | | Pass global variables into the search backend class constructor. PHPBB3-11011
| * | [ticket/11011] remove global keyword in pgsql searchDhruv2012-07-281-77/+57
| | | | | | | | | | | | | | | | | | Pass global variables into the search backend class constructor. PHPBB3-11011
| * | [ticket/11011] global variables as constructor parametersDhruv2012-07-281-77/+58
| | | | | | | | | | | | | | | | | | Pass global variables into the search backend class constructor. PHPBB3-11011
| * | [ticket/11011] add access specifiers and docblocksDhruv2012-07-281-6/+55
| | | | | | | | | | | | | | | | | | Add access specifiers and docblocks to mysql search backend. PHPBB3-11011
* | | Merge PR #933 branch 'dhruvgoel92/ticket/11032' into developOleg Pudeyev2012-08-082-1/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11032: [ticket/11032] use method GetLastError to get error [ticket/11032] add sphinx errors to error log
| * | | [ticket/11032] use method GetLastError to get errorDhruv2012-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using _error property, use method GetLastError to retrieve the error as sphinx API documentation states. PHPBB3-11032
| * | | [ticket/11032] add sphinx errors to error logDhruv2012-08-012-0/+6
| | | | | | | | | | | | | | | | PHPBB3-11032
* | | | Merge remote-tracking branch 'Noxwizard/ticket/11043' into developAndreas Fischer2012-08-072-6/+7
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/11043: [ticket/11043] Change hook name back to display, since that's where we hook in. [ticket/11043] Allow call_hook() to be called from more than one location. [ticket/11043] Update template hook name
| * | | [ticket/11043] Change hook name back to display, since that's where we hook in.Andreas Fischer2012-08-031-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11043
| * | | [ticket/11043] Allow call_hook() to be called from more than one location.Andreas Fischer2012-08-031-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the helper function call_hook() of class phpbb_template to be called from more than once location and thus for more than one hook (although there is only one) by adding the method name as a parameter. PHPBB3-11043
| * | | [ticket/11043] Update template hook namePatrick Webster2012-08-031-1/+1
| |/ / | | | | | | | | | PHPBB3-11043
* | | Merge remote-tracking branch 'Fyorl/ticket/11044' into developAndreas Fischer2012-08-061-0/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fyorl/ticket/11044: [ticket/11044] Added comment explaining filename splitting [ticket/11044] Preserve the file extension in unique filenames [ticket/11044] Minor adjustments as per PR comments [ticket/11044] Compress class now deals with file conflicts
| * | | [ticket/11044] Added comment explaining filename splittingFyorl2012-08-061-1/+4
| | | | | | | | | | | | | | | | PHPBB3-11044
| * | | [ticket/11044] Preserve the file extension in unique filenamesFyorl2012-08-051-1/+9
| | | | | | | | | | | | | | | | PHPBB3-11044
| * | | [ticket/11044] Minor adjustments as per PR commentsFyorl2012-08-051-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | Changed private to protected, renamed check_name to unique_filename. PHPBB3-11044
| * | | [ticket/11044] Compress class now deals with file conflictsFyorl2012-08-041-0/+25
| | | | | | | | | | | | | | | | PHPBB3-11044
* | | | Merge remote-tracking branch 'bantu/ticket/11041' into developIgor Wiedler2012-08-062-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11041: [ticket/11041] Correctly import PHP file extension from global space.
| * | | | [ticket/11041] Correctly import PHP file extension from global space.Andreas Fischer2012-08-022-5/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | 85bcdbad468cd255a02d6c48b2dcd1d128978eed shouldn't have changed imports of "global $phpEx". PHPBB3-11041
* | | | Merge remote-tracking branch 'EXreaction/ticket/10885' into developAndreas Fischer2012-08-061-9/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/10885: [ticket/10885] Fix UCP Main Error if no forums exist
| * | | | [ticket/10885] Fix UCP Main Error if no forums existNathan Guse2012-08-061-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This error is caused by an empty set passed to sql_in_set if the user cannot read any forums PHPBB3-10885
* | | | | Merge remote-tracking branch 'EXreaction/ticket/11029' into developAndreas Fischer2012-08-061-8/+3
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11029: [ticket/11029] Remove $reparse variable [ticket/11029] Return $parsed_array (may have loaded from the cache) [ticket/11029] Cache obtain_cfg_items should return empty array on failure
| * | | | [ticket/11029] Remove $reparse variableNathan Guse2012-08-061-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Its only set to false, then true in one case, and only checked once. So remove it because it is unnecessary. PHPBB3-11029
| * | | | [ticket/11029] Return $parsed_array (may have loaded from the cache)Nathan Guse2012-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if the file does not exist, it may be in the cache, so return $parsed_array just in case PHPBB3-11029
| * | | | [ticket/11029] Cache obtain_cfg_items should return empty array on failureNathan Guse2012-07-301-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | continue was used where it should not have been, causing a fatal error This file is loaded on every page to check if style.cfg has changed. If it has not, the user is not affected, so if it does not exist, the user should not be affected either. PHPBB3-11029
* | | | Merge remote-tracking branch 'nickvergessen/ticket/11004' into developAndreas Fischer2012-08-023-10/+23
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11004: [ticket/11004] Always update suggestion button in timezone_preselect_select [ticket/11003] Ability to show full list of timezones with JavaScript enabled [ticket/11004] Make suggestion button a real button and fix it's value
| * | | [ticket/11004] Always update suggestion button in timezone_preselect_selectJoas Schilling2012-07-241-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggestion must also be updated when the suggestion is selected at first, so we can display a correct button, when the suggestion is not selected anymore. PHPBB3-11004
| * | | [ticket/11003] Ability to show full list of timezones with JavaScript enabledJoas Schilling2012-07-231-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This also fixes the problem with Chrome which displayed all timezones. PHPBB3-11007 PHPBB3-11003
| * | | [ticket/11004] Make suggestion button a real button and fix it's valueJoas Schilling2012-07-232-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11004
* | | | Merge remote-tracking branch 'EXreaction/ticket/10875' into developAndreas Fischer2012-07-3010-20/+19
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | * EXreaction/ticket/10875: [ticket/10875] method_exists check is not required, interface declares them [ticket/10875] Changes to Cache Driver caused method_exists checks to fail
| * | | [ticket/10875] method_exists check is not required, interface declares themNathan Guse2012-07-3010-20/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes to the cache drivers added an interface, which requires many cache functions exist. For these, we can remove the method_exists() check PHPBB3-10875
| * | | [ticket/10875] Changes to Cache Driver caused method_exists checks to failNathan Guse2012-07-3010-19/+19
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | SQL Cache and other functions using the check method_exists($cache, failed because of the changes to the cache system. method_exists($cache has been changed to method_exists($cache->get_driver() PHPBB3-10875
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-301-4/+2
|\ \ \ | |/ / |/| | | | | | | | * develop-olympus: [ticket/11034] Re-arranged install order to emulate real install
| * | Merge remote-tracking branch 'Fyorl/ticket/11034' into develop-olympusAndreas Fischer2012-07-301-4/+2
| |\ \ | | | | | | | | | | | | | | | | * Fyorl/ticket/11034: [ticket/11034] Re-arranged install order to emulate real install
| | * | [ticket/11034] Re-arranged install order to emulate real installFyorl2012-07-301-4/+2
| |/ / | | | | | | | | | PHPBB3-11034
* | | Merge PR #865 branch 'dhruvgoel92/feature/sphinx-fulltext-search' into developOleg Pudeyev2012-07-2714-2/+3222
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/feature/sphinx-fulltext-search: (57 commits) [feature/sphinx-fulltext-search] add sphinx to Authors file [feature/sphinx-fulltext-search] add sphinxapi.php file [feature/sphinx-fulltext-search] fix auth bug [feature/sphinx-fulltext-search] remove unused property [feature/sphinx-fulltext-search] use 9312 as default port [feature/sphinx-fulltext-search] fix language of host config [feature/sphinx-fulltext-search] fix sphinx for arbitary host [feature/sphinx-fulltext-search] coding changes acc to phbb conventions [feature/sphinx-fulltext-search] fixing comments [feature/sphinx-fulltext-search] add trailing slash in language [feature/sphinx-fulltext-search] improve port option [feature/sphinx-fulltext-search] remove stopwords and config path [feature/sphinx-fulltext-search] makes sql host configurable [feature/sphinx-fulltext-search] use readonly instead of disabled [feature/sphinx-fulltext-search] fix language keys' typo [feature/sphinx-fulltext-search] remove note from db_tools [feature/sphinx-fulltext-search] add support for postgres [feature/sphinx-fulltext-search] add pgsql functionality [feature/sphinx-fulltext-search] use Update in sphinx query [feature/sphinx-fulltext-search] use CASE instead of IF ...
| * | | [feature/sphinx-fulltext-search] add sphinx to Authors fileDhruv2012-07-271-0/+1
| | | | | | | | | | | | | | | | PHPBB3-10946
| * | | [feature/sphinx-fulltext-search] add sphinxapi.php fileDhruv2012-07-271-0/+1712
| | | | | | | | | | | | | | | | PHPBB3-10946
| * | | [feature/sphinx-fulltext-search] fix auth bugDhruv2012-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | $this->auth replaces $auth as at other occurences of auth. PHPBB3-10946