| 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
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| |\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
feature/softdelete-1-permission-rebase
* 'develop' of https://github.com/phpbb/phpbb3: (544 commits)
[feature/events] Fix improperly named event in documentation
[feature/events] Fix alphabetization of events
[feature/events] Put events in alphabetical order
[feature/events] Make EVENTS.md lowercase
[ticket/11285] Use more granularity in dependency checks in compress test
[ticket/10880] The m_approve permisson no longer implies f_noapprove.
[ticket/10803] Show failure message until user dismisses it
[ticket/10954] Add missing semi-colon
[ticket/10954] Make sure to mark subforums unread and add small fixes
[feature/events] Use ` to escape HTML tags in markdown
[feature/events] Remove HTML tags from markdown so they don't get parsed
[ticket/10954] Miscellaneous coding fixes
[feature/events] Remove extraneous space
[feature/events] Add markdown template event documentation file
[feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)
[feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)
[feature/events] Fix typo in event name
[ticket/10763] Use self when calling get_extension() in filespec class
[feature/events] Fix more subsilver2 events
[feature/events] Fix some subsilver2 events
...
Conflicts:
phpBB/install/database_update.php
phpBB/posting.php
|
| | |\ \ \
| | |/ /
| |/| /
| | |/
| | | |
* develop-olympus:
[ticket/11227] @return void -> @return null in develop-olympus.
|
| | | |
| | |
| | |
| | | |
PHPBB3-11227
|
| | | |
| | |
| | |
| | | |
PHPBB3-9567
|
| | | |
| | |
| | |
| | | |
PHPBB3-9567
|
| | | |
| | |
| | |
| | | |
PHPBB3-9567
|
| | | |
| | |
| | |
| | | |
PHPBB3-9567
|
| | | |
| | |
| | |
| | | |
PHPBB3-9567
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
This also makes sync('topic_visibility') obsolete, but we keep it for now.
Also fix a unit test, because ITEM_DELETED overpowers ITEM_UNAPPROVED
PHPBB3-9567
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
The function can not rely on the first post anymore, as that one could be soft
deleted but the topic still has approved replies which are still visible.
PHPBB3-9567
|
| | | |
| | |
| | |
| | |
| | |
| | | |
This also fixes set_post_visibility()
PHPBB3-9567
|
| | | |
| | |
| | |
| | | |
PHPBB3-9657
|
| | | |
| | |
| | |
| | | |
PHPBB3-9657
|
| |/ /
| |
| |
| |
| |
| | |
So far, I've added no new functionality. The biggest change here is adjusting the DB column names to "visibility" rather than "approved". Some things here are pretty likely to change, for example the name and location of the topic_visibility class. Happy birthday phpBB :)
PHPBB3-9657
|
| | |
| |
| |
| | |
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
|