aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'igorw/ticket/11061' into developAndreas Fischer2012-08-191-1/+1
|\ | | | | | | | | * igorw/ticket/11061: [ticket/11061] Add the --dev flag to the composer instructions in README
| * [ticket/11061] Add the --dev flag to the composer instructions in READMEIgor Wiedler2012-08-191-1/+1
| | | | | | | | | | | | | | It is needed to install dev dependencies, such as goutte, which are needed to run the tests. PHPBB3-11061
* | Merge remote-tracking branch 'igorw/ticket/11060' into developAndreas Fischer2012-08-191-0/+1
|\ \ | | | | | | | | | | | | * igorw/ticket/11060: [ticket/11060] Make sure pyrus can install everything on travis
| * | [ticket/11060] Make sure pyrus can install everything on travisIgor Wiedler2012-08-191-0/+1
| |/ | | | | | | | | | | This is needed so it can install symfony/yaml from a new channel. PHPBB3-11060
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-08-191-1/+1
|\ \ | | | | | | | | | | | | * develop-olympus: [ticket/11059] Use https for the README logo
| * \ Merge remote-tracking branch 'igorw/ticket/11059' into develop-olympusAndreas Fischer2012-08-191-1/+1
| |\ \ | | | | | | | | | | | | | | | | * igorw/ticket/11059: [ticket/11059] Use https for the README logo
| | * | [ticket/11059] Use https for the README logoIgor Wiedler2012-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It's causing troubles since we moved the site to HTTPS PHPBB3-11059
* | | | Merge PR #950 branch 'develop-olympus' into developOleg Pudeyev2012-08-180-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10943] displays searched query in search result [ticket/10943] use keywords variable to display in search box
| * | | Merge PR #950 branch 'dhruvgoel92/ticket/10943' into develop-olympusOleg Pudeyev2012-08-183-1/+4
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | * dhruvgoel92/ticket/10943: [ticket/10943] displays searched query in search result [ticket/10943] use keywords variable to display in search box
| | * | [ticket/10943] displays searched query in search resultDhruv Goel2012-08-113-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Search backend displays an additional normalized search query just above the ignored words. PHPBB3-10943
| | * | [ticket/10943] use keywords variable to display in search boxDhruv Goel2012-08-111-1/+1
| |/ / | | | | | | | | | | | | | | | | | | $keywords which contains the string as entered by the user should be used to display in search box instead of search_query. PHPBB3-10943
* | | Merge PR #954 branch 'dhruvgoel92/ticket/11032' into developOleg Pudeyev2012-08-182-3/+3
|\ \ \ | |_|/ |/| | | | | | | | * dhruvgoel92/ticket/11032: [ticket/11032] fix language of error displayed
| * | [ticket/11032] fix language of error displayedDhruv2012-08-152-3/+3
| | | | | | | | | | | | | | | | | | Language of the error displayed is modified. PHPBB3-11032
* | | Merge remote-tracking branch 'dhruvgoel92/ticket/11052' into developDavid King2012-08-155-8/+8
|\ \ \
| * | | [ticket/11052] update search backend constructor everywhereDhruv2012-08-155-8/+8
| | | | | | | | | | | | | | | | PHPBB3-11052
* | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11052' into developDavid King2012-08-153-5/+5
|\ \ \ \ | |/ / /
| * | | [ticket/11052] pass parametes to search construct while postingDhruv2012-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Proper parameters are passed in search backend constructor in functions_posting.php PHPBB3-11052
| * | | [ticket/11052] constructor updated in installer and convertorDhruv2012-08-152-4/+4
| | | | | | | | | | | | | | | | PHPBB3-11052
* | | | Merge remote-tracking branch 'imkingdavid/ticket/11054' into developAndreas Fischer2012-08-151-7/+14
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/11054: [ticket/11054] Fixed $config var description [ticket/11054] The user class is phpbb_user [ticket/11054] Fixed documentation syntax for @var in extension/controller.php
| * | | [ticket/11054] Fixed $config var descriptionDavid King2012-08-151-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11054
| * | | [ticket/11054] The user class is phpbb_userDavid King2012-08-141-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11054
| * | | [ticket/11054] Fixed documentation syntax for @var in extension/controller.phpDavid King2012-08-141-7/+14
|/ / / | | | | | | | | | PHPBB3-11054
* | | Merge remote-tracking branch 'dhruvgoel92/ticket/11048' into developAndreas Fischer2012-08-144-197/+95
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11048: [ticket/11048] use protected instead of private in pgsql fulltext [ticket/11048] use protected instead of private in native search [ticket/11048] remove @access from all docblocks [ticket/11048] use protected instead of private in mysql fulltext [ticket/11048] use protected instead of private in sphinx [ticket/11048] add access specifiers to phpbb native search properties [ticket/11048] add access specifiers to sphinx search [ticket/11048] add access specifiers to phpbb native search [ticket/11048] add access specifiers to mysql search [ticket/11048] add access specifiers to pgsql search
| * | | [ticket/11048] use protected instead of private in pgsql fulltextDhruv2012-08-141-10/+10
| | | | | | | | | | | | | | | | PHPBB3-11048
| * | | [ticket/11048] use protected instead of private in native searchDhruv2012-08-141-11/+11
| | | | | | | | | | | | | | | | PHPBB3-11048
| * | | [ticket/11048] remove @access from all docblocksDhruv2012-08-141-10/+0
| | | | | | | | | | | | | | | | PHPBB3-11048
| * | | [ticket/11048] use protected instead of private in mysql fulltextDhruv2012-08-141-6/+6
| | | | | | | | | | | | | | | | PHPBB3-11048
| * | | [ticket/11048] use protected instead of private in sphinxDhruv2012-08-141-16/+16
| | | | | | | | | | | | | | | | PHPBB3-11048
| * | | [ticket/11048] add access specifiers to phpbb native search propertiesDhruv2012-08-101-8/+8
| | | | | | | | | | | | | | | | PHPBB3-11048
| * | | [ticket/11048] add access specifiers to sphinx searchDhruv2012-08-101-44/+14
| | | | | | | | | | | | | | | | PHPBB3-11048
| * | | [ticket/11048] add access specifiers to phpbb native searchDhruv2012-08-101-13/+13
| | | | | | | | | | | | | | | | PHPBB3-11048
| * | | [ticket/11048] add access specifiers to mysql searchDhruv2012-08-101-44/+14
| | | | | | | | | | | | | | | | PHPBB3-11048
| * | | [ticket/11048] add access specifiers to pgsql searchDhruv2012-08-101-46/+14
| | | | | | | | | | | | | | | | PHPBB3-11048
* | | | Merge pull request #932 from EXreaction/ticket/10875Nils Adermann2012-08-1418-42/+103
|\ \ \ \ | | | | | | | | | | Ticket/10875
| * | | | [ticket/10875] Fix cache testNathan Guse2012-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for the correct filename based on the way the cache driver creates it PHPBB3-10875
| * | | | [ticket/10875] Break queries onto separate lines and use double quotesNathan Guse2012-08-061-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coding guidelines PHPBB3-10875
| * | | | [ticket/10875] Close $db connection at end of testNathan Guse2012-08-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a pgSQL issue PHPBB3-10875
| * | | | [ticket/10875] Use fixtures for sql cache testNathan Guse2012-08-062-12/+34
| | | | | | | | | | | | | | | | | | | | PHPBB3-10875
| * | | | [ticket/10875] Return $query_id from sql_saveNathan Guse2012-08-0613-11/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Have to return the $query_id from sql_save so that the results can be pulled Updated cache test to do some basic sql cache testing. PHPBB3-10875
| * | | | [ticket/10875] Fix SQL CachingNathan Guse2012-07-3015-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sql_save function cannot take arguments by reference since it is called by call_user_func_array() Replace use of isset($cache->sql_rowset[$query_id]) with $cache->sql_exists Replace $cache->cache_dir with $cache->get_driver()->cache_dir PHPBB3-10875
* | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11032' into developAndreas Fischer2012-08-141-9/+9
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * dhruvgoel92/ticket/11032: [ticket/11032] sphinx retries before triggering error
| * | | | [ticket/11032] sphinx retries before triggering errorDhruv2012-08-111-9/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | Sphinx connection retries should be done before error is triggered. PHPBB3-11032
* | | | 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