aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #2089 from nickvergessen/ticket/12251Nathan Guse2014-03-097-18/+49
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12251] Clean up and Enhancement of Custom Profile Fields
| * | | | | | | | [ticket/12251] Remove leading whitespace on doc blocksJoas Schilling2014-03-096-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12251
| * | | | | | | | [ticket/12251] Add string validation for a-zA-Z0-9 and underscoreJoas Schilling2014-03-061-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12251
| * | | | | | | | [ticket/12251] Load profile fields by default on posts, pms and memberlistJoas Schilling2014-03-061-0/+30
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12251
* | | | | | | | Merge pull request #2099 from bantu/ticket/12256Nathan Guse2014-03-091-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | [ticket/12256] Selecting founders is fetching $sql instead of $result
| * | | | | | | [ticket/12256] Selecting founders is fetching $sql instead of $resultForumhulp.com2014-03-091-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-12256
* | | | | | | Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10945-develop' into ↵Nathan Guse2014-03-091-23/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop * remotes/dhruvgoel92/ticket/10945-develop: [ticket/10945] Remove mark test incomplete for native search backend [ticket/10945] Fix Unit Tests as per new changes to split_keywords [ticket/10945] Remove mark test incomplete for mysql and postgres [ticket/10945] Fix return values for split_keywords function [ticket/10945] Display search query when search fails in native search [ticket/10945] remove trigger_error call
| * | | | | | | Merge branch 'ticket/10945' into ticket/10945-developDhruv2014-03-081-23/+10
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/10945: [ticket/10945] Fix return values for split_keywords function [ticket/10945] Display search query when search fails in native search [ticket/10945] remove trigger_error call Conflicts: phpBB/phpbb/search/fulltext_native.php
* | | | | | | [ticket/11938] Fix whitespace charactersDhruv2014-03-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11938
* | | | | | | [ticket/11938] use sql_attr_string instead of sql_attr_str2ordinalDhruv2014-03-091-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11938
* | | | | | Merge pull request #2088 from nickvergessen/ticket/12236Nathan Guse2014-03-055-1/+197
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ticket/12236 Convert AOL and Yahoo to custom profile fields
| * | | | | | [ticket/12249] Fix "Undefined variable: row" when editing profileJoas Schilling2014-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12249
| * | | | | | [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-052-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12236
| * | | | | | [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-052-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12237
* | | | | | | Merge pull request #2058 from nickvergessen/ticket/12216Nathan Guse2014-03-051-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/12216] Undefined index: lang_options when creating date profile field
| * | | | | | | [ticket/12216] Undefined index: lang_options when creating date profile fieldJoas Schilling2014-02-241-0/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-12216
* | | | | | | Merge pull request #2075 from Elsensee/ticket/11693Nathan Guse2014-03-051-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | [ticket/11693] Change sql_build_array to support DELETE
| * | | | | | [ticket/11693] Change sql_build_array to support DELETEOliver Schramm2014-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11693
* | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into developNils Adermann2014-03-0514-77/+550
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-042-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12235
| * | | | | | [ticket/12187] Do not make clickable when using as contact fieldJoas Schilling2014-03-045-27/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12187
| * | | | | | [ticket/12187] Split generate_profile_fields_template() into 2 methodsJoas Schilling2014-03-041-96/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the mode switch that wraps the content of the method PHPBB3-12187
| * | | | | | [ticket/12187] Remove user_website fieldJoas Schilling2014-03-041-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12187
| * | | | | | [ticket/12187] Convert website field data to custom profile fieldJoas Schilling2014-03-031-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12187
| * | | | | | [ticket/12187] Add URL type for profile fieldsJoas Schilling2014-03-033-2/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12187
| * | | | | | [ticket/12234] Replace ICQ with custom profile fieldJoas Schilling2014-02-282-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12234
| * | | | | | [ticket/12233] Allow profile fields to be contact fieldsJoas Schilling2014-02-282-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | [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
* | | | | | [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 remote-tracking branch 'nickvergessen/ticket/12205' into ↵Joas Schilling2014-02-251-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
* | | | | Merge pull request #2025 from marc1706/ticket/12183Nathan Guse2014-02-201-0/+40
|\ \ \ \ \ | |_|_|_|/ |/| | | | [ticket/12183] Update user_newpasswd column in users table for passwords manager
| * | | | [ticket/12183] Add migration file for updating user_newpasswd columnMarc Alexander2014-02-101-0/+40
| | | | | | | | | | | | | | | | | | | | PHPBB3-12183
* | | | | Merge pull request #1994 from prototech/ticket/12158Nathan Guse2014-02-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [ticket/12158] The pagination start value should be 0 when there are no items.
| * | | | | [ticket/12158] The pagination start value should be 0 when there are no items.Cesar G2014-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12158
* | | | | | Merge pull request #2002 from prototech/ticket/12153Nathan Guse2014-02-181-99/+88
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination()
| * | | | | | [ticket/12153] Remove duplicate assignment of $u_previous_page & $u_next_page.Cesar G2014-02-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12153
| * | | | | | [ticket/12153] Remove vars already assigned in generate_template_pagination().Cesar G2014-02-031-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12153
| * | | | | | [ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination()Cesar G2014-02-031-89/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12153
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2014-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12210] dbtools::sql_create_table incorrectly throws error related to auto-increment length on non auto-increment fields
* | | | | | | Merge pull request #2008 from marc1706/ticket/12167Nathan Guse2014-02-181-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/12167] Allow users to change style via style parameter by default
| * | | | | | | [ticket/12167] Allow users to change style via style parameter by defaultMarc Alexander2014-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will enable users that don't have the a_styles permission to preview styles using the style parameter. Using this, they will be able to use extensions that are or incorporate stylechangers. PHPBB3-12167
* | | | | | | | [ticket/12192] Fix call to undefined method get_user_avatar().Cesar G2014-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12192
* | | | | | | | Merge remote-tracking branch 'bantu/ticket/12180' into developJoas Schilling2014-02-123-3/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/12180: [ticket/12180] Add "Each file MUST end with exactly one newline character" rule
| * | | | | | | | [ticket/12180] Add "Each file MUST end with exactly one newline character" ruleAndreas Fischer2014-02-103-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12180
* | | | | | | | | [ticket/12184] Fix undefined variable tpl_fields in profile field managerJoas Schilling2014-02-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12184
* | | | | | | | | [ticket/12169] Split mode==headline into it's own functionJoas Schilling2014-02-101-23/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12169
* | | | | | | | | [ticket/12169] Add new option to display profile fields on memberlistJoas Schilling2014-02-102-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12169
* | | | | | | | | [ticket/12169] Allow displaying profile fields on memberlistJoas Schilling2014-02-101-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can not sort by profile field values atm. And also I'm not sure whether this is possible at all. PHPBB3-12169
* | | | | | | | | [ticket/12169] Convert user_from to profile field locationJoas Schilling2014-02-102-1/+48
| |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing changes on memberlist view due to missing functionality PHPBB3-12169