| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
| |
PHPBB3-12594
|
| |
|
|
| |
PHPBB3-12526
|
| |
|
|
|
|
|
|
| |
This fixes a bug where a user A could not send a PM to user B when both users
allowed other users to send them a PM. More precisely, it fixes the selection
of users that either are inactive or have disabled private messages.
PHPBB3-12493
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |\ \
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-8323
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-8323
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-8323
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
have permission to read private messages
PHPBB3-8323
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* There MUST NOT be trailing whitespace at the end of lines.
* There MUST NOT be whitespace before the first content of a file.
* There MUST NOT be whitespace after the last content of a file.
* Functions MUST NOT contain multiple empty lines in a row.
PHPBB3-12458
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-12356
|
| | |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | | |
This commit is a highly-refactored and up-to-date version of Fyorl's work
which was part of his Google Summer of Code 2012 project "Attachment
Improvements".
PHPBB3-10929
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* develop-olympus:
[ticket/11144] Add missing {FORUM_NAME} variable
[ticket/11144] Add missing {FORUM_NAME} variable
Conflicts:
phpBB/download/file.php
phpBB/styles/prosilver/template/login_forum.html
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The template variable {FORUM_NAME} was missing from
the login page of a password protected forum
PHPBB3-11144
|
| |\ \ \ \
| |/ / /
| | | /
| |_|/
|/| | |
* develop-olympus:
[ticket/11233] prohibit selecting anonymous user as a PM recipient
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
While composing pm, it should not be allowed to add
anonymous user as a PM recipient
PHPBB3-11233
|
| | | |
| | |
| | |
| | | |
PHPBB3-10780
|
| |\ \ \
| |/ /
| | |
| | |
| | | |
* develop-olympus:
[ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
|
| | | |
| | |
| | |
| | | |
PHPBB3-10568
|
| | |/
|/|
| |
| | |
PHPBB3-10990
|
| | |
| |
| |
| | |
PHPBB3-9916
|
| | |
| |
| |
| |
| |
| |
| | |
I added two function avatar_explanation_string() and avatar_error_wrong_size()
for easier handling of the "pixels"-languages, as they are used quite often.
PHPBB3-10345
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/10158] Remove some code duplication from generating the message.
[ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
[ticket/10158] Only view "Return to" links if they are useful.
[ticket/10158] Add return-link to folder, when the user replied from a folder.
[ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
|
| | |
| |
| |
| | |
PHPBB3-10158
|
| | |
| |
| |
| | |
PHPBB3-10158
|
| | |
| |
| |
| | |
PHPBB3-10158
|
| | |
| |
| |
| | |
PHPBB3-10158
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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-9716
|
| |
|
|
|
|
| |
BBCodes are not allowed.
PHPBB3-8894
|
| |
|
|
|
|
|
|
| |
Authorised by: bantu
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10325 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
| |
break other things" way, usually the fix would be using !$submit here
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10251 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
| |
quote/forward PM) - still not entirely sure if this will break things, but the correct uid should also be assigned if there is an error triggered somewhere, this does not change the content or the actions assigned.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10208 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
|
|
| |
introduced in #48265
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10186 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
|
|
| |
submission on ENTER keypress on forms using more than one. Prosilver uses this for the posting page(s) and registration screen.
(we further test this at phpbb.com)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10069 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
| |
Style changes by dhn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9919 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
|
|
|
| |
after deleting attachments - Patch by WorldWar and nickvergessen
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9843 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
| |
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9725 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
| |
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9685 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
| |
external applications on pm'ing
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9494 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9456 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
| |
#42615
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9365 89ea8834-ac86-4346-8a33-228a782c2dd0
|