| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
| |
PHPBB3-12431
|
| |
|
|
| |
PHPBB3-12431
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
develop-ascraeus
* github-prototech/ticket/11508:
[ticket/11508] Fix build_url test.
[ticket/11508] Add functional test for jumpbox.
[ticket/11508] Use $phpbb_path_helper.
[ticket/11508] Allow equal sign in parameter value.
[ticket/11508] Remove unnecessary implode.
[ticket/11508] Remove unnecessary isset check.
[ticket/11508] Fix build_url test.
[ticket/11508] Curly brace should be on its own line...
[ticket/11508] The question mark is expected even if there are no parameters.
[ticket/11508] Add tests.
[ticket/11508] Do not add the '?' unless there are parameters.
[ticket/11508] Change separator parameter to a simple true|false $is_amp.
[ticket/11508] Move helper functions to path_helper class.
[ticket/11508] Move the stripping param code to separate function as well.
[ticket/11508] Build the jumpbox hidden fields using the _form action_
[ticket/11508] Split parts of build_url() into reusable functions.
|
| | |
| |
| |
| | |
PHPBB3-11508
|
| | |
| |
| |
| | |
PHPBB3-11508
|
| | |
| |
| |
| | |
PHPBB3-11508
|
| | |
| |
| |
| | |
PHPBB3-11508
|
| | |
| |
| |
| | |
PHPBB3-11508
|
| | |
| |
| |
| | |
PHPBB3-11508
|
| | |
| |
| |
| | |
PHPBB3-11508
|
| | |
| |
| |
| | |
PHPBB3-11508
|
| | |
| |
| |
| | |
PHPBB3-11508
|
| | |
| |
| |
| | |
PHPBB3-11508
|
| | |
| |
| |
| | |
PHPBB3-11508
|
| | |
| |
| |
| | |
PHPBB3-11508
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
develop-ascraeus
* github-exreaction/ticket/8323:
[ticket/8323] Cache auth request
[ticket/8323] Combine into a single query
[ticket/8323] Comments on phpbb_get_banned_user_ids input for test
[ticket/8323] More readability in test case
[ticket/8323] Comments
[ticket/8323] dataProvider for the test; better test data
[ticket/8323] Comments
[ticket/8323] Unit test for phpbb_get_banned_user_ids
[ticket/8323] Comments for inactive reasons in constants.php
[ticket/8323] Only disable administrative deactivated accounts from receiving PMs
[ticket/8323] Allow temporarily banned users to receive PMs, but not a notification
[ticket/8323] Correct PM notification settings (only notify those who can receive them)
[ticket/8323] Cleanup viewtopic code (not sure how this mess happened)
[ticket/8323] Allow sending PMs to temporarily banned users
[ticket/8323] Do not allow sending PMs to Inactive users
[ticket/8323] Hide the Send PM link if users cannot receive the PM
[ticket/8323] Correcting the comment
[ticket/8323] Do not allow sending of Private Messages to users who are banned
[ticket/8323] Remove code used for testing
[ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages
Conflicts:
phpBB/language/en/ucp.php
|
| | | |
| | |
| | |
| | | |
PHPBB3-8323
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
# By Joas Schilling (613) and others
# Via Andreas Fischer (214) and others
* 'develop' of github.com:phpbb/phpbb3: (2494 commits)
[ticket/11825] Move schema_data.php into includes/ instead of phpbb/
[ticket/11215] Remove unnecessary comment
[ticket/11755] MySQL upgrader out of date
[prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
[prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
[ticket/11823] Set up nginx server to match PHP files with characters after .php
[ticket/11812] Fix empty define
[ticket/11818] Update Symfony dependencies to 2.3.*
[ticket/11791] Load adm/ events from styles/adm/event/
[ticket/11215] Fix helper_url_test.php tests
[ticket/11215] Add newline back to .htaccess, fix wording
[ticket/11215] Update comment in .htaccess
[ticket/11215] Uncomment rewrite rules in .htaccess
[ticket/11215] Make controller helper url() method use correct format
[ticket/11215] Add commented-out URL rewrite capability to .htaccess
[ticket/11821] Fix comma usage next to "You are receiving this notification".
[ticket/11769] Allow using 0 as poster name
[ticket/11769] Allow '0' as username
[ticket/11215] Use new URL structure for controllers
[ticket/11215] Everything appears to be working...
...
Conflicts:
phpBB/includes/functions_privmsgs.php
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-8323
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-8323
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-8323
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Copied from language output
PHPBB3-8323
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
phpBB/viewtopic.php
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
receiving PMs
Allow other types of inactive accounts to receive PMs. Remove the banned PM error message and use the string saying they do not have permission (less translation)
PHPBB3-8323
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
notification
PHPBB3-8323
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
receive them)
Also correcting the way it was setup for users to be able to receive PMs (do not allow administrators/moderators to send to banned, inactive, or non-standard users, that just doesn't make sense)
PHPBB3-8323
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-8323
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Added an argument to the phpbb_get_banned_user_ids() function to allow specifying a banned end time (default true for current functionality, false for only permanent bans, timestamp to find banned until a specified time)
PHPBB3-8323
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-8323
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Updated memberlist/viewtopic to the new rules
PHPBB3-8323
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-8323
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-8323
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-8323
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
have permission to read private messages
PHPBB3-8323
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* develop-olympus:
[ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-12468
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
develop-olympus
* github-marc1706/ticket/8960-olympus:
[ticket/8960] Allow changing avatar path if it's not writable
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
[ticket/12186] Move PM reports below post reports while installing
* n-aleha/ticket/12186:
[ticket/12186] Move PM reports below post reports while installing
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
"Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympus"
This reverts commit e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0, reversing
changes made to 214f515e9ccc71e368882384fb38bd7135b0e40f.
PHPBB3-12413
|
| |\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | | |
[ticket/12413] Fatal Error log created for feed.php file
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
PHPBB3-12413
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
PHPBB3-12413
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
PHPBB3-12413
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
PHPBB3-12413
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
https://tracker.phpbb.com/browse/PHPBB3-12413
http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=45475
PHPBB3-12413
|
| |\ \ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
* exreaction/ticket/11881:
[ticket/11881] Move convert_timezones_test to migrator
[ticket/11881] Fix test filename
[ticket/11881] Limit to 500
[ticket/11881] Make sure user_timezone isn't converted twice
[ticket/11881] Better split the timezone conversion into chunks; add test
[ticket/11881] Timezone migration can take a long time
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-11881
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-11881
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-11881
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
PHPBB3-11881
|