Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ticket/12187] Remove user_website functionality | Joas Schilling | 2014-03-03 | 29 | -86/+19 |
| | | | | PHPBB3-12187 | ||||
* | [ticket/12187] Convert website field data to custom profile field | Joas Schilling | 2014-03-03 | 10 | -4/+64 |
| | | | | PHPBB3-12187 | ||||
* | [ticket/12187] Add URL type for profile fields | Joas Schilling | 2014-03-03 | 9 | -2/+105 |
| | | | | PHPBB3-12187 | ||||
* | [ticket/12234] Replace ICQ with custom profile field | Joas Schilling | 2014-02-28 | 40 | -117/+128 |
| | | | | PHPBB3-12234 | ||||
* | [ticket/12233] Update schema file | Joas Schilling | 2014-02-28 | 1 | -3/+3 |
| | | | | PHPBB3-12233 | ||||
* | [ticket/12233] Add images back to subsilver2 | Joas Schilling | 2014-02-28 | 1 | -1/+1 |
| | | | | PHPBB3-12233 | ||||
* | [ticket/12233] Allow profile fields to be contact fields | Joas Schilling | 2014-02-28 | 18 | -13/+166 |
| | | | | | | | | Contact fields are displayed with in the contact section of the user profile and are displayed differently in the mini profile next to posts and private messages PHPBB3-12233 | ||||
* | Merge pull request #2062 from nickvergessen/ticket/12194 | Nils Adermann | 2014-02-27 | 2 | -0/+46 |
|\ | | | | | [ticket/12194] Ensure that field_show_novalue is present | ||||
| * | [ticket/12194] Ensure that field_show_novalue is present | Joas Schilling | 2014-02-27 | 2 | -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-develop | Nils Adermann | 2014-02-26 | 2 | -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 Schilling | 2014-02-25 | 2 | -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 off | Joas Schilling | 2014-02-25 | 2 | -1/+43 |
| | | | | | | | | PHPBB3-12205 | ||||
* | | Merge pull request #2053 from prototech/ticket/12220 | Andreas Fischer | 2014-02-21 | 1 | -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 G | 2014-02-21 | 1 | -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/12138 | Nathan Guse | 2014-02-20 | 1 | -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 G | 2014-02-16 | 1 | -60/+22 |
| | | | | | | | | | | | | | | | | PHPBB3-12138 | ||||
| * | | | [ticket/12138] Add methods for attachment manage functionality. | Cesar G | 2014-02-16 | 1 | -2/+108 |
| | | | | | | | | | | | | | | | | PHPBB3-12138 | ||||
* | | | | Merge pull request #1939 from prototech/ticket/12078 | Nathan Guse | 2014-02-20 | 1 | -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 delete | Cesar G | 2013-12-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-12078 | ||||
* | | | | | Merge pull request #2037 from prototech/ticket/12080 | Nathan Guse | 2014-02-20 | 4 | -6/+23 |
|\ \ \ \ \ | | | | | | | | | | | | | [ticket/12080] Fix color palettes when responsive. | ||||
| * | | | | | [ticket/12080] Stop responsive ACP sig textarea from dropping to second line. | Cesar G | 2014-02-16 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12080 | ||||
| * | | | | | [ticket/12080] Reduce the palette options in all locations when responsive. | Cesar G | 2014-02-16 | 2 | -4/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12080 | ||||
| * | | | | | [ticket/12080] Add classes to color palette table to identify it more easily. | Cesar G | 2014-02-16 | 1 | -1/+2 |
| | |/ / / | |/| | | | | | | | | | | | | | PHPBB3-12080 | ||||
* | | | | | Merge pull request #2025 from marc1706/ticket/12183 | Nathan Guse | 2014-02-20 | 11 | -16/+191 |
|\ \ \ \ \ | | | | | | | | | | | | | [ticket/12183] Update user_newpasswd column in users table for passwords manager | ||||
| * | | | | | [ticket/12183] Check if database columns were updated before changing them | Marc Alexander | 2014-02-19 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12183 | ||||
| * | | | | | [ticket/12183] Test that login with old password doesn't work after reset | Marc Alexander | 2014-02-17 | 1 | -13/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12183 | ||||
| * | | | | | [ticket/12183] Move user_newpasswd, user_actkey below user_pass_convert | Marc Alexander | 2014-02-17 | 8 | -16/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12183 | ||||
| * | | | | | [ticket/12183] Test activating new password after reset | Marc Alexander | 2014-02-17 | 1 | -1/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12183 | ||||
| * | | | | | [ticket/12183] Make sure to undo changes to config in forgot_password_test | Marc Alexander | 2014-02-11 | 1 | -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 reset | Marc Alexander | 2014-02-10 | 1 | -0/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12183 | ||||
| * | | | | | [ticket/12183] Add migration file for updating user_newpasswd column | Marc Alexander | 2014-02-10 | 1 | -0/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12183 | ||||
| * | | | | | [ticket/12183] Update user_newpasswd column to length of 255 in schema files | Marc Alexander | 2014-02-10 | 8 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12183 | ||||
* | | | | | | Merge pull request #2021 from nickvergessen/ticket/12171 | Nathan Guse | 2014-02-20 | 6 | -35/+455 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Ticket/12171 Attachments from soft-deleted posts are still downloadable | ||||
| * | | | | | | [ticket/12171] Add functional tests for downloading attachments | Joas Schilling | 2014-02-10 | 1 | -0/+345 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12171 | ||||
| * | | | | | | [ticket/12171] Add functionality to upload attachments to submit_post() method | Joas Schilling | 2014-02-10 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12171 | ||||
| * | | | | | | [ticket/12171] Send correct status 403 when forbidden and 404 when not found | Joas Schilling | 2014-02-10 | 2 | -7/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12171 | ||||
| * | | | | | | [ticket/12171] Check post visibility before being able to download attachments | Joas Schilling | 2014-02-10 | 1 | -6/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12171 | ||||
| * | | | | | | [ticket/12171] Split post and pm download links | Joas Schilling | 2014-02-10 | 3 | -20/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12171 PHPBB3-12172 | ||||
| * | | | | | | [ticket/12171] Check topic visibility before allowing to download attachments | Joas Schilling | 2014-02-10 | 2 | -8/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12171 | ||||
* | | | | | | | Merge branch 'ticket/12139' into develop | Nathan Guse | 2014-02-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/12139: [ticket/12139] Spaces $ show_guests viewonline.php | ||||
| * | | | | | | | [ticket/12139] Spaces $ show_guests viewonline.php | karan | 2014-02-20 | 1 | -1/+1 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12139 | ||||
* | | | | | | | Merge pull request #2050 from rxu/ticket/12217 | Nathan Guse | 2014-02-20 | 3 | -1/+31 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [ticket/12217] Add more template events to viewtopic_body.html | ||||
| * | | | | | | | [ticket/12217] Add more template events to viewtopic_body.html | rxu | 2014-02-21 | 3 | -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/12212 | Nathan Guse | 2014-02-20 | 1 | -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 G | 2014-02-18 | 1 | -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/12200 | Nathan Guse | 2014-02-20 | 6 | -0/+26 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | [ticket/12200] Add missing profile field template files to adm/style/ directory. | ||||
| * | | | | | | | [ticket/12200] Add missing profile field template files to adm/style/ directory | Cesar G | 2014-02-19 | 6 | -0/+26 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12200 | ||||
* | | | | | | | Merge pull request #2047 from prototech/ticket/12153 | Nathan Guse | 2014-02-19 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [ticket/12153] Replace old template variables with {PAGE_NUMBER}. | ||||
| * | | | | | | | [ticket/12153] Replace old template variables with {PAGE_NUMBER}. | Cesar G | 2014-02-19 | 2 | -2/+2 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12153 | ||||
* | | | | | | | Merge pull request #2030 from rxu/ticket/12190 | Nathan Guse | 2014-02-19 | 1 | -0/+16 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add core event "core.modify_submit_post_data" |