aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | [ticket/12217] Add more template events to viewtopic_body.htmlrxu2014-02-213-1/+31
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add viewtopic template events before/after the posts, after the sorting options to allow adding contents to respective places (like advertisement and so on). PHPBB3-12217
* | | | | | | | Merge pull request #2044 from prototech/ticket/12212Nathan Guse2014-02-201-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12212] Encode the attachment file name before presenting to user.
| * | | | | | | | [ticket/12212] Encode the attachment file name before presenting to user.Cesar G2014-02-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The uploader inserts the file name directly into the page at the moment without handling any HTML special chars that may be in the name. This results in HTML that may be present getting rendered in error messages and the attachments list. This simply causes layout breakage for the user, since the backend takes care of sanitizing the name. Once phpBB returns the file data for the uploaded file, the name in the attachment list gets replaced by the one that phpBB provides. PHPBB3-12212
* | | | | | | | | Merge pull request #2049 from prototech/ticket/12200Nathan Guse2014-02-206-0/+26
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | [ticket/12200] Add missing profile field template files to adm/style/ directory.
| * | | | | | | | [ticket/12200] Add missing profile field template files to adm/style/ directoryCesar G2014-02-196-0/+26
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12200
* | | | | | | | Merge pull request #2047 from prototech/ticket/12153Nathan Guse2014-02-192-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12153] Replace old template variables with {PAGE_NUMBER}.
| * | | | | | | | [ticket/12153] Replace old template variables with {PAGE_NUMBER}.Cesar G2014-02-192-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12153
* | | | | | | | Merge pull request #2030 from rxu/ticket/12190Nathan Guse2014-02-191-0/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add core event "core.modify_submit_post_data"
| * | | | | | | | [ticket/12190] Add core event "core.modify_submit_post_data"rxu2014-02-201-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core event - core.modify_submit_post_data to submit_post() function. This allows extensions to modify the whole post data before the post submitting, or even provide its own post submit procedure. PHPBB3-12190
* | | | | | | | | Merge pull request #2045 from rxu/ticket/12213Nathan Guse2014-02-192-1/+31
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ticket/12213] Add MCP events for custom quick moderation options
| * | | | | | | | | [ticket/12213] Add MCP events for custom quick moderation optionsrxu2014-02-202-1/+31
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core events to mcp.php and mcp_main.php. This allows extensions to add and to handle custom quick moderation options. PHPBB3-12213
* | | | | | | | | Merge branch 'develop-olympus' into developNathan Guse2014-02-191-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12093] Check that document.selection is supported. Conflicts: phpBB/adm/style/editor.js phpBB/assets/javascript/editor.js phpBB/styles/prosilver/template/editor.js
| * | | | | | | | Merge remote-tracking branch 'remotes/prototech/ticket/12093' into ↵Nathan Guse2014-02-193-3/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * remotes/prototech/ticket/12093: [ticket/12093] Check that document.selection is supported.
| | * | | | | | | | [ticket/12093] Check that document.selection is supported.Cesar G2014-01-253-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12093
* | | | | | | | | | Merge pull request #1994 from prototech/ticket/12158Nathan Guse2014-02-182-3/+18
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/12158] The pagination start value should be 0 when there are no items.
| * | | | | | | | | | [ticket/12158] Add test data for 0 items to validate_start() test.Cesar G2014-02-041-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12158
| * | | | | | | | | | [ticket/12158] The pagination start value should be 0 when there are no items.Cesar G2014-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12158
* | | | | | | | | | | Merge pull request #2002 from prototech/ticket/12153Nathan Guse2014-02-1833-145/+112
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination()
| * | | | | | | | | | | [ticket/12153] Remove duplicate assignment of $u_previous_page & $u_next_page.Cesar G2014-02-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12153
| * | | | | | | | | | | [ticket/12153] Adjust pagination tests.Cesar G2014-02-033-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12153
| * | | | | | | | | | | [ticket/12153] Remove redundant calls to pagination.on_page().Cesar G2014-02-0325-27/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12153
| * | | | | | | | | | | [ticket/12153] Remove vars already assigned in generate_template_pagination().Cesar G2014-02-035-15/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12153
| * | | | | | | | | | | [ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination()Cesar G2014-02-031-89/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12153
* | | | | | | | | | | | Merge pull request #2027 from lucifer4o/ticket/12177Nathan Guse2014-02-183-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12177] Add ucp_friend_list_before/after
| * | | | | | | | | | | | [ticket/12177] Add ucp_friend_list_before/afterlucifer4o2014-02-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add events before and after list of friends in UCP template Change Since part from a3 to a4 PHPBB3-12177
| * | | | | | | | | | | | [ticket/12177] Add ucp_friend_list_before/afterlucifer4o2014-02-133-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add events before and after list of friends in UCP template PHPBB3-12177
* | | | | | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2014-02-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12210] dbtools::sql_create_table incorrectly throws error related to auto-increment length on non auto-increment fields
| * | | | | | | | | | | | Merge remote-tracking branch 'github-exreaction/ticket/12210' into ↵Nils Adermann2014-02-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-exreaction/ticket/12210: [ticket/12210] dbtools::sql_create_table incorrectly throws error related to auto-increment length on non auto-increment fields
| | * | | | | | | | | | | | [ticket/12210] dbtools::sql_create_table incorrectly throws errorNathaniel Guse2014-02-171-1/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related to auto-increment length on non auto-increment fields PHPBB3-12210
* | | | | | | | | | | | | 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