Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ticket/12236] Fix language key name for Yahoo Messanger | Joas Schilling | 2014-03-06 | 1 | -1/+1 |
| | | | | PHPBB3-12236 | ||||
* | [ticket/12236] Change order of profile fields for new installs | Joas Schilling | 2014-03-05 | 1 | -4/+4 |
| | | | | PHPBB3-12236 | ||||
* | [ticket/12249] Fix "Undefined variable: row" when editing profile | Joas Schilling | 2014-03-05 | 1 | -1/+1 |
| | | | | PHPBB3-12249 | ||||
* | [ticket/12236] Fix layout of memberlist search | Joas Schilling | 2014-03-05 | 2 | -34/+25 |
| | | | | PHPBB3-12236 | ||||
* | [ticket/12236] Move AOL Instant Messanger field to custom profile field | Joas Schilling | 2014-03-05 | 39 | -133/+139 |
| | | | | PHPBB3-12236 | ||||
* | [ticket/12237] Regenerate db schema files | Joas Schilling | 2014-03-05 | 7 | -14/+14 |
| | | | | PHPBB3-12237 | ||||
* | [ticket/12237] Convert yahoo messanger to custom profile field | Joas Schilling | 2014-03-05 | 29 | -68/+119 |
| | | | | PHPBB3-12237 | ||||
* | [develop] Fix incorrect merge conflict resolution from PR #2085 | Nils Adermann | 2014-03-05 | 1 | -1/+1 |
| | | | | PHPBB3-12235 | ||||
* | Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into develop | Nils Adermann | 2014-03-05 | 65 | -525/+758 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-nickvergessen/ticket/12235: [ticket/12235] Convert WLM to custom profile field [ticket/12187] Do not make clickable when using as contact field [ticket/12187] Split generate_profile_fields_template() into 2 methods [ticket/12187] Remove user_website field [ticket/12187] Remove user_website functionality [ticket/12187] Convert website field data to custom profile field [ticket/12187] Add URL type for profile fields [ticket/12234] Replace ICQ with custom profile field [ticket/12233] Update schema file [ticket/12233] Add images back to subsilver2 [ticket/12233] Allow profile fields to be contact fields Conflicts: phpBB/adm/style/acp_prune_users.html | ||||
| * | [ticket/12235] Convert WLM to custom profile field | Joas Schilling | 2014-03-04 | 33 | -238/+144 |
| | | | | | | | | PHPBB3-12235 | ||||
| * | [ticket/12187] Do not make clickable when using as contact field | Joas Schilling | 2014-03-04 | 6 | -28/+54 |
| | | | | | | | | PHPBB3-12187 | ||||
| * | [ticket/12187] Split generate_profile_fields_template() into 2 methods | Joas Schilling | 2014-03-04 | 4 | -104/+104 |
| | | | | | | | | | | | | Removing the mode switch that wraps the content of the method PHPBB3-12187 | ||||
| * | [ticket/12187] Remove user_website field | Joas Schilling | 2014-03-04 | 9 | -8/+47 |
| | | | | | | | | PHPBB3-12187 | ||||
| * | [ticket/12187] Remove user_website functionality | Joas Schilling | 2014-03-03 | 28 | -85/+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 | 39 | -116/+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 #2057 from nickvergessen/ticket/12226 | Nils Adermann | 2014-03-05 | 4 | -9/+14 |
|\ \ | | | | | | | Ticket/12226 Split language strings to correctly allow multiple plural rules | ||||
| * | | [ticket/12227] "X from Y messages" should be "X out of Y messages" | Joas Schilling | 2014-02-24 | 1 | -6/+6 |
| | | | | | | | | | | | | PHPBB3-12227 | ||||
| * | | [ticket/12226] Split language strings to correctly allow multiple plural rules | Joas Schilling | 2014-02-24 | 4 | -9/+14 |
| | | | | | | | | | | | | PHPBB3-12226 | ||||
* | | | [ticket/12245] Fix id attributes in acp_prune_users.html | hjpotter92 | 2014-03-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | The following labels had invalid id references: 1. joined (renamed to link to joined_after) 2. group_id (create teh id attribute on select box) PHPBB3-12245 | ||||
* | | | Merge remote-tracking branch 'vsephpbb/ticket/11645' into develop | Joas Schilling | 2014-03-02 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | * vsephpbb/ticket/11645: [ticket/11645] Rename .MODs tab in ACP to Extensions | ||||
| * | | | [ticket/11645] Rename .MODs tab in ACP to Extensions | Matt Friedman | 2014-03-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-11645 PHPBB3-11645 | ||||
* | | | | Merge remote-tracking branch 'Crizz0/ticket/9255' into develop | Cesar G | 2014-03-02 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | * Crizz0/ticket/9255: [ticket/9255] Changed overflow-x to overflow-y [ticket/9255] Added max-height and overflow-x to cp-mini in cp.css | ||||
| * | | | | [ticket/9255] Changed overflow-x to overflow-y | Crizzo | 2014-03-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-9255 | ||||
| * | | | | [ticket/9255] Added max-height and overflow-x to cp-mini in cp.css | Crizzo | 2014-03-02 | 1 | -0/+2 |
| |/ / / | | | | | | | | | | | | | PHPBB3-9255 | ||||
* | | | | [ticket/12126] deleted left:0 and right:0 in responsive.css .phpbb_alert | Crizzo | 2014-03-02 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | PHPBB3-12126 | ||||
* | | | | [ticket/12126] left:0 and right: 0; admin.css --> width: auto | Crizzo | 2014-03-02 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | PHPBB3-12126 | ||||
* | | | | [ticket/12126] Changed .phpbb_alert "max-width: 640px" to "width: 620px" | Crizzo | 2014-03-02 | 3 | -2/+3 |
| | | | | | | | | | | | | | | | | PHPBB3-12126 | ||||
* | | | | [ticket/12126] Fixed position of alert box in IE | Crizz0 | 2014-03-02 | 2 | -8/+7 |
|/ / / | | | | | | | | | | PHPBB3-12126 | ||||
* | | | 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 | ||||
* | | | [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 | ||||
* | | [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 remote-tracking branch 'nickvergessen/ticket/12205' into ↵ | Joas Schilling | 2014-02-25 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
| | | | | | | | | 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. |