aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* [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 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
* | | | | Merge remote-tracking branch 'Marc/ticket/12170' into developJoas Schilling2014-02-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/12170: [ticket/12170] Test for 12170 [ticket/12170] Assign schema keys in migration helper with data_depth 1
| * | | | | [ticket/12170] Assign schema keys in migration helper with data_depth 1Marc Alexander2014-02-071-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The migration helper currently drops any keys with schema changes that have the data_depth 1. This change will correctly assign the keys to the steps array without dropping the keys that might contain important info like the actual table that should be created. PHPBB3-12170
* | | | | [ticket/12115] Remove space from line endingJoas Schilling2014-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12115
* | | | | [ticket/12115] Add migration file to remove old user columnsJoas Schilling2014-02-061-0/+51
| | | | | | | | | | | | | | | | | | | | PHPBB3-12115
* | | | | [ticket/12115] Use base class to reduce duplicate codeJoas Schilling2014-02-063-252/+209
| | | | | | | | | | | | | | | | | | | | PHPBB3-12115
* | | | | [ticket/12115] Add a new migration for profilefield_interestsJoas Schilling2014-02-061-0/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this we avoid missing to copy one, when the admin already created a phpbb_* profile field. PHPBB3-12115
* | | | | [ticket/12115] Also port user interests to profile fieldsJoas Schilling2014-02-061-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-12115
* | | | | [ticket/12115] Add methods to interfaceJoas Schilling2014-02-061-2/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-12115
* | | | | [ticket/12115] Translate profile field name before displaying it in errorsJoas Schilling2014-02-067-14/+31
| | | | | | | | | | | | | | | | | | | | PHPBB3-12115
* | | | | [ticket/12115] Convert user occupation to a profile fieldJoas Schilling2014-02-061-0/+146
|/ / / / | | | | | | | | | | | | PHPBB3-12115
* | | | Merge branch 'prep-release-3.1.0-a3' into developJoas Schilling2014-02-051-0/+30
|\ \ \ \ | |/ / / |/| | |
| * | | [prep-release-3.1.0-a3] Add migration for 3.1.0-a3Joas Schilling2014-02-051-0/+30
| |/ /
* | | Merge pull request #1995 from EXreaction/ticket/11880Nils Adermann2014-02-052-22/+109
|\ \ \ | |/ / |/| | Schema changes can take too long and cause a timeout
| * | [ticket/11880] migration helper fileNathan Guse2014-02-051-0/+82
| | | | | | | | | | | | PHPBB3-11880
| * | [ticket/11880] Move get_schema_steps function to a migrator helper classNathan Guse2014-02-051-67/+7
| | | | | | | | | | | | PHPBB3-11880
| * | [ticket/11880] Break up schema changes in the migratorNathan Guse2014-02-031-21/+86
| |/ | | | | | | PHPBB3-11880