aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2002 from prototech/ticket/12153Nathan Guse2014-02-181-99/+88
|\
| * [ticket/12153] Remove duplicate assignment of $u_previous_page & $u_next_page.Cesar G2014-02-181-1/+0
| * [ticket/12153] Remove vars already assigned in generate_template_pagination().Cesar G2014-02-031-11/+2
| * [ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination()Cesar G2014-02-031-89/+88
* | Merge branch 'develop-olympus' into developNils Adermann2014-02-181-1/+1
* | Merge pull request #2008 from marc1706/ticket/12167Nathan Guse2014-02-181-1/+1
|\ \
| * | [ticket/12167] Allow users to change style via style parameter by defaultMarc Alexander2014-02-061-1/+1
* | | [ticket/12192] Fix call to undefined method get_user_avatar().Cesar G2014-02-141-1/+1
* | | Merge remote-tracking branch 'bantu/ticket/12180' into developJoas Schilling2014-02-123-3/+1
|\ \ \
| * | | [ticket/12180] Add "Each file MUST end with exactly one newline character" ruleAndreas Fischer2014-02-103-3/+1
* | | | [ticket/12184] Fix undefined variable tpl_fields in profile field managerJoas Schilling2014-02-111-0/+2
* | | | [ticket/12169] Split mode==headline into it's own functionJoas Schilling2014-02-101-23/+30
* | | | [ticket/12169] Add new option to display profile fields on memberlistJoas Schilling2014-02-102-0/+48
* | | | [ticket/12169] Allow displaying profile fields on memberlistJoas Schilling2014-02-101-2/+28
* | | | [ticket/12169] Convert user_from to profile field locationJoas Schilling2014-02-102-1/+48
* | | | Merge remote-tracking branch 'Marc/ticket/12170' into developJoas Schilling2014-02-101-1/+1
|\ \ \ \
| * | | | [ticket/12170] Assign schema keys in migration helper with data_depth 1Marc Alexander2014-02-071-1/+1
| |/ / /
* | | | [ticket/12115] Remove space from line endingJoas Schilling2014-02-061-1/+1
* | | | [ticket/12115] Add migration file to remove old user columnsJoas Schilling2014-02-061-0/+51
* | | | [ticket/12115] Use base class to reduce duplicate codeJoas Schilling2014-02-063-252/+209
* | | | [ticket/12115] Add a new migration for profilefield_interestsJoas Schilling2014-02-061-0/+146
* | | | [ticket/12115] Also port user interests to profile fieldsJoas Schilling2014-02-061-3/+3
* | | | [ticket/12115] Add methods to interfaceJoas Schilling2014-02-061-2/+10
* | | | [ticket/12115] Translate profile field name before displaying it in errorsJoas Schilling2014-02-067-14/+31
* | | | [ticket/12115] Convert user occupation to a profile fieldJoas Schilling2014-02-061-0/+146
|/ / /
* | | 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
|\ \ | |/ |/|
| * [ticket/11880] migration helper fileNathan Guse2014-02-051-0/+82
| * [ticket/11880] Move get_schema_steps function to a migrator helper classNathan Guse2014-02-051-67/+7
| * [ticket/11880] Break up schema changes in the migratorNathan Guse2014-02-031-21/+86
* | [ticket/12159] Fix codesniffer complaints due to profilefields and passwordsMarc Alexander2014-02-034-4/+2
|/
* [ticket/12156] Add missing passwords manager to oauthMarc Alexander2014-02-031-2/+11
* Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into developNils Adermann2014-02-0213-46/+2771
|\
| * [ticket/11201] Split template file into multiple filesJoas Schilling2014-02-021-2/+10
| * [ticket/11201] Remove dependency from types on the managerJoas Schilling2014-02-025-74/+39
| * [ticket/11201] Rename profilefields class to managerJoas Schilling2014-02-024-19/+19
| * [ticket/11201] Fix parameter descriptionJoas Schilling2014-02-021-1/+1
| * [ticket/11201] Also translate profile fields in UCP and ACPJoas Schilling2014-01-191-2/+2
| * [ticket/11201] Add parameters and variables to profile field classJoas Schilling2014-01-191-1/+46
| * [ticket/11201] Add commas on last array entryJoas Schilling2014-01-191-2/+2
| * [ticket/11201] Allow translation of profile field name and explanationJoas Schilling2014-01-191-4/+4
| * [ticket/11201] Fix some variable namesJoas Schilling2014-01-181-1/+1
| * [ticket/11201] Add a method to return the translated full name of the typeJoas Schilling2014-01-189-10/+25
| * [ticket/11201] Remove db depending code from field classJoas Schilling2014-01-181-35/+4
| * [ticket/11201] Add variables to classes and add constructor doc blocksJoas Schilling2014-01-187-0/+196
| * [ticket/11201] Update copyright in class fileJoas Schilling2014-01-181-1/+1
| * [ticket/11201] Add visibility and remove unused variableJoas Schilling2014-01-181-2/+1
| * [ticket/11201] Add some commas at the last array entryJoas Schilling2014-01-182-6/+6
| * [ticket/11201] Cast some variables to integerJoas Schilling2014-01-182-9/+9