aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Tristan Darricau2015-10-122-2/+2
|\ | | | | | | | | * 3.1.x: [ticket/14200] Allow hidden users to see himself on viewonline
| * Merge pull request #3957 from Zoddo/ticket/14200Tristan Darricau2015-10-122-2/+2
| |\ | | | | | | | | | | | | | | | | | | [ticket/14200] Allow hidden users to see himself on viewonline * Zoddo/ticket/14200: [ticket/14200] Allow hidden users to see himself on viewonline
| | * [ticket/14200] Allow hidden users to see himself on viewonlineZoddo2015-10-102-2/+2
| | | | | | | | | | | | PHPBB3-14200
* | | Merge pull request #3964 from prototech/ticket/13993Tristan Darricau2015-10-123-4/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13993] Do not parse signatures as posts when editing them. * prototech/ticket/13993: [ticket/13993] Do not parse signatures as posts when editing them.
| * | | [ticket/13993] Do not parse signatures as posts when editing them.Cesar G2015-10-113-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of PHPBB3-12516 changed the manual use of the message parser to using generate_text_for_storage(). The function does not support parse_message::parse()'s mode parameter, thus all the error checks on the sig are invalid. PHPBB3-13993
* | | | Merge remote-tracking branch 'marc1706/ticket/14230'Cesar G2015-10-111-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * marc1706/ticket/14230: [ticket/14230] Show unread post icon in different color
| * | | [ticket/14230] Show unread post icon in different colorMarc Alexander2015-10-111-2/+2
| | | | | | | | | | | | | | | | PHPBB3-14230
* | | | Merge pull request #3962 from hanakin/ticket/14231Marc Alexander2015-10-112-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14231]Fix double icon issue
| * | | | [ticket/14231]Fix double icon issueMichael Miday2015-10-112-2/+3
| |/ / / | | | | | | | | | | | | PHPBB3-14231
* | | | Merge branch '3.1.x'Marc Alexander2015-10-111-2/+3
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge pull request #3902 from Zoddo/ticket/14161Marc Alexander2015-10-111-2/+3
| |\ \ | | | | | | | | | | | | [ticket/14161] Wrong var name for core.download_file_send_to_browser_before
| | * | [ticket/14161] Wrong var name for core.download_file_send_to_browser_beforeZoddo2015-10-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `extension` must be `extensions` Introduced in fix of PHPBB3-14101 (PR GH-3831) PHPBB3-14161
* | | | Merge pull request #3931 from hanakin/ticket/14194Marc Alexander2015-10-114-6/+27
|\ \ \ \ | | | | | | | | | | | | | | | [Ticket/14194] Responsive Quick Links Menu Broken
| * | | | [ticket14194]Remove double inline-blockMichael Miday2015-10-111-4/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-14194
| * | | | [ticket/14194]Fix search and quicklinksMichael Miday2015-10-111-1/+21
| | | | | | | | | | | | | | | | | | | | PHPBB3-14194
| * | | | [ticket/14194]Patch dropdown small-iconMichael Miday2015-10-111-0/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-14194
| * | | | [ticket/14194] Fix quick-links responsive menuMichael Miday2015-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14194
* | | | | Merge branch '3.1.x'Marc Alexander2015-10-116-10/+77
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge pull request #3864 from Zoddo/ticket/8920Marc Alexander2015-10-116-10/+77
| |\ \ \ | | |_|/ | |/| | | | | | [ticket/8920] Add a MCP PM reports view permission
| | * | [ticket/8920] Revert update_module_auth() on revert_data()Zoddo2015-09-131-0/+21
| | | | | | | | | | | | | | | | PHPBB3-8920
| | * | [ticket/8920] Add a MCP PM reports view permissionZoddo2015-08-306-10/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Anybody who has the permission to read reports in one forum can read PM reports. Solving this problem by adding a new permission to read PM reports. PHPBB3-8920
* | | | Merge pull request #3903 from Zoddo/ticket/13101Marc Alexander2015-10-104-3/+150
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13101] Remove MSN/WLM custom profile field
| * | | | [ticket/13101] Remove existing MSN/WLM custom profile fieldZoddo2015-10-102-1/+150
| | | | | | | | | | | | | | | | | | | | PHPBB3-13101
| * | | | [ticket/13101] Remove MSN/WLM custom profile field from new installsZoddo2015-09-272-2/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-13101
* | | | | Merge pull request #3896 from Zoddo/ticket/14157Marc Alexander2015-10-109-6/+69
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14157] Allow to set the alt/title attribute on post icons
| * | | | | [ticket/14157] Allow to set the alt/title attribute on post iconsZoddo2015-10-109-6/+69
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14157
* | | | | | Merge branch '3.1.x'Marc Alexander2015-10-093-3/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #3893 from VSEphpbb/ticket/14155Marc Alexander2015-10-093-3/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14155] Row highlighting for extension/styles management Conflicts: phpBB/adm/style/acp_ext_list.html
| | * | | | | [ticket/14155] Row highlighting for extension/styles managementMatt Friedman2015-09-113-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14155
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-10-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3934 from Zoddo/ticket/14181Marc Alexander2015-10-091-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14181] Fix empty denial reason if the reason isn't translated
| | * | | | | | [ticket/14181] Fix empty denial reason if the reason isn't translatedHB2015-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14181
* | | | | | | | Merge pull request #3912 from hanakin/ticket/14175Marc Alexander2015-10-094-419/+415
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14175] Refactor responsive implementation for easier manipulation
| * | | | | | | | [ticket/14175]Remove styles in 700 for lastpostMichael Miday2015-10-091-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14175
| * | | | | | | | [ticket/14175]Remove "only screen and"Michael Miday2015-10-091-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14175
| * | | | | | | | [ticket/14175]Include responsive.css same as restMichael Miday2015-10-093-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14175
| * | | | | | | | [ticket/14175]Remove max-device widthMichael Miday2015-10-091-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14175
| * | | | | | | | [ticket/14175] Fix online overlap issuesMichael Miday2015-10-091-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14175
| * | | | | | | | [ticket/14175] Refactor the fileMichael Miday2015-10-092-416/+415
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14175
* | | | | | | | | Merge branch '3.1.x'Tristan Darricau2015-10-092-0/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | | | | | | | | * 3.1.x: [ticket/8800] Add "mark topics read" link to "View unread posts"
| * | | | | | | Merge pull request #3869 from Zoddo/ticket/8800Tristan Darricau2015-10-092-0/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/8800] Add "mark topics read" link to "View unread posts" * Zoddo/ticket/8800: [ticket/8800] Add "mark topics read" link to "View unread posts"
| | * | | | | | | [ticket/8800] Add "mark topics read" link to "View unread posts"Zoddo2015-09-042-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8800
* | | | | | | | | [ticket/14225] Inject the loader resolver when using the delegating loaderTristan Darricau2015-10-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14225
* | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-10-081-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | [ticket/14073] Fix trailing whitespacesrxu2015-10-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14073
* | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-10-081-2/+176
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #3814 from rxu/ticket/14073Marc Alexander2015-10-081-2/+176
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14073] Add several core events to the functions_admin.php
| | * | | | | | | | [ticket/14073] Add several core events to the functions_admin.phprxu2015-10-081-2/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core events to the functions move_posts(), delete_posts(), delete_attachments(). PHPBB3-14073
* | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-10-081-0/+43
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3844 from rxu/ticket/14113Marc Alexander2015-10-081-0/+43
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14113] Add core events for customizing members search