aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-1/+1
|\
| * Merge pull request #3127 from omniError/ticket/13323Joas Schilling2014-11-211-1/+1
| |\ | | | | | | | | | [ticket/13323] empty auth option in posting.php
| | * [ticket/13323] empty auth option in posting.phpomniError2014-11-101-1/+1
| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13323 PHPBB3-13323
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-213-3/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/memberlist_email.html
| * | Merge pull request #3108 from Elsensee/ticket/13284Joas Schilling2014-11-214-5/+5
| |\ \ | | | | | | | | | | | | [ticket/13284] Message body not included in email
| | * | [ticket/13284] Set message body in topic form too, so it will be sentOliver Schramm2014-11-041-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13284
| | * | [ticket/13284] Fix request name so users can cc themselvesOliver Schramm2014-11-043-4/+4
| | | | | | | | | | | | | | | | PHPBB3-13284
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #3068 from marc1706/ticket/13204Joas Schilling2014-11-211-1/+1
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13204] Tell user that password was incorrect when exceeding attempts
| | * | | [ticket/13204] Tell user that password was incorrect when exceeding attemptsMarc Alexander2014-11-021-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the end of the login method, the captcha was entered correctly and only the password was incorrect. Therefore, just tell the user that the password was incorrect. He will see that he still needs to enter a captcha. PHPBB3-13204
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-8/+32
|\ \ \ \ | |/ / /
| * | | Merge pull request #3064 from marc1706/ticket/13197Joas Schilling2014-11-211-8/+32
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13197] Also delete group avatar from users that have it set
| | * | | [ticket/13197] Fix tabbingMarc Alexander2014-11-091-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-13197
| | * | | [ticket/13197] Correctly format sql queryMarc Alexander2014-11-091-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13197
| | * | | [ticket/13197] Also delete group avatar from users that have it setMarc Alexander2014-10-251-7/+31
| | | | | | | | | | | | | | | | | | | | PHPBB3-13197
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/13316] Ensure Recaptcha image uses https when necessary.Cesar G2014-11-211-2/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-13316
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3144 from marc1706/ticket/13337Joas Schilling2014-11-211-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13337] Do not use SQL IN comparison with empty array
| | * | | | [ticket/13337] Allow empty array passed to sql_in_set()Marc Alexander2014-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is_array() will evaluate to true even if the array is just an empty array. Make sure we also expect an empty array passed to sql_in_set(). PHPBB3-13337
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-212-2/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/confirm_delete_body.html
| * | | | | Merge pull request #3044 from Elsensee/ticket/13100Joas Schilling2014-11-213-2/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13100] Display only confirmation buttons when deleting shadow topic
| | * | | | | [ticket/13100] Remove pointless variableOliver Schramm2014-11-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13100
| | * | | | | [ticket/13100] Display only confirmation buttons when deleting shadow topicOliver Schramm2014-10-203-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13100
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-4/+28
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3023 from Nicofuma/ticket/13133Joas Schilling2014-11-211-4/+28
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13133] Allow @vendor_name for includecss
| | * | | | | | [ticket/13133] Rename $ok variableTristan Darricau2014-11-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13133
| | * | | | | | [ticket/13133] Allow @vendor_name for includecssTristan Darricau2014-10-081-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13133
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-213-14/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #2765 from Elsensee/ticket/11863Joas Schilling2014-11-213-14/+23
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11863] Set require_activation to none if emails are disabled
| | * | | | | | | [ticket/11863] Display warning to user because of activation methodOliver Schramm2014-10-172-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11863
| | * | | | | | | [ticket/11863] Grey out unavailable activation methods when emails disabledOliver Schramm2014-10-173-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Further fall back to USER_ACTIVATION_DISABLE when emails are disabled but evaluate it at runtime. PHPBB3-11863
* | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-4/+39
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #3043 from rxu/ticket/13182Joas Schilling2014-11-211-4/+39
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13182] Add posting.php core event to allow modifying the message text
| | * | | | | | | | [ticket/13182] Add posting.php core event to allow modifying the message textrxu2014-11-221-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | posting.php core event to allow modifying the message before parsing would be needed for some extensions, like for adding topic title to the topic URL etc. Also removed 'delete' var from core.posting_modify_template_vars and core.modify_posting_parameters as it does not exist. PHPBB3-13182
* | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-212-1/+50
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3150 from omniError/ticket/13347Joas Schilling2014-11-212-1/+50
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13347] missing acp_forums template events Conflicts: phpBB/docs/events.md
| | * | | | | | | | | [ticket/13347] update event docsomniError2014-11-171-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13347
| | * | | | | | | | | [ticket/13347] fix CSomniError2014-11-171-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13347
| | * | | | | | | | | [ticket/13347] missing acp_forums template eventsomniError2014-11-171-0/+7
| | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13347
* | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-0/+16
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3131 from omniError/ticket/13328Joas Schilling2014-11-211-0/+16
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13328] add core.mcp_view_forum_modify_sql
| | * | | | | | | | | [ticket/13328] fix CSomniError2014-11-111-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13328 PHPBB3-13328
| | * | | | | | | | | [ticket/13328] add core.mcp_view_forum_modify_sqlomniError2014-11-101-0/+16
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13328 PHPBB3-13328
* | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-0/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3130 from omniError/ticket/13326Joas Schilling2014-11-211-0/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13326] add viewtopic_url to event
| | * | | | | | | | | [ticket/13326] fix CSomniError2014-11-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13326 PHPBB3-13326
| | * | | | | | | | | [ticket/13326] add viewtopic_url to eventomniError2014-11-101-0/+3
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13326 PHPBB3-13326
* | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-212-4/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/index_body.html
| * | | | | | | | | Merge pull request #3126 from VSEphpbb/ticket/13290Joas Schilling2014-11-213-4/+16
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13290] Add EVENT index_body_forumlist_body_after
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 06:08:39 +0000