Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2038 from prototech/ticket/12206 | Nathan Guse | 2014-02-18 | 2 | -4/+4 |
|\ | | | | | [ticket/12206] Fix mismatched Plupload language vars preventing localization. | ||||
| * | [ticket/12206] Fix mismatched Plupload language vars preventing localization. | Cesar G | 2014-02-17 | 2 | -4/+4 |
| | | | | | | | | PHPBB3-12206 | ||||
* | | Merge pull request #2040 from prototech/ticket/12208 | Nathan Guse | 2014-02-18 | 1 | -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 G | 2014-02-17 | 1 | -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/12166 | Nathan Guse | 2014-02-18 | 3 | -0/+20 |
|\ \ \ | | | | | | | | | Add template events before/after the textbox in quickreply_editor.html. | ||||
| * | | | [ticket/12166] Add template events to quickreply_editor.html. | rxu | 2014-02-18 | 3 | -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/12167 | Nathan Guse | 2014-02-18 | 1 | -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 default | Marc Alexander | 2014-02-06 | 1 | -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 develop | Cesar G | 2014-02-17 | 1 | -2/+0 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | * Zoddo/ticket/12207: [ticket/12207] Forum broken when error thrown | ||||
| * | | | [ticket/12207] Forum broken when error thrown | Zoddo | 2014-02-17 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fix display of forum when error is outputted before <html> tag. PHPBB3-12207 | ||||
* | | | | Merge remote-tracking branch 'Zoddo/ticket/12003' into develop | Cesar G | 2014-02-17 | 1 | -1/+0 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | * Zoddo/ticket/12003: [ticket/12003] ACP broken when error thrown | ||||
| * | | | [ticket/12003] ACP broken when error thrown | Zoddo | 2014-02-17 | 1 | -1/+0 |
| | |/ | |/| | | | | | | | | | | | | | Fix display of ACP when error is outputted before <html> tag. PHPBB3-12003 | ||||
* | | | [ticket/12192] Fix call to undefined method get_user_avatar(). | Cesar G | 2014-02-14 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-12192 | ||||
* | | | Merge pull request #1964 from prototech/ticket/12136 | Andreas Fischer | 2014-02-15 | 1 | -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 G | 2014-01-26 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | PHPBB3-12136 | ||||
* | | | | Merge remote-tracking branch 'vinny/ticket/12134' into develop | Cesar G | 2014-02-12 | 2 | -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 subsilver2 | Marcus Vinicius | 2014-01-26 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-12134 | ||||
* | | | | | Merge remote-tracking branch 'vinny/ticket/12132' into develop | Cesar G | 2014-02-12 | 2 | -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 doc | Marcus Vinicius | 2014-01-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12132 | ||||
| * | | | | | [ticket/12132] Add viewtopic_print_head_append event to subsilver2 | Marcus Vinicius | 2014-01-26 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | PHPBB3-12132 | ||||
* | | | | | Merge remote-tracking branch 'bantu/ticket/12180' into develop | Joas Schilling | 2014-02-12 | 4 | -4/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * 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" rule | Andreas Fischer | 2014-02-10 | 4 | -4/+1 |
| | |_|_|/ | |/| | | | | | | | | | | | | | PHPBB3-12180 | ||||
* | | | | | [ticket/12184] Fix undefined variable tpl_fields in profile field manager | Joas Schilling | 2014-02-11 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-12184 | ||||
* | | | | | [ticket/12169] Split mode==headline into it's own function | Joas Schilling | 2014-02-10 | 2 | -24/+31 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-12169 | ||||
* | | | | | [ticket/12169] Add new option to display profile fields on memberlist | Joas Schilling | 2014-02-10 | 15 | -7/+72 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-12169 | ||||
* | | | | | [ticket/12169] Allow displaying profile fields on memberlist | Joas Schilling | 2014-02-10 | 6 | -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 location | Joas Schilling | 2014-02-10 | 23 | -48/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing changes on memberlist view due to missing functionality PHPBB3-12169 | ||||
* | | | | | Merge remote-tracking branch 'Marc/ticket/12170' into develop | Joas Schilling | 2014-02-10 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/12170: [ticket/12170] Test for 12170 [ticket/12170] Assign schema keys in migration helper with data_depth 1 | ||||
| * | | | | | [ticket/12170] Assign schema keys in migration helper with data_depth 1 | Marc Alexander | 2014-02-07 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | | [ticket/12115] Remove space from line ending | Joas Schilling | 2014-02-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-12115 | ||||
* | | | | | [ticket/12115] Add migration file to remove old user columns | Joas Schilling | 2014-02-06 | 1 | -0/+51 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-12115 | ||||
* | | | | | [ticket/12115] Use base class to reduce duplicate code | Joas Schilling | 2014-02-06 | 3 | -252/+209 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-12115 | ||||
* | | | | | [ticket/12115] Add a new migration for profilefield_interests | Joas Schilling | 2014-02-06 | 1 | -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 fields | Joas Schilling | 2014-02-06 | 23 | -50/+18 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-12115 | ||||
* | | | | | [ticket/12115] Remove old language strings | Joas Schilling | 2014-02-06 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-12115 | ||||
* | | | | | [ticket/12115] Add methods to interface | Joas Schilling | 2014-02-06 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-12115 | ||||
* | | | | | [ticket/12115] Translate profile field name before displaying it in errors | Joas Schilling | 2014-02-06 | 7 | -14/+31 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-12115 | ||||
* | | | | | [ticket/12115] Remove occupation field from html files | Joas Schilling | 2014-02-06 | 5 | -17/+0 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-12115 | ||||
* | | | | | [ticket/12115] Add language entries for the profile fields | Joas Schilling | 2014-02-06 | 2 | -1/+26 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-12115 | ||||
* | | | | | [ticket/12115] Convert user occupation to a profile field | Joas Schilling | 2014-02-06 | 17 | -26/+176 |
|/ / / / | | | | | | | | | | | | | PHPBB3-12115 | ||||
* | | | | Merge branch 'prep-release-3.1.0-a3' into develop | Joas Schilling | 2014-02-05 | 7 | -30/+169 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | [prep-release-3.1.0-a3] Update version to 3.1.0-a4-dev for future development | Joas Schilling | 2014-02-05 | 2 | -2/+2 |
| | | | | |||||
| * | | | [prep-release-3.1.0-a3] Commit changelog for 3.1.0-a3 | Joas Schilling | 2014-02-05 | 1 | -0/+106 |
| | | | | |||||
| * | | | [prep-release-3.1.0-a3] Prepare Changelog | Joas Schilling | 2014-02-05 | 1 | -23/+26 |
| | | | | |||||
| * | | | [prep-release-3.1.0-a3] Add migration for 3.1.0-a3 | Joas Schilling | 2014-02-05 | 1 | -0/+30 |
| | | | | |||||
| * | | | [prep-release-3.1.0-a3] Update version to 3.1.0-a3 | Joas Schilling | 2014-02-05 | 5 | -7/+7 |
| | | | | |||||
* | | | | Merge pull request #1995 from EXreaction/ticket/11880 | Nils Adermann | 2014-02-05 | 3 | -22/+113 |
|\ \ \ \ | |/ / / |/| | | | Schema changes can take too long and cause a timeout | ||||
| * | | | [ticket/11880] migration helper file | Nathan Guse | 2014-02-05 | 1 | -0/+82 |
| | | | | | | | | | | | | | | | | PHPBB3-11880 | ||||
| * | | | [ticket/11880] Move get_schema_steps function to a migrator helper class | Nathan Guse | 2014-02-05 | 2 | -67/+11 |
| | | | | | | | | | | | | | | | | PHPBB3-11880 | ||||
| * | | | [ticket/11880] Break up schema changes in the migrator | Nathan Guse | 2014-02-03 | 1 | -21/+86 |
| | | | | | | | | | | | | | | | | PHPBB3-11880 |