aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #2002 from prototech/ticket/12153Nathan Guse2014-02-1830-130/+95
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/12153] Remove duplicate assignment of $u_previous_page & $u_next_page.Cesar G2014-02-181-1/+0
| * | | | | | | | | | [ticket/12153] Remove redundant calls to pagination.on_page().Cesar G2014-02-0325-27/+3
| * | | | | | | | | | [ticket/12153] Remove vars already assigned in generate_template_pagination().Cesar G2014-02-035-15/+6
| * | | | | | | | | | [ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination()Cesar G2014-02-031-89/+88
* | | | | | | | | | | Merge pull request #2027 from lucifer4o/ticket/12177Nathan Guse2014-02-183-0/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ticket/12177] Add ucp_friend_list_before/afterlucifer4o2014-02-131-2/+2
| * | | | | | | | | | | [ticket/12177] Add ucp_friend_list_before/afterlucifer4o2014-02-133-0/+20
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2014-02-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | [ticket/12210] dbtools::sql_create_table incorrectly throws errorNathaniel Guse2014-02-171-1/+1
* | | | | | | | | | | Merge pull request #2038 from prototech/ticket/12206Nathan Guse2014-02-182-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ticket/12206] Fix mismatched Plupload language vars preventing localization.Cesar G2014-02-172-4/+4
* | | | | | | | | | | | Merge pull request #2040 from prototech/ticket/12208Nathan Guse2014-02-181-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [ticket/12208] Remove file from upload queue if deleted before being uploaded.Cesar G2014-02-171-0/+3
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #2007 from rxu/ticket/12166Nathan Guse2014-02-183-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [ticket/12166] Add template events to quickreply_editor.html.rxu2014-02-183-0/+20
| |/ / / / / / / / / / /
* | | | | | | | | | | | 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
* | | | | | | | | | | | Merge remote-tracking branch 'Zoddo/ticket/12207' into developCesar G2014-02-171-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | [ticket/12207] Forum broken when error thrownZoddo2014-02-171-2/+0
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge remote-tracking branch 'Zoddo/ticket/12003' into developCesar G2014-02-171-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | [ticket/12003] ACP broken when error thrownZoddo2014-02-171-1/+0
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | [ticket/12192] Fix call to undefined method get_user_avatar().Cesar G2014-02-141-1/+1
* | | | | | | | | | Merge pull request #1964 from prototech/ticket/12136Andreas Fischer2014-02-151-4/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | [ticket/12136] Use new pagination class in generate_smilies().Cesar G2014-01-261-4/+7
* | | | | | | | | | Merge remote-tracking branch 'vinny/ticket/12134' into developCesar G2014-02-122-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/12134] Add ucp_pm_viewmessage_print_head_append event to subsilver2Marcus Vinicius2014-01-262-1/+2
* | | | | | | | | | | Merge remote-tracking branch 'vinny/ticket/12132' into developCesar G2014-02-122-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ticket/12132] Add the event to events.md docMarcus Vinicius2014-01-261-0/+1
| * | | | | | | | | | | [ticket/12132] Add viewtopic_print_head_append event to subsilver2Marcus Vinicius2014-01-261-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge remote-tracking branch 'bantu/ticket/12180' into developJoas Schilling2014-02-124-4/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ticket/12180] Add "Each file MUST end with exactly one newline character" ruleAndreas Fischer2014-02-104-4/+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-102-24/+31
* | | | | | | | | | | [ticket/12169] Add new option to display profile fields on memberlistJoas Schilling2014-02-1015-7/+72
* | | | | | | | | | | [ticket/12169] Allow displaying profile fields on memberlistJoas Schilling2014-02-106-15/+72
* | | | | | | | | | | [ticket/12169] Convert user_from to profile field locationJoas Schilling2014-02-1023-48/+64
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | 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-0623-50/+18
* | | | | | | | | | [ticket/12115] Remove old language stringsJoas Schilling2014-02-061-2/+0
* | | | | | | | | | [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] Remove occupation field from html filesJoas Schilling2014-02-065-17/+0
* | | | | | | | | | [ticket/12115] Add language entries for the profile fieldsJoas Schilling2014-02-062-1/+26
* | | | | | | | | | [ticket/12115] Convert user occupation to a profile fieldJoas Schilling2014-02-0617-26/+176
|/ / / / / / / / /