aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2038 from prototech/ticket/12206Nathan Guse2014-02-182-4/+4
|\ | | | | [ticket/12206] Fix mismatched Plupload language vars preventing localization.
| * [ticket/12206] Fix mismatched Plupload language vars preventing localization.Cesar G2014-02-172-4/+4
| | | | | | | | PHPBB3-12206
* | 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.
| * | [ticket/12208] Remove file from upload queue if deleted before being uploaded.Cesar G2014-02-171-0/+3
| | | | | | | | | | | | | | | | | | | | | The table row is removed, but the files aren't actually removed from the upload queue, so they get uploaded either way. PHPBB3-12208
* | | Merge pull request #2007 from rxu/ticket/12166Nathan Guse2014-02-183-0/+20
|\ \ \ | | | | | | | | Add template events before/after the textbox in quickreply_editor.html.
| * | | [ticket/12166] Add template events to quickreply_editor.html.rxu2014-02-183-0/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add template event pair - quickreply_editor_message_before and quickreply_editor_message_before to quickreply_editor.html for both of prosilver and subsilver2 styles. This allows extensions to modify quick reply postform. For example, to add BBCode buttons and/or smilies and so on. PHPBB3-12166
* | | Merge pull request #2008 from marc1706/ticket/12167Nathan Guse2014-02-181-1/+1
|\ \ \ | | | | | | | | [ticket/12167] Allow users to change style via style parameter by default
| * | | [ticket/12167] Allow users to change style via style parameter by defaultMarc Alexander2014-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will enable users that don't have the a_styles permission to preview styles using the style parameter. Using this, they will be able to use extensions that are or incorporate stylechangers. PHPBB3-12167
* | | | Merge remote-tracking branch 'Zoddo/ticket/12207' into developCesar G2014-02-171-2/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | * Zoddo/ticket/12207: [ticket/12207] Forum broken when error thrown
| * | | [ticket/12207] Forum broken when error thrownZoddo2014-02-171-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Fix display of forum when error is outputted before <html> tag. PHPBB3-12207
* | | | Merge remote-tracking branch 'Zoddo/ticket/12003' into developCesar G2014-02-171-1/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | * Zoddo/ticket/12003: [ticket/12003] ACP broken when error thrown
| * | | [ticket/12003] ACP broken when error thrownZoddo2014-02-171-1/+0
| | |/ | |/| | | | | | | | | | | | | Fix display of ACP when error is outputted before <html> tag. PHPBB3-12003
* | | Merge pull request #2032 from prototech/ticket/12192Andreas Fischer2014-02-151-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12192] Fix call to undefined method get_user_avatar(). * prototech/ticket/12192: [ticket/12192] Fix call to undefined method get_user_avatar().
| * | | [ticket/12192] Fix call to undefined method get_user_avatar().Cesar G2014-02-141-1/+1
|/ / / | | | | | | | | | PHPBB3-12192
* | | 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 branch 'develop-olympus' into developNils Adermann2014-02-131-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12188] Add php 5.6 to travis enviroments Conflicts: .travis.yml
| * \ \ \ Merge remote-tracking branch 'github-nickvergessen/ticket/12188' into ↵Nils Adermann2014-02-131-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/12188: [ticket/12188] Add php 5.6 to travis enviroments
| | * | | | [ticket/12188] Add php 5.6 to travis enviromentsJoas Schilling2014-02-131-0/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-12188
* | | | | 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-125-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-105-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12180
* | | | | | | Merge pull request #2026 from nickvergessen/ticket/12184Andreas Fischer2014-02-111-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12184] Fix undefined variable tpl_fields in profile field manager * nickvergessen/ticket/12184: [ticket/12184] Fix undefined variable tpl_fields in profile field manager
| * | | | | | | [ticket/12184] Fix undefined variable tpl_fields in profile field managerJoas Schilling2014-02-111-0/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-12184
* | | | | | | Merge pull request #2010 from nickvergessen/ticket/12169Nils Adermann2014-02-1134-63/+207
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Ticket/12169 Convert location user field to profile field
| * | | | | | | [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-1024-49/+64
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing changes on memberlist view due to missing functionality PHPBB3-12169
* | | | | | | Merge remote-tracking branch 'Marc/ticket/12170' into developJoas Schilling2014-02-104-5/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/12170: [ticket/12170] Test for 12170 [ticket/12170] Assign schema keys in migration helper with data_depth 1
| * \ \ \ \ \ \ 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
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | PHPBB3-12170
| * | | | | | | [ticket/12170] Assign schema keys in migration helper with data_depth 1Marc Alexander2014-02-073-1/+14
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge pull request #1988 from nickvergessen/ticket/12115Nils Adermann2014-02-1061-321/+404
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | [ticket/12115] Convert occupation profile field to custom field
| * | | | | | [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-0650-270/+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 pull request #2022 from nickvergessen/ticket/12175Andreas Fischer2014-02-101-7/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/12175 Fix and run functional upload tests * nickvergessen/ticket/12175: [ticket/12175] Do not use admin account for file size limit test [ticket/12175] Fix test for uploading a valid file [ticket/12175] Fix upload test for empty file
generated by cgit v1.2.1 (git 2.21.0) at 2025-10-09 15:15:58 +0000