| Commit message (Collapse) | Author | Age | Files | Lines |
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* upstream/develop: (101 commits)
[ticket/10491] Make recreate_database static.
[ticket/11088] Pass required objects in as arguments
[ticket/11088] Globalize objects in new permission function
[ticket/11088] Move permission creation to a function
[ticket/11088] Copy a_styles permission for a_extensions
[ticket/11088] Remove extraneous word from sentence in comment
[ticket/11088] Changed "file extensions" to "attachment extensions"
[ticket/11088] Fix the database updater to correctly manipulate the modules
[ticket/11088] Put language pack module move below extension module creation
[ticket/11088] Untested, progress on update script
[ticket/11088] Fix typo (period instead of comma)
[ticket/11088] Untested progress for update script
[ticket/11088] Added missing comma
[ticket/11088] Removed added space
[ticket/11088] Move style, extension and language pack management to customise
[ticket/11243] Show download all link on all pages of topic with attachments
[feature/template-events] Pass arguments in correct order.
[feature/template-events] Pass arguments in correct order.
[ticket/10491] Install board once per test run.
[ticket/11257] Do not require set_name() method to exist
...
|
| | |
| |
| |
| | |
PHPBB3-11088
|
| | |
| |
| |
| |
| |
| |
| | |
Instead of being separated, these related ACP modules are now grouped
intuitively.
PHPBB3-11088
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* upstream/develop: (196 commits)
[ticket/11219] Coding guidelines and naming consistency changes
[ticket/10841] Revert more whitespace changes.
[ticket/10841] Revert whitespace changes.
[ticket/10841] adding space after if
[ticket/10841] removing unnecessary spacing
[ticket/10841] changing affectedrows check to COUNT in sql
[ticket/10841] Modifying style and language selectors in UCP
[ticket/11247] Fix wrong property reference in flock class.
[ticket/10602] Avoid a race condition.
[ticket/10602] Use last_queue_run for its intended purpose.
[ticket/10716] Collect standard error from executed php process.
[ticket/10716] Skip test if php is not in PATH.
[ticket/10716] Exclude our dependencies from linting.
[ticket/10103] New and improved wording.
[ticket/10716] Only lint on php 5.3+.
[ticket/10103] Assert with messages.
[ticket/10103] assertLessThan/assertGreaterThan.
[ticket/10103] Inline assignment is bad?
[ticket/10103] $rv had too few characters.
[ticket/10103] Correct flock class documentation.
...
Conflicts:
phpBB/includes/functions.php
tests/cache/cache_test.php
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* brunoais/ticket/10601:
[ticket/10601] The ORDER BY is only taking space there
[ticket/10601] New approach in the update algorithm
[ticket/10601] Comment to help understanding the code
[ticket/10601] Requested code changes
[ticket/10601] Cosmetic code changes
[ticket/10601] Database updating code v2
[ticket/10601] Database updating code
[ticket/10601] Comment explaning the basename applied to categories
[ticket/10601] Correctly access class property
[ticket/10601]Move Inbox the default in private messages module
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Explain in the code where
if (isset($this->module_categories_basenames[$cat_name]))
and
if (isset($this->module_categories_basenames[$level2_name]))
exists, what does it do.
PHPBB3-10601
|
| | | |
| | |
| | |
| | | |
PHPBB3-10601
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Did exactly as the answer here asked:
http://area51.phpbb.com/phpBB/viewtopic.php?p=234111
PHPBB3-10601
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | | |
* develop-olympus:
[ticket/10184] Query bots table to get the user_ids of the bots
[ticket/10184] Disable receiving pms for bots by default
|
| | | |
| | |
| | |
| | | |
PHPBB3-10184
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* upstream/develop: (666 commits)
[ticket/11077] Remove code from old global announcements system
[ticket/11189] Replace DEBUG_EXTRA with DEBUG
[ticket/11189] Always log critical errors when in cron or in image output
[ticket/11187] Added a blank array to fix errors in functional tests
[ticket/10780] Make L_COLON available in the installer.
[ticket/11183] Remove $load_extensions and weird dl() calls
[ticket/10970] Added extra documentation to parse_dynamic_path.
[ticket/10939] Added documentation for phpbb_request::file
[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.
...
Conflicts:
phpBB/common.php
phpBB/download/file.php
phpBB/includes/db/dbal.php
phpBB/includes/db/firebird.php
phpBB/includes/db/mssql.php
phpBB/includes/db/mssql_odbc.php
phpBB/includes/db/mssqlnative.php
phpBB/includes/db/mysql.php
phpBB/includes/db/mysqli.php
phpBB/includes/db/oracle.php
phpBB/includes/db/postgres.php
phpBB/includes/db/sqlite.php
phpBB/includes/extension/manager.php
phpBB/install/database_update.php
|
| | |\ \
| | | |
| | | |
| | | |
| | | | |
* igorw/ticket/11183:
[ticket/11183] Remove $load_extensions and weird dl() calls
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11183
|
| | |/ /
| | |
| | |
| | | |
PHPBB3-11181
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
'Baidu [Spider]' updated.
'Bing [Bot]' fixed only identation.
'Exabot [Bot]' changed because there is used also 'Exabot-Thumbnails'
user agent.
'NG-Search [Bot]' no longer exists.
'Nutch/CVS [Bot]' is the same of 'Nutch [Bot]'.
'OmniExplorer [Bot]' no longer exists.
'Seekport [Bot]' no longer exists.
'Synoo [Bot]' no longer exists.
'Voyager [Bot]' updated.
'W3C [Validator]' corrected (there was a *).
'WiseNut [Bot]' no longer exists.
PHPBB3-10897
|
| | | |
| | |
| | |
| | | |
PHPBB3-10631
|
| | | |
| | |
| | |
| | | |
PHPBB3-11052
|
| |/ /
| |
| |
| |
| |
| |
| |
| | |
PHPBB3-11015
This allows us to just create the object without having to include the
driver first. However, it also means that users must specify the full
class name in config.php
|
| |\ \
| | |
| | |
| | | |
feature/new-tz-handling
|
| | |\ \
| | |/
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/10937] Update documentation to say which comment styles are removed.
[ticket/10937] Comment removal functions: Restore backward compatibility
|
| | | |
| | |
| | |
| | | |
PHPBB3-10937
|
| |/ /
| |
| |
| | |
PHPBB3-9558
|
| |\ \
| |/
| |
| |
| | |
* develop-olympus:
[ticket/10094] Purge acm_file cache before phpBB installation.
|
| | |\
| | |
| | |
| | |
| | | |
* bantu/ticket/10094:
[ticket/10094] Purge acm_file cache before phpBB installation.
|
| | | |
| | |
| | |
| | | |
PHPBB3-10094
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/10836] Check if avatar directory is writable after install
[ticket/10836] Enable avatars by default at install
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Check if the avatar directory is writeable after the installation is complete.
If it isn't, disable avatars and avatar uploading by default.
PHPBB3-10836
|
| | | |
| | |
| | |
| | | |
PHPBB3-10492
|
| |\ \ \
| |/ /
| | |
| | |
| | | |
* develop-olympus:
[ticket/10812] Disabled register_globals check in PHP 5.4
|
| | |/
| |
| |
| |
| |
| | |
Disabled the check for register_globals if PHP version is 5.4+
PHPBB3-10812
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Installer now checks json extension and cannot continue without it.
Changes are made in phpBB/install/install_install.php where the
checking for json is added and to phpBB/language/en/install.php where
2 new keys for the messages that would be displayed are also added.
PHPBB3-10813
|
| | |
| |
| |
| |
| |
| |
| | |
After installing, when user clicks Login button (final installation step),
he is not logged in because there's a missing var ($data)
PHPBB3-10547
|
| | |
| |
| |
| | |
PHPBB3-10693
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* imkingdavid/ticket/10535:
[ticket/10535] Delete no longer needed email confirm language entries.
[ticket/10535] Delete email confirm from installer
[ticket/10535] Removed email confirm field from acp_users module
[ticket/10535] Forgot a subsilver2 change. *doh*
[ticket/10535] Removed email confirm from UCP, removed unused language entries
[ticket/10535] Remove email confirm check on registration form
|
| | | |
| | |
| | |
| | | |
PHPBB3-10535
|
| |/ /
| |
| |
| | |
PHPBB3-9916
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/10349] Removed duplicated functions from schema loading in tests
[ticket/10349] Update function comment
[ticket/10349] Use new schema comment function in installer
[ticket/10349] Unit tests: Consolidate schema comment removal functions
[ticket/10349] Unit tests: Remove comments while loading schema files
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* Noxwizard/ticket/10349:
[ticket/10349] Removed duplicated functions from schema loading in tests
[ticket/10349] Update function comment
[ticket/10349] Use new schema comment function in installer
[ticket/10349] Unit tests: Consolidate schema comment removal functions
[ticket/10349] Unit tests: Remove comments while loading schema files
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is what now runs in the unit tests. The COMMENTS field in the dbms data
is no longer needed, so it has been removed.
PHPBB3-10349
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().
[ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().
[ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.
[ticket/10446] DRY X-AntiAbuse header addition.
Conflicts:
phpBB/includes/ucp/ucp_register.php
|
| | | |
| | |
| | |
| | | |
PHPBB3-10446
|
| | | |
| | |
| | |
| | | |
PHPBB3-10446
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* 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
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | | |
* develop-olympus:
[ticket/9066] Move regex into get_preg_expression function and add tests
[ticket/9066] Disallow some database prefix to prevent same errors and problems
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-9066
|
| | | |/
| | |
| | |
| | |
| | |
| | |
| | | |
With this patch database prefixes must not be empty and only contain
alphanumeric characters, numbers and underscores.
PHPBB3-9066
|
| | | |
| | |
| | |
| | | |
PHPBB3-10414
|
| | | |
| | |
| | |
| | | |
PHPBB3-10323
|
| | | |
| | |
| | |
| | |
| | |
| | | |
This was done to make it autoloadable.
PHPBB3-10323
|