Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ticket/8785] Adds blank lines at file end | Crizzo | 2014-03-09 | 2 | -2/+2 |
| | | | | PHPBB3-8785 | ||||
* | [ticket/8785] Adds a new optical improvement, new file and fixes html bugs | Crizzo | 2014-03-09 | 4 | -93/+105 |
| | | | | PHPBB3-8785 | ||||
* | [ticket/8785] Adds two <hr /> to seperate recipients and BCC | Crizzo | 2014-03-04 | 1 | -1/+2 |
| | | | | PHPBB3-8785 | ||||
* | [ticket/8785] Scrollbar to Reciepients and BCC with max-height: 200px | Crizzo | 2014-03-03 | 1 | -0/+2 |
| | | | | PHPBB3-8785 | ||||
* | [ticket/8785] Little spaces mistake | Crizzo | 2014-03-03 | 1 | -1/+1 |
| | | | | PHPBB3-8785 | ||||
* | [ticket/8785] Rebuilding posting_editor pm head + new language vars | Crizzo | 2014-03-03 | 3 | -36/+69 |
| | | | | PHPBB3-8785 | ||||
* | Merge pull request #2065 from prototech/ticket/12232 | Nathan Guse | 2014-03-01 | 1 | -2/+4 |
|\ | | | | | [ticket/12232] Remove excessive calls to sizeof() in assign_block_vars() method. | ||||
| * | [ticket/12232] Fix a similar excessive pattern in the method. | Cesar G | 2014-02-27 | 1 | -1/+2 |
| | | | | | | | | PHPBB3-12232 | ||||
| * | [ticket/12232] Remove excessive calls to sizeof() in assign_block_vars() method | Cesar G | 2014-02-27 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | The size of the template block array is calculated within a foreach loop iterating through the array, which is unnecessary. It only needs to be done once. In a block of 1000 rows, this results in 500,500 calls to sizeof() in this location. With this change, that's reduced to 1000. PHPBB3-12232 | ||||
* | | Merge remote-tracking branch 'rxu3/ticket/12222' into develop | Joas Schilling | 2014-03-01 | 2 | -2/+2 |
|\ \ | | | | | | | | | | | | | * rxu3/ticket/12222: [ticket/12222] Replace hardoded comma with translatable separator | ||||
| * | | [ticket/12222] Replace hardoded comma with translatable separator | rxu | 2014-02-23 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | Replace hardoded comma with translatable separator in forumlist_body.html. PHPBB3-12222 | ||||
* | | | Merge remote-tracking branch 'prototech/ticket/12238' into develop | Joas Schilling | 2014-03-01 | 2 | -33/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | * prototech/ticket/12238: [ticket/12238] Remove defunct confirmation box template code. | ||||
| * | | | [ticket/12238] Remove defunct confirmation box template code. | Cesar G | 2014-03-01 | 2 | -33/+0 |
| | |/ | |/| | | | | | | | | | | | | | Confirmation boxes are handled by confirm_body.html. PHPBB3-12238 | ||||
* | | | Merge branch 'develop-olympus' into develop | Joas Schilling | 2014-03-01 | 2 | -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-olympus | Joas Schilling | 2014-03-01 | 2 | -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 Fischer | 2014-02-21 | 1 | -3/+22 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-11509 | ||||
| | * | | | [ticket/11509] Output which commit is being inspected. | Andreas Fischer | 2014-02-21 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-11509 | ||||
| | * | | | [ticket/11509] Three dots means sym. difference, but we only want new commits. | Andreas Fischer | 2014-02-21 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-11509 | ||||
* | | | | | Merge branch 'develop-olympus' into develop | Joas Schilling | 2014-03-01 | 0 | -0/+0 |
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | * develop-olympus: | ||||
| * | | | Merge pull request #2059 from nickvergessen/ticket/12205 | Nils Adermann | 2014-02-25 | 2 | -1/+43 |
| |\ \ \ | | | | | | | | | | | [ticket/12205] Do not display 0 for empty integers when show_novalue is off | ||||
* | \ \ \ | 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 |