Changed the display last subject acp toggle option from
per forum to global. Modified associated database entries.
New option is available in ACP General->Board Features.
Also corrected <br /> in forumlist_body.html.
PHPBB3-10650
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.
PHPBB3-10650
Previously this produced broken SQL:
SELECT p.msg_id FROM phpbb_privmsgs p
LEFT JOIN 0 phpbb_privmsgs_to ON (p.msg_id = t.msg_id)
WHERE t.user_id IS NULL LIMIT 500 OFFSET 0
PHPBB3-10605
The pull request (#654) was merged a little too quickly.
In particular, display_last_subject per-forum option needs consensus.
This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing
changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59.
PHPBB3-10650
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.
PHPBB3-10650
* develop: (175 commits)
[feature/ajax] Remove strange non-breaking spaces from approve button
[feature/ajax] Add entirely unrelated but nice newlines
[feature/ajax] Unify phpbb_json_response instantiation
[feature/ajax] Fix acp_styles activate_deactivate ajax callback name
[feature/ajax] Send correct activate/deactivate JSON response in acp_profile
[ticket/10270] Alter background colors for posts
[feature/ajax] Remove not working module enable/disable ajax code
[feature/ajax] Replace static call to phpbb_request with OO
[feature/ajax] Remove quick-reply AJAX handling until we have something good
[ticket/10270] Changing close button for ajax popups
[ticket/10270] Disabling links in disappearing content
[ticket/10291] Fixed an AJAX bug on quick reply form submit.
[ticket/10273] Fixed accepting / denying posts AJAX.
[ticket/10272] Removed code that was prevent event propogation in AJAX.
[ticket/10291] Fixed a bug in the quick reply AJAX.
[feature/ajax] Handle acp_modules error cases with JSON response
[feature/ajax] Fix filter check, quick mod tools data-attribute
[feature/ajax] Use the error handler
[feature/ajax] Generic error handling with a phpbb.alert box
[feature/ajax] Change filter semantics, some minor adjustments
...
Conflicts:
phpBB/adm/style/acp_styles.html
phpBB/includes/acp/acp_styles.php
* upstream/develop: (35 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/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket.
[ticket/10703] Added a condition to check if ext directory exists
[ticket/10708] Check converted passwords for multi-byte characters
[ticket/10586] Tests finally work (thanks naderman)
[ticket/10586] Correctly purge board cache and don't rename install directory
[ticket/10586] trying to get tests to work
[ticket/10586] more work on getting tests to pass
[ticket/10586] Tests are coming along, just a little more to go
[ticket/10586] Rename install directory back to install/ after tests
[ticket/10586] browse tests now work, but mine dont. at least we are making progress
[ticket/10586] initial work on copying fixtures. Note that this depends on 10706
[ticket/10586] Adding the extensions used by the tests
[ticket/10586] Now tests run, but fail. But here is what I have.
...
* 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
There was a bug in the previous commit. I changed the name
of the colon of the table and forgot to update the database_update.php
now it's fixed.
PHPBB3-10600
This covers all the changes so that when a report is made, the post
itself is copied and displayed in the MCP instead of the current post.
Unfortunatly, I made all commits in the wrong way and they were lost.
Now I have only the final files.
The changes are tricky since we need to drop user_dst column from
users table, but we need it during the data migration process to
properly calculate effective timezones for all users.
The change here converts user_timezone to vchar and computes
timezone identifiers from the offsets. It uses database-specific
functions for building SQL conditionals and concatenations which
need to be implemented, probably in a separate ticket. As a result
the current code is not functional.
PHPBB3-9558
* replace the copy-pasta EventDispatcher with the real one from Symfony2
* use composer for managing this dependency, use composer autoloading
PHPBB3-9550
* prep-release-3.0.10:
[prep-release-3.0.10] Bumping version number for 3.0.10 final.
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
* prep-release-3.0.10:
[prep-release-3.0.10] Bumping version number for 3.0.10-RC3.
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
* prep-release-3.0.10:
[prep-release-3.0.10] Bumping version number for 3.0.10-RC2.
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
* develop-olympus:
[develop-olympus] Increment version number to 3.0.11-dev in develop-olympus.
[develop-olympus] Add changelog for 3.0.10-RC1
[develop-olympus] Bump version numbers for 3.0.10-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.10 releases.
Conflicts:
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg
* 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
