* EXreaction/feature/migrations: (48 commits)
[feature/migrations] Remove default values from necessary parameters
[feature/migrations] Revert unrelated changes to functions.php
[ticket/9737] Fix some comments
[ticket/9737] Fix a few minor things in migrations
[feature/migrations] Make sure migration data not done before running data step
[feature/migrations] Function to populate the migrations table (for install)
[feature/migrations] Function effectively_installed() in migrations
[feature/migrations] Make load_migrations recursive (optionally)
[feature/migrations] Make the test depends_on methods static
[feature/migrations] Make depends_on static to call it without dependencies
[feature/migrations] install/database_update_migrations.php
[feature/migrations] Move test.php -> install/database_update_migrations.php
[feature/migrations] Store depends on in the database (serialized)
[feature/migrations] Revert method completed
[feature/migrations] Basic reverting test
[feature/migrations] Test for calling a step multiple times
[feature/migrations] Creating revert method to attempt reverting a migration
[feature/migrations] Some comments in db_tools
[feature/migrations] Reverse data functionality
[feature/migrations] Comment
...
Conflicts:
phpBB/install/schemas/firebird_schema.sql
phpBB/install/schemas/mssql_schema.sql
phpBB/install/schemas/mysql_40_schema.sql
phpBB/install/schemas/mysql_41_schema.sql
phpBB/install/schemas/oracle_schema.sql
phpBB/install/schemas/postgres_schema.sql
phpBB/install/schemas/sqlite_schema.sql
Windows Live Messenger is still in use in china which accounts for ~20% of world
population. Revert WLM dropping which has been merged under the assumption that
WLM data and features are completely useless.
This commit reverts commits
- 460470229d
- 9affd6f7e7
which have been merged by d59431691c.
PHPBB3-11201
# By Bruno Ais
# Via Bruno Ais
* remotes/brunoais/ticket/11171:
[ticket/11171] Moved the DB schema changes to its place
[ticket/11171] Cleanup of leftovers
[ticket/11171] Adapted the code in report.php
[ticket/11171] Use the options stored to decide how to show it
[ticket/11171] DB changes for the update
[ticket/11171] DB additions for these changes
Conflicts:
phpBB/install/schemas/firebird_schema.sql
phpBB/install/schemas/mssql_schema.sql
phpBB/install/schemas/mysql_40_schema.sql
phpBB/install/schemas/mysql_41_schema.sql
phpBB/install/schemas/oracle_schema.sql
phpBB/install/schemas/postgres_schema.sql
phpBB/install/schemas/sqlite_schema.sql
WLM will be shutdown in March 2013. Skype is the new replacement. But as Skype
uses a different login ID and service, the values in this field are useless.
So we can safely remove the field and the links/functions we create.
PHPBB3-11201
This is required so that when migrations are reverted we can check through
all installed migrations and make sure that all dependencies are handled
properly and so that we are only required to load the migrations files
that could be dependent on the ones installed.
I believe in normal proper use the old way might have worked, but in case
something happens and an unrelated migration file is installed, but cannot
be loaded, this makes sure we do not stop everything unless we absolutely
must (one of those files is dependent on something we want to revert).
PHPBB3-9737
* 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
* 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:
[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
...
The pull request (#654) was merged a little too quickly.
In particular, display_last_subject per-forum option needs consensus.
This reverts commit b1fb34a4d7, reversing
changes made to 7d6b289671.
PHPBB3-10650
* upstream/develop: (65 commits)
[ticket/10730] Added label tag around "select" text in post splitting UI
[ticket/10732] Add config_dev.php and config_test.php to .gitignore
[ticket/10586] Added space in if statement
[ticket/10586] Tidy up comments
[task/php5.3] Updated range of tested PHP versions
[task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
[task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
[ticket/10723] Stop Travis running all tests on sqlite
[ticket/10703] Added a condition to check if ext directory exists
[task/travis] Refactor php version check for dbunit install
[task/travis] Exclude functional and slow tests
[ticket/10719] Revert "Skip functional tests on PHP 5.2"
[task/travis-develop2] Update version from 5.3 to 5.3.2
[task/travis] Dropping support for 5.2 in develop branch
[task/travis] Some more small travis fixes
[task/travis] Rename travis phpunit config files
[task/travis] Fixing some travis issues
[ticket/10684] Adjust function and parameter name, minor changes.
[task/travis] Add automated testing to readme
[task/travis] Removing development information
...
Conflicts:
phpBB/install/database_update.php
A problem when creating a report is that the report may be made and then
the post changed. After the changes, if the report is seen the message
it shows may not be correct to be reported. With these changes, when
a report is created the system copies the post that was reported and
shows it in the report details in the MCP
PHPBB3-10600
* develop: (93 commits)
[ticket/10157] Add notification to update cpfs when installing a language.
[ticket/10185] Always set board startdate on conversion
[ticket/10419] Reword the language strings
[ticket/9361] View correct error messages when editing account information
[ticket/10457] Undefined variable $request, when print-viewing PMs
[ticket/10452] Fix xHTML errors when print-viewing PMs
[ticket/9066] Move regex into get_preg_expression function and add tests
[ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css
[ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.
[ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.
[ticket/10254] Remove subsilver2 as default style on theme.
[ticket/10254] Remove style names from themes and fix some informations on it.
[ticket/7138] Allow simple header and footer for trigger_error() messages
[ticket/9066] Disallow some database prefix to prevent same errors and problems
[ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read
[ticket/10437] Do not display announcements that are waiting for approval
[ticket/10087] Organize bans in acp_baninto optgroups
[ticket/8616] Include old U_INBOX var for BC
[ticket/10435] Remove global announcement from forums total topic count
[ticket/10435] Readd local announcements to total topic count in viewforum
...
Conflicts:
phpBB/install/database_update.php
* VSEphpbb/ticket/10390:
[ticket/10390] Revert back to escaped script tags inside document.write
[ticket/10390] Fix wording: fallback should be fall back
[ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
[ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback
[ticket/10390] Drop http protocol for Microsoft's CDN option
[ticket/10390] Reword the language for jQuery host/server options
[ticket/10390] Fix a type-o - captialize AJAX
[ticket/10390] Improve the jQuery CDN url generation function
[ticket/10390] Move jQuery version definition
[ticket/10390] Allow option for jQuery to be hosted by a remote CDN
Conflicts:
phpBB/install/database_update.php
