aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | [ticket/11201] Remove dependency from types on the managerJoas Schilling2014-02-026-86/+48
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Rename profilefields class to managerJoas Schilling2014-02-0213-33/+33
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Fix parameter descriptionJoas Schilling2014-02-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Use !== null, its fasterJoas Schilling2014-01-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Also translate profile fields in UCP and ACPJoas Schilling2014-01-191-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Add parameters and variables to profile field classJoas Schilling2014-01-191-1/+46
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Add commas on last array entryJoas Schilling2014-01-191-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Allow translation of profile field name and explanationJoas Schilling2014-01-192-5/+5
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Fix some variable namesJoas Schilling2014-01-182-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Add a method to return the translated full name of the typeJoas Schilling2014-01-1810-13/+28
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Remove db depending code from field classJoas Schilling2014-01-181-35/+4
| | | | | | | | | | | | | | | | | | | | | | | | sql_build_array() should already take care of that PHPBB3-11201
| * | | [ticket/11201] Add variables to classes and add constructor doc blocksJoas Schilling2014-01-187-0/+196
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Update copyright in class fileJoas Schilling2014-01-181-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Add visibility and remove unused variableJoas Schilling2014-01-181-2/+1
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Add some commas at the last array entryJoas Schilling2014-01-182-6/+6
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Cast some variables to integerJoas Schilling2014-01-182-9/+9
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Inject table names rather then using constantsJoas Schilling2014-01-184-10/+30
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Update schema files and unit testJoas Schilling2014-01-178-16/+16
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Change type from integer to service nameJoas Schilling2014-01-1712-34/+210
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Move custom template variable assignment to type classJoas Schilling2014-01-178-55/+89
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Move preparation of hidden fields to type classJoas Schilling2014-01-176-43/+106
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Allow manipulating the intended variables with the type classJoas Schilling2014-01-178-99/+180
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Move type specific error messages to type classJoas Schilling2014-01-175-9/+44
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Add abstract base class with shared methodsJoas Schilling2014-01-178-91/+59
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Move field type depending preparation of the options to classJoas Schilling2014-01-177-27/+63
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Move grabbing the input of the language options to type classJoas Schilling2014-01-168-27/+99
| | | | | | | | | | | | | | | | PHPBB3-11201
| * | | [ticket/11201] Move language option determination into type classJoas Schilling2014-01-158-26/+126
| | | | | | | | | | | | | | | | PHPBB3-11201