aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ | |/|
* | | Merge pull request #2032 from prototech/ticket/12192Andreas Fischer2014-02-151-1/+1
|\ \ \
| * | | [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 branch 'develop-olympus' into developNils Adermann2014-02-131-0/+1
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'github-nickvergessen/ticket/12188' into develop...Nils Adermann2014-02-131-0/+1
| |\ \ \ \
| | * | | | [ticket/12188] Add php 5.6 to travis enviromentsJoas Schilling2014-02-131-0/+1
| |/ / / /
* | | | | 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-125-4/+4
|\ \ \ \ \ \
| * | | | | | [ticket/12180] Add "Each file MUST end with exactly one newline character" ruleAndreas Fischer2014-02-105-4/+4
* | | | | | | Merge pull request #2026 from nickvergessen/ticket/12184Andreas Fischer2014-02-111-0/+2
|\ \ \ \ \ \ \
| * | | | | | | [ticket/12184] Fix undefined variable tpl_fields in profile field managerJoas Schilling2014-02-111-0/+2
|/ / / / / / /
* | | | | | | Merge pull request #2010 from nickvergessen/ticket/12169Nils Adermann2014-02-1134-63/+207
|\ \ \ \ \ \ \
| * | | | | | | [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-1024-49/+64
|/ / / / / / /
* | | | | | | Merge remote-tracking branch 'Marc/ticket/12170' into developJoas Schilling2014-02-104-5/+48
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'exreaction/ticket/12170' into ticket/12170Marc Alexander2014-02-071-4/+34
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/12170] Test for 12170Nathan Guse2014-02-071-4/+34
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | [ticket/12170] Assign schema keys in migration helper with data_depth 1Marc Alexander2014-02-073-1/+14
| |/ / / / / /
* | | | | | | Merge pull request #1988 from nickvergessen/ticket/12115Nils Adermann2014-02-1061-321/+404
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | [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-0650-270/+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
| |/ / / / /
* | | | | | Merge pull request #2022 from nickvergessen/ticket/12175Andreas Fischer2014-02-101-7/+15
|\ \ \ \ \ \
| * | | | | | [ticket/12175] Do not use admin account for file size limit testJoas Schilling2014-02-091-2/+9
| * | | | | | [ticket/12175] Fix test for uploading a valid fileJoas Schilling2014-02-091-3/+5
| * | | | | | [ticket/12175] Fix upload test for empty fileJoas Schilling2014-02-091-2/+1
| |/ / / / /
* | | | | | Merge pull request #2017 from nickvergessen/ticket/12141Andreas Fischer2014-02-081-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |