| 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
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/10880] The m_approve permisson no longer implies f_noapprove.
Conflicts:
phpBB/posting.php
|
| | | |
| | |
| | |
| | | |
PHPBB3-10880
|
| | |\ \
| | |/
| | |
| | |
| | | |
* develop-olympus:
[ticket/8743] Include poster´s name in mail notifications
|
| | | |\
| | | |
| | | |
| | | |
| | | | |
* nickvergessen/ticket/8743:
[ticket/8743] Include poster´s name in mail notifications
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-8743
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
* develop-olympus:
[ticket/10967] adding $root_path to posting_get_topic_icons
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10967
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
https://github.com/phpbb/phpbb3/pull/992#discussion_r2413976
PHPBB3-11103
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11103
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This is going to require you recreate the db tables.
PHPBB3-11103
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11103
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Do not use phpbb_container everywhere (makes testing difficult)
PHPBB3-11103
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Note: The user may be notified multiple times IF they use different
notification options. e.g They are subscribed to topics they have
bookmarked by a notification and subscribed to the topic by
an email notification. In this case, they would receive two notifications.
This occurs because we do not want to omit any more direct types of
notifications (if they want an email, they should _always_ get at least one
email).
PHPBB3-11103
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11103
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11103
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Also, bug fixes and cleanup
PHPBB3-11103
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Remove the formatted title function, plaintext is not needed since
email templates are used
Fix a number of bugs.
PHPBB3-11103
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fixing a number of bugs
PHPBB3-11103
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Use $phpbb_notifications instead of $notifications everywhere for
consistency and conflict prevention.
PHPBB3-11103
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This saves a lot of code in some areas (where the same data is sent, just
for different types)
Notifications for bookmarks
PHPBB3-11103
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This is needed for quote editing because we need to check if the users
are still all quoted or notify new quotes appropriately.
PHPBB3-11103
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11103
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11103
|
| |/ / /
| | |
| | |
| | | |
PHPBB3-11103
|
| |\ \ \ |
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-9550
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-9550
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-9550
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-9550
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Used by phpBB Gallery
PHPBB3-9550
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
Proper parameters are passed in search backend constructor in
functions_posting.php
PHPBB3-11052
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.
Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.
PHPBB3-10968
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
The default value should be kept, so we do not change the behaviour for MODs
and Extensions that use the function with its default values.
PHPBB3-10640
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
* develop-olympus:
[Ticket/10675] Correct language string ATTACH_DISK_FULL
[feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
[ticket/10675] Add disk full language string when posting attachments
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
* Dickyf/ticket/10675:
[Ticket/10675] Correct language string ATTACH_DISK_FULL
[ticket/10675] Add disk full language string when posting attachments
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Add language string visible by admins only for when the disk does not have
enough free space to upload attachments.
PHPBB3-10675
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* develop-olympus:
[ticket/10684] Adjust function and parameter name, minor changes.
[ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
[ticket/10684] Remove intval mapping for array keys
[ticket/10684] Adjust pm_notifications() to handle stale bans
[ticket/10684] Cast user_id to integer
[ticket/10684] Refactor $sql_ignore_users array update
[ticket/10684] Remove isset() for $sql_ignore_users update
[ticket/10684] Fix 2 typos in comment lines.
[ticket/10684] Send notifications for users with stale bans
Conflicts:
phpBB/includes/functions_user.php
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10684
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10684
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10684
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10684
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10684
|
| | |/ /
| | |
| | |
| | | |
PHPBB3-10684
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/8652] Comment for also updating forum watch table in user_notification.
[ticket/8652] Sending 2 emails on 2 replies
|
| | | |
| | |
| | |
| | | |
PHPBB3-8652
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is a fix for the problem of the system sending 2 emails when there are 2
replies to a topic where the user is subscribed in a topic and the forum that
contains the topic.
This simple fix seems to solve the problem. In simple tests I made it shows
it does.
PHPBB3-8652
|
| | |
| |
| |
| | |
PHPBB3-9916
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* nickvergessen/ticket/10484:
[ticket/10484] Use variables for sql_build_query() calls
Conflicts:
phpBB/includes/mcp/mcp_front.php
|