aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12236] Fix layout of memberlist searchJoas Schilling2014-03-052-34/+25
| | | | PHPBB3-12236
* [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-0540-134/+139
| | | | PHPBB3-12236
* [ticket/12237] Regenerate db schema filesJoas Schilling2014-03-057-14/+14
| | | | PHPBB3-12237
* [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-0530-69/+119
| | | | PHPBB3-12237
* [develop] Fix incorrect merge conflict resolution from PR #2085Nils Adermann2014-03-051-1/+1
| | | | PHPBB3-12235
* Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into developNils Adermann2014-03-0566-528/+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 fieldJoas Schilling2014-03-0434-239/+144
| | | | | | | | PHPBB3-12235
| * [ticket/12187] Do not make clickable when using as contact fieldJoas Schilling2014-03-046-28/+54
| | | | | | | | PHPBB3-12187
| * [ticket/12187] Split generate_profile_fields_template() into 2 methodsJoas Schilling2014-03-044-104/+104
| | | | | | | | | | | | Removing the mode switch that wraps the content of the method PHPBB3-12187
| * [ticket/12187] Remove user_website fieldJoas Schilling2014-03-049-8/+47
| | | | | | | | PHPBB3-12187
| * [ticket/12187] Remove user_website functionalityJoas Schilling2014-03-0329-86/+19
| | | | | | | | PHPBB3-12187
| * [ticket/12187] Convert website field data to custom profile fieldJoas Schilling2014-03-0310-4/+64
| | | | | | | | PHPBB3-12187
| * [ticket/12187] Add URL type for profile fieldsJoas Schilling2014-03-039-2/+105
| | | | | | | | PHPBB3-12187
| * [ticket/12234] Replace ICQ with custom profile fieldJoas Schilling2014-02-2840-117/+128
| | | | | | | | PHPBB3-12234
| * [ticket/12233] Update schema fileJoas Schilling2014-02-281-3/+3
| | | | | | | | PHPBB3-12233
| * [ticket/12233] Add images back to subsilver2Joas Schilling2014-02-281-1/+1
| | | | | | | | PHPBB3-12233
| * [ticket/12233] Allow profile fields to be contact fieldsJoas Schilling2014-02-2818-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/12226Nils Adermann2014-03-054-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 Schilling2014-02-241-6/+6
| | | | | | | | | | | | PHPBB3-12227
| * | [ticket/12226] Split language strings to correctly allow multiple plural rulesJoas Schilling2014-02-244-9/+14
| | | | | | | | | | | | PHPBB3-12226
* | | Merge pull request #2083 from hjpotter92/ticket/12245Andreas Fischer2014-03-031-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12245] Fix id attributes in acp_prune_users.html * hjpotter92/ticket/12245: [ticket/12245] Fix id attributes in acp_prune_users.html
| * | | [ticket/12245] Fix id attributes in acp_prune_users.htmlhjpotter922014-03-041-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 developJoas Schilling2014-03-021-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * vsephpbb/ticket/11645: [ticket/11645] Rename .MODs tab in ACP to Extensions
| * | | [ticket/11645] Rename .MODs tab in ACP to ExtensionsMatt Friedman2014-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-11645 PHPBB3-11645
* | | | Merge remote-tracking branch 'Crizz0/ticket/9255' into developCesar G2014-03-021-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-yCrizzo2014-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9255
| * | | | [ticket/9255] Added max-height and overflow-x to cp-mini in cp.cssCrizzo2014-03-021-0/+2
| |/ / / | | | | | | | | | | | | PHPBB3-9255
* | | | Merge remote-tracking branch 'Crizz0/ticket/12126' into developCesar G2014-03-023-11/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | * Crizz0/ticket/12126: [ticket/12126] deleted left:0 and right:0 in responsive.css .phpbb_alert [ticket/12126] left:0 and right: 0; admin.css --> width: auto [ticket/12126] Changed .phpbb_alert "max-width: 640px" to "width: 620px" [ticket/12126] Fixed position of alert box in IE
| * | | [ticket/12126] deleted left:0 and right:0 in responsive.css .phpbb_alertCrizzo2014-03-021-2/+0
| | | | | | | | | | | | | | | | PHPBB3-12126
| * | | [ticket/12126] left:0 and right: 0; admin.css --> width: autoCrizzo2014-03-022-3/+4
| | | | | | | | | | | | | | | | PHPBB3-12126
| * | | [ticket/12126] Changed .phpbb_alert "max-width: 640px" to "width: 620px"Crizzo2014-03-023-2/+3
| | | | | | | | | | | | | | | | PHPBB3-12126
| * | | [ticket/12126] Fixed position of alert box in IECrizz02014-03-022-8/+7
|/ / / | | | | | | | | | PHPBB3-12126
* | | Merge pull request #2065 from prototech/ticket/12232Nathan Guse2014-03-011-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 G2014-02-271-1/+2
| | | | | | | | | | | | | | | | PHPBB3-12232
| * | | [ticket/12232] Remove excessive calls to sizeof() in assign_block_vars() methodCesar G2014-02-271-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 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-14 20:08:12 +0000