aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'rxu3/ticket/12222' into developJoas Schilling2014-03-012-2/+2
|\ | | | | | | | | * rxu3/ticket/12222: [ticket/12222] Replace hardoded comma with translatable separator
| * [ticket/12222] Replace hardoded comma with translatable separatorrxu2014-02-232-2/+2
| | | | | | | | | | | | | | Replace hardoded comma with translatable separator in forumlist_body.html. PHPBB3-12222
* | Merge remote-tracking branch 'prototech/ticket/12238' into developJoas Schilling2014-03-012-33/+0
|\ \ | | | | | | | | | | | | * prototech/ticket/12238: [ticket/12238] Remove defunct confirmation box template code.
| * | [ticket/12238] Remove defunct confirmation box template code.Cesar G2014-03-012-33/+0
| | | | | | | | | | | | | | | | | | Confirmation boxes are handled by confirm_body.html. PHPBB3-12238
* | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-012-5/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11509] Exit with the expected (non-zero) exit status on failure. [ticket/11509] Output which commit is being inspected. [ticket/11509] Three dots means sym. difference, but we only want new commits. Conflicts: .travis.yml
| * \ \ Merge remote-tracking branch 'bantu/ticket/11509' into develop-olympusJoas Schilling2014-03-012-5/+26
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11509: [ticket/11509] Exit with the expected (non-zero) exit status on failure. [ticket/11509] Output which commit is being inspected. [ticket/11509] Three dots means sym. difference, but we only want new commits.
| | * | | [ticket/11509] Exit with the expected (non-zero) exit status on failure.Andreas Fischer2014-02-211-3/+22
| | | | | | | | | | | | | | | | | | | | PHPBB3-11509
| | * | | [ticket/11509] Output which commit is being inspected.Andreas Fischer2014-02-211-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11509
| | * | | [ticket/11509] Three dots means sym. difference, but we only want new commits.Andreas Fischer2014-02-212-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11509
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-010-0/+0
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | * develop-olympus:
| * | | Merge pull request #2059 from nickvergessen/ticket/12205Nils Adermann2014-02-252-1/+43
| |\ \ \ | | | | | | | | | | [ticket/12205] Do not display 0 for empty integers when show_novalue is off
* | \ \ \ Merge pull request #2062 from nickvergessen/ticket/12194Nils Adermann2014-02-272-0/+46
|\ \ \ \ \ | | | | | | | | | | | | [ticket/12194] Ensure that field_show_novalue is present
| * | | | | [ticket/12194] Ensure that field_show_novalue is presentJoas Schilling2014-02-272-0/+46
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | The field was not created on boards that were 3.1-dev before 3.0.11 was relesed PHPBB3-12194
* | | | | Merge pull request #2060 from nickvergessen/ticket/12205-developNils Adermann2014-02-262-1/+43
|\ \ \ \ \ | |_|_|_|/ |/| | | | [ticket/12205-Develop] Do not display 0 for empty integers when show_novalue is off
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/12205' into ↵Joas Schilling2014-02-252-1/+43
| |\ \ \ \ |/ / / / / | | | _ / | | | / | | | | | | | | | | | | | | | | | | | | | | | | ticket/12205-develop * nickvergessen/ticket/12205: [ticket/12205] Do not display 0 for empty integers when show_novalue is off Conflicts: phpBB/includes/functions_profile_fields.php
| * | | [ticket/12205] Do not display 0 for empty integers when show_novalue is offJoas Schilling2014-02-252-1/+43
| |/ / | | | | | | | | | PHPBB3-12205
* | | Merge pull request #2053 from prototech/ticket/12220Andreas Fischer2014-02-211-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12220] Fix division by zero in search page with no results. * prototech/ticket/12220: [ticket/12220] Fix division by zero in search page with no results.
| * | | [ticket/12220] Fix division by zero in search page with no results.Cesar G2014-02-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The page url parameter no longer exists in the pagination.on_page() method, therefore the page url passed is being divided by 0 - the total number of items. Since PAGE_NUMBER is assigned in generate_template_pagination(), this separate assignment is no longer needed. PHPBB3-12220
* | | | Merge pull request #2035 from prototech/ticket/12138Nathan Guse2014-02-201-62/+130
|\ \ \ \ | | | | | | | | | | [ticket/12138] Include file time limit when generating attachment management pagination and stats.
| * | | | [ticket/12138] Replace old code and generate pagination using filetime limit.Cesar G2014-02-161-60/+22
| | | | | | | | | | | | | | | | | | | | PHPBB3-12138
| * | | | [ticket/12138] Add methods for attachment manage functionality.Cesar G2014-02-161-2/+108
| | | | | | | | | | | | | | | | | | | | PHPBB3-12138
* | | | | Merge pull request #1939 from prototech/ticket/12078Nathan Guse2014-02-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [ticket/12078] Check for f_delete when a user attempts to permanently delete a post.
| * | | | | [ticket/12078] Check for f_delete when a user attempts to permanently deleteCesar G2013-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12078
* | | | | | Merge pull request #2037 from prototech/ticket/12080Nathan Guse2014-02-204-6/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/12080] Fix color palettes when responsive.
| * | | | | | [ticket/12080] Stop responsive ACP sig textarea from dropping to second line.Cesar G2014-02-162-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12080
| * | | | | | [ticket/12080] Reduce the palette options in all locations when responsive.Cesar G2014-02-162-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12080
| * | | | | | [ticket/12080] Add classes to color palette table to identify it more easily.Cesar G2014-02-161-1/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-12080
* | | | | | Merge pull request #2025 from marc1706/ticket/12183Nathan Guse2014-02-2011-16/+191
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/12183] Update user_newpasswd column in users table for passwords manager
| * | | | | | [ticket/12183] Check if database columns were updated before changing themMarc Alexander2014-02-191-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12183
| * | | | | | [ticket/12183] Test that login with old password doesn't work after resetMarc Alexander2014-02-171-13/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12183
| * | | | | | [ticket/12183] Move user_newpasswd, user_actkey below user_pass_convertMarc Alexander2014-02-178-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12183
| * | | | | | [ticket/12183] Test activating new password after resetMarc Alexander2014-02-171-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12183
| * | | | | | [ticket/12183] Make sure to undo changes to config in forgot_password_testMarc Alexander2014-02-111-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The forgot_password_test disables the password reset functionalty but doesn't enable it again afterwards. PHPBB3-12183
| * | | | | | [ticket/12183] Add functional test for user password resetMarc Alexander2014-02-101-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12183
| * | | | | | [ticket/12183] Add migration file for updating user_newpasswd columnMarc Alexander2014-02-101-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12183
| * | | | | | [ticket/12183] Update user_newpasswd column to length of 255 in schema filesMarc Alexander2014-02-108-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12183
* | | | | | | Merge pull request #2021 from nickvergessen/ticket/12171Nathan Guse2014-02-206-35/+455
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Ticket/12171 Attachments from soft-deleted posts are still downloadable
| * | | | | | | [ticket/12171] Add functional tests for downloading attachmentsJoas Schilling2014-02-101-0/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12171
| * | | | | | | [ticket/12171] Add functionality to upload attachments to submit_post() methodJoas Schilling2014-02-101-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12171
| * | | | | | | [ticket/12171] Send correct status 403 when forbidden and 404 when not foundJoas Schilling2014-02-102-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12171
| * | | | | | | [ticket/12171] Check post visibility before being able to download attachmentsJoas Schilling2014-02-101-6/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12171
| * | | | | | | [ticket/12171] Split post and pm download linksJoas Schilling2014-02-103-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12171 PHPBB3-12172
| * | | | | | | [ticket/12171] Check topic visibility before allowing to download attachmentsJoas Schilling2014-02-102-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12171
* | | | | | | | Merge branch 'ticket/12139' into developNathan Guse2014-02-201-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/12139: [ticket/12139] Spaces $ show_guests viewonline.php
| * | | | | | | | [ticket/12139] Spaces $ show_guests viewonline.phpkaran2014-02-201-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12139
* | | | | | | | Merge pull request #2050 from rxu/ticket/12217Nathan Guse2014-02-203-1/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12217] Add more template events to viewtopic_body.html
| * | | | | | | | [ticket/12217] Add more template events to viewtopic_body.htmlrxu2014-02-213-1/+31
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add viewtopic template events before/after the posts, after the sorting options to allow adding contents to respective places (like advertisement and so on). PHPBB3-12217
* | | | | | | | Merge pull request #2044 from prototech/ticket/12212Nathan Guse2014-02-201-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12212] Encode the attachment file name before presenting to user.
| * | | | | | | | [ticket/12212] Encode the attachment file name before presenting to user.Cesar G2014-02-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The uploader inserts the file name directly into the page at the moment without handling any HTML special chars that may be in the name. This results in HTML that may be present getting rendered in error messages and the attachments list. This simply causes layout breakage for the user, since the backend takes care of sanitizing the name. Once phpBB returns the file data for the uploaded file, the name in the attachment list gets replaced by the one that phpBB provides. PHPBB3-12212
* | | | | | | | | Merge pull request #2049 from prototech/ticket/12200Nathan Guse2014-02-206-0/+26
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | [ticket/12200] Add missing profile field template files to adm/style/ directory.
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-18 19:26:06 +0000