# By Oleg Pudeyev (45) and others
# Via Oleg Pudeyev (42) and others
* remotes/phpbb/develop: (289 commits)
[ticket/10865] Use code tags for install/database_update.php.
[ticket/10865] Should have been a slash.
[ticket/10780] Use L_COLON on LDAP page.
[ticket/10780] Use L_COLON on search backend ACP pages.
[ticket/10780] Use L_COLON for "download all attachments".
[ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
[ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
[ticket/10780] Replace colon usage in adm template output with {L_COLON}
[ticket/10780] Replace colon usage in template output with {L_COLON}
[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
[ticket/10172] Show prosilver birthday list even if there are no birthdays.
[ticket/11050] make all properties protected in all search backends
[ticket/11050] get_common_words() returns empty array for sphinx
[ticket/11050] fix tidied search query docblock language
[ticket/11050] fix min/max length docblock language
[ticket/11050] multi sentences separated by period in docblocks
[ticket/11050] fix separated spelling in docblock
[ticket/11050] fix split words doc block language
[ticket/11050] remove class word from docblocks
...
Conflicts:
phpBB/install/database_update.php
phpBB/install/schemas/mssql_schema.sql
phpBB/language/en/acp/permissions_phpbb.php
phpBB/styles/prosilver/template/posting_editor.html
* develop-olympus:
[ticket/10897] Combine bot updates and bot delete.
[ticket/10897] Use same code/query for deleting.
[ticket/10897] Make sure the user we're fetching is a bot.
[ticket/10897] Do not handle IP address. There is no need.
[ticket/10897] Update by user_id instead of bot_name.
[ticket/10897] Move bot delete data to the relevant foreach loop.
[ticket/10897] Add comment about what's going on.
[ticket/10897] Remove unnecessary string casting.
[ticket/10897] Add space after foreach.
[ticket/10897] Update bots during phpBB update
[ticket/10897] Bot list updated
* brunoais/ticket/10845:
[ticket/10845] Removed one empty line that wasn't supposed to be there
[ticket/10845] Two of the three colouns were missing in the DB update file
[ticket/10845] Remove censor from text
[ticket/10845] Now it shows the preview post parsed
[ticket/10845] Changed the report system. Now it saves posts with the bbcode
Conflicts:
phpBB/includes/functions_content.php
* EXreaction/ticket/11021:
[ticket/11021] Remove unnecessary line spacing in functions.php
[ticket/11021] Use L_SITE_HOME instead of L_HOME
[ticket/11021] Better language strings for site home url/text
[ticket/11021] subsilver2 support
[ticket/11021] Add the option to specify a Site home URL and text
* prep-release-3.0.11:
[prep-release-3.0.11] Bumping version number for 3.0.11 final.
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
* 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
...
* develop-olympus:
[prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
[prep-release-3.0.11] Bumping version number for 3.0.11-RC2.
Conflicts:
phpBB/install/database_update.php
* prep-release-3.0.11:
[prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
[prep-release-3.0.11] Bumping version number for 3.0.11-RC2.
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
* develop-olympus:
[ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
[ticket/10965] Introduce a new profile field option to display no value
Conflicts:
phpBB/includes/acp/acp_profile.php
* prep-release-3.0.11:
[ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
[ticket/10965] Introduce a new profile field option to display no value
By default the 3.0.10 behaviour is kept, profile fields will not show up
if they have either not yet been selected or in case of an optional
dropdown field if the novalue option was selected.
PHPBB3-10965
* dhruvgoel92/feature/postgresql-fulltext-search: (28 commits)
[feature/postgresql-fulltext-search] supports_phrase_search function
[feature/postgresql-fulltext-search] use proper variable name
[feature/postgresql-fulltext-search] each config is checked if it is set
[feature/postgresql-fulltext-search] fix formatting
[feature/postgresql-fulltext-search] add docblocks to functions
[feature/postgresql-fulltext-search] remove phrase search code
[feature/postgresql-fulltext-search] define access control specifiers
[feature/postgresql-fulltext-search] use version_compare
[feature/postgresql-fulltext-search] fix language key
[feature/postgresql-fulltext-search] remove Readme
[feature/postgresql-fulltext-search] removes pcre check
[feature/postgresql-fulltext-search] fix language tsearch2 to text search
[feature/postgresql-fulltext-search] remove mbstring support
[feature/postgresql-fulltext-search] change language for pgsql < 8.3
[feature/postgresql-fulltext-search] use phpbb_pcre_utf8_support()
[feature/postgresql-fulltext-search] fix variable name
[feature/postgresql-fulltext-search] Fix version comparison for 9.0+.
[feature/postgresql-fulltext-search] fixing license
[feature/postgresql-fulltext-search] assign empty stats
[feature/postgresql-fulltext-search] remove backward compatibility
...
