aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1964 from prototech/ticket/12136Andreas Fischer2014-02-151-4/+7
|\ | | | | | | | | | | | | [ticket/12136] Use new pagination class in generate_smilies(). * prototech/ticket/12136: [ticket/12136] Use new pagination class in generate_smilies().
| * [ticket/12136] Use new pagination class in generate_smilies().Cesar G2014-01-261-4/+7
| | | | | | | | PHPBB3-12136
* | Merge remote-tracking branch 'vinny/ticket/12134' into developCesar G2014-02-122-1/+2
|\ \ | | | | | | | | | | | | * vinny/ticket/12134: [ticket/12134] Add ucp_pm_viewmessage_print_head_append event to subsilver2
| * | [ticket/12134] Add ucp_pm_viewmessage_print_head_append event to subsilver2Marcus Vinicius2014-01-262-1/+2
| | | | | | | | | | | | PHPBB3-12134
* | | Merge remote-tracking branch 'vinny/ticket/12132' into developCesar G2014-02-122-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | * vinny/ticket/12132: [ticket/12132] Add the event to events.md doc [ticket/12132] Add viewtopic_print_head_append event to subsilver2
| * | | [ticket/12132] Add the event to events.md docMarcus Vinicius2014-01-261-0/+1
| | | | | | | | | | | | | | | | PHPBB3-12132
| * | | [ticket/12132] Add viewtopic_print_head_append event to subsilver2Marcus Vinicius2014-01-261-1/+1
| |/ / | | | | | | | | | PHPBB3-12132
* | | Merge remote-tracking branch 'bantu/ticket/12180' into developJoas Schilling2014-02-124-4/+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-104-4/+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-102-24/+31
| | | | | | | | | | | | | | | | PHPBB3-12169
* | | | [ticket/12169] Add new option to display profile fields on memberlistJoas Schilling2014-02-1015-7/+72
| | | | | | | | | | | | | | | | PHPBB3-12169
* | | | [ticket/12169] Allow displaying profile fields on memberlistJoas Schilling2014-02-106-15/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1023-48/+64
| | | | | | | | | | | | | | | | | | | | | | | | 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-0623-50/+18
| | | | | | | | | | | | | | | | PHPBB3-12115
* | | | [ticket/12115] Remove old language stringsJoas Schilling2014-02-061-2/+0
| | | | | | | | | | | | | | | | 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] Remove occupation field from html filesJoas Schilling2014-02-065-17/+0
| | | | | | | | | | | | | | | | PHPBB3-12115
* | | | [ticket/12115] Add language entries for the profile fieldsJoas Schilling2014-02-062-1/+26
| | | | | | | | | | | | | | | | PHPBB3-12115
* | | | [ticket/12115] Convert user occupation to a profile fieldJoas Schilling2014-02-0617-26/+176
|/ / / | | | | | | | | | PHPBB3-12115
* | | Merge branch 'prep-release-3.1.0-a3' into developJoas Schilling2014-02-057-30/+169
|\ \ \
| * | | [prep-release-3.1.0-a3] Update version to 3.1.0-a4-dev for future developmentJoas Schilling2014-02-052-2/+2
| | | |
| * | | [prep-release-3.1.0-a3] Commit changelog for 3.1.0-a3Joas Schilling2014-02-051-0/+106
| | | |
| * | | [prep-release-3.1.0-a3] Prepare ChangelogJoas Schilling2014-02-051-23/+26
| | | |
| * | | [prep-release-3.1.0-a3] Add migration for 3.1.0-a3Joas Schilling2014-02-051-0/+30
| | | |
| * | | [prep-release-3.1.0-a3] Update version to 3.1.0-a3Joas Schilling2014-02-055-7/+7
| | | |
* | | | Merge pull request #1995 from EXreaction/ticket/11880Nils Adermann2014-02-053-22/+113
|\ \ \ \ | |/ / / |/| | | 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-052-67/+11
| | | | | | | | | | | | | | | | PHPBB3-11880
| * | | [ticket/11880] Break up schema changes in the migratorNathan Guse2014-02-031-21/+86
| | | | | | | | | | | | | | | | PHPBB3-11880
* | | | [ticket/12163] Use posts_per_page to calculate current page in viewtopic.phpCesar G2014-02-041-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12163
* | | | [ticket/12159] Fix codesniffer complaints due to profilefields and passwordsMarc Alexander2014-02-035-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The two PRs regarding profilefields and passwords manager that were recently merged caused a few codesniffer complaints that are fixed by these changes. PHPBB3-12159
* | | | Merge pull request #1942 from nickvergessen/ticket/11996Nathan Guse2014-02-032-3/+33
|\ \ \ \ | |/ / / |/| | | [ticket/11996] Add explanation how to correctly remove and update an extension
| * | | [ticket/11996] Remove note until we really do disable the boardJoas Schilling2014-02-031-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11996
| * | | [ticket/11996] Use a table for better stylingJoas Schilling2014-01-132-14/+27
| | | | | | | | | | | | | | | | PHPBB3-11996
| * | | [ticket/11996] Add explanation how to correctly remove and update an extensionJoas Schilling2013-12-272-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=44001 for more information about the decision. PHPBB3-11996
* | | | [ticket/12156] Add missing passwords manager to oauthMarc Alexander2014-02-032-2/+12
| | | | | | | | | | | | | | | | PHPBB3-12156
* | | | [ticket/12154] Update schema files with lastest database schemaJoas Schilling2014-02-022-5/+5
| | | | | | | | | | | | | | | | PHPBB3-12154
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2014-02-021-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12146] Added a missing # to inline css-style of <span> Conflicts: phpBB/styles/prosilver/template/ucp_groups_manage.html
| * | | | [ticket/12146] Added a missing # to inline css-style of <span>Crizz02014-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12146
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into developNils Adermann2014-02-0240-1794/+2978
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-nickvergessen/ticket/11201: (50 commits) [ticket/11201] Remove empty calls section from .yml [ticket/11201] Split template file into multiple files [ticket/11201] Remove dependency from types on the manager [ticket/11201] Rename profilefields class to manager [ticket/11201] Fix parameter description [ticket/11201] Use !== null, its faster [ticket/11201] Also translate profile fields in UCP and ACP [ticket/11201] Add parameters and variables to profile field class [ticket/11201] Add commas on last array entry [ticket/11201] Allow translation of profile field name and explanation [ticket/11201] Fix some variable names [ticket/11201] Add tables to constructor in tests [ticket/11201] Add a method to return the translated full name of the type [ticket/11201] Remove db depending code from field class [ticket/11201] Add variables to classes and add constructor doc blocks [ticket/11201] Update copyright in class file [ticket/11201] Add visibility and remove unused variable [ticket/11201] Add some commas at the last array entry [ticket/11201] Cast some variables to integer [ticket/11201] Inject table names rather then using constants ... Conflicts: phpBB/config/services.yml
| * | | | | [ticket/11201] Remove empty calls section from .ymlJoas Schilling2014-02-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11201
| * | | | | [ticket/11201] Split template file into multiple filesJoas Schilling2014-02-028-33/+36
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11201