| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# By Oleg Pudeyev (37) and others
# Via Oleg Pudeyev (24) and others
* 'develop' of github.com:phpbb/phpbb3: (179 commits)
[ticket/11323] Add tests for inclusion of defined variables
[ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
[ticket/11321] Recreate schema files with develop/create_schema_files.php
[ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31
[ticket/11313] Use correct object el instead of eel in alt_text callback
[ticket/11301] Guidelines: Add spaces in front and after the / operator.
[ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
[ticket/11311] Include asset core.js in subsilver2 overall_footer.html
[ticket/10949] Remove not needed comma
[ticket/11309] phpbb_extension_interface::disable_step correct docblock.
[ticket/10949] Converted missing code to new JS coding guidelines
[ticket/11302] Correctly select first timezone or selected timezone
[ticket/11305] Mock container for cache driver in functional create_user()
[ticket/11305] Check for $cache being null before using it in db drivers.
[ticket/10805] Compare phpbbAlertTimer against null
[ticket/11305] Define hook finder as a service on the container.
[ticket/11305] Adjust comment.
[ticket/11305] Use phpbb_create_default_container.
[ticket/11305] Create a normal container during final installation step.
[ticket/11305] Retrieve cache driver from container rather than cache service.
...
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
phpBB/styles/subsilver2/template/overall_footer.html
|
| |
| |
| |
| | |
PHPBB3-10758
|
| |
| |
| |
| | |
PHPBB3-10758
|
| |
| |
| |
| | |
PHPBB3-10758
|
| |
| |
| |
| | |
PHPBB3-10758
|
| |
| |
| |
| | |
PHPBB3-10758
|
| |
| |
| |
| |
| |
| | |
Also add phpbb prefix since the signature is being changed anyway.
PHPBB3-10758
|
| |
| |
| |
| |
| |
| | |
Also add phpbb prefix since the signature is being changed anyway.
PHPBB3-10758
|
| |
| |
| |
| |
| |
| | |
https://github.com/phpbb/phpbb3/pull/992#discussion_r2413976
PHPBB3-11103
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
phpBB/install/database_update.php
phpBB/styles/prosilver/template/ucp_prefs_personal.html
phpBB/styles/subsilver2/template/ucp_prefs_personal.html
|
| |\
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/11227] @return void -> @return null in develop-olympus.
|
| | |
| | |
| | |
| | | |
PHPBB3-11227
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Create a very basic user loader class to handle querying/storing
user data in a centralized location.
Use DIC collection service for notification types/methods.
Cleanup unused dependencies.
Fix some other issues.
PHPBB3-11103
|
| | |
| | |
| | |
| | |
| | |
| | | |
This is going to require you recreate the db tables.
PHPBB3-11103
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Comments that are not needed because the actions are completely
self-explanatory
PHPBB3-11103
|
| | |
| | |
| | |
| | |
| | |
| | | |
Do not use phpbb_container everywhere (makes testing difficult)
PHPBB3-11103
|
| | |
| | |
| | |
| | | |
PHPBB3-11103
|
| | |
| | |
| | |
| | | |
PHPBB3-11103
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use $phpbb_notifications instead of $notifications everywhere for
consistency and conflict prevention.
PHPBB3-11103
|
|/ /
| |
| |
| | |
PHPBB3-11103
|
| |
| |
| |
| | |
PHPBB3-11052
|
| |
| |
| |
| |
| |
| | |
Merge their bodies into phpbb_remove_comments($input).
PHPBB3-10969
|
|\ \
| |/
| |
| |
| |
| | |
* develop-olympus:
[ticket/10937] Update documentation to say which comment styles are removed.
[ticket/10937] Comment removal functions: Restore backward compatibility
|
| |
| |
| |
| | |
PHPBB3-10937
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
[ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.
[ticket/10751] Add sql_lower_text() to database abstraction layer.
Conflicts:
phpBB/includes/db/dbal.php
|
| |
| |
| |
| | |
PHPBB3-10751
|
|\ \
| | |
| | |
| | |
| | | |
* bantu/ticket/10636:
[ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
|
| | |
| | |
| | |
| | |
| | |
| | | |
Regression from 4c77903129749008cd08c346006d2a57cf6ff544.
PHPBB3-10636
|
|/ /
| |
| |
| |
| |
| | |
Replacing code in includes/functions_admin.php that was missed in ticket 10323
PHPBB3-10637
|
| |
| |
| |
| | |
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
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* nickvergessen/ticket/10484:
[ticket/10484] Use variables for sql_build_query() calls
Conflicts:
phpBB/includes/mcp/mcp_front.php
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It's easier for mods/extensions to extend the arrays.
PHPBB3-10484
|
|\ \ \ \
| |/ / /
|/| / /
| |/ /
| | |
| | | |
* develop-olympus:
[ticket/10461] Add a comment explaining the logic here.
[ticket/10461] Correct $log_count check in view_log() so we show logs again.
|
| | |
| | |
| | |
| | | |
PHPBB3-10461
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We pass $log_count as false now when we do not need to know how many log
entries there are. However when $log_count is false, $log_count == 0 will be
true as well and thus we will return early with 0.
PHPBB3-9874
PHPBB3-10461
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
[ticket/10278] Also timeout when receiving data over a slow connection.
[ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
[ticket/10278] Return with a timeout error when fread() or fgets() time out.
[ticket/10278] Also set timeout on stream in get_remote_file().
|
| | |
| | |
| | |
| | | |
PHPBB3-10278
|
| | |
| | |
| | |
| | | |
PHPBB3-10278
|
| | |
| | |
| | |
| | | |
PHPBB3-10278
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
From the PHP manual for fsockopen():
If you need to set a timeout for reading/writing data over the socket, use
stream_set_timeout(), as the timeout parameter to fsockopen() only applies
while connecting the socket.
http://www.php.net/manual/en/function.fsockopen.php
PHPBB3-10278
|
|\ \
| |/
| |
| |
| | |
* develop-olympus:
[ticket/5506] Do not display an empty last page after deleting logs.
|
| |
| |
| |
| |
| |
| | |
The fix is copied from view_inactive_users().
Also add keywords and sort parameters to url for deleting logs and inactive users.
And finally save some queries if there are no logs/users to display anyway
|
| |
| |
| |
| |
| |
| | |
Topic-Tracking is still missing.
PHPBB3-9684
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/9874] view_log() performs unneeded count query over all log entries.
[ticket/7834] Topic time didn't update when first post was deleted
[ticket/9997] Fixed an inconsistency in the Moderator Control Panel
[ticket/9872] Removed some useless code that broke delete_posts
|
| |
| |
| |
| | |
PHPBB3-9874
|
|/
|
|
|
|
|
|
|
|
|
|
| |
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .
Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;
Extensions: php, css, html, js, xml.
PHPBB3-9556
|
|
|
|
| |
PHPBB3-9850
|