aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Andreas Fischer2015-09-050-0/+0
|\ | | | | | | | | | | | | | | * 3.1.x: [ticket/14140] Update SYmfony to 2.3.32 Conflicts: phpBB/composer.lock
| * Merge pull request #3877 from Nicofuma/ticket/14140Andreas Fischer2015-09-051-167/+201
| |\ | | | | | | | | | | | | | | | | | | [ticket/14140] Update Symfony to 2.3.32 * Nicofuma/ticket/14140: [ticket/14140] Update SYmfony to 2.3.32
| | * [ticket/14140] Update SYmfony to 2.3.32Tristan Darricau2015-09-031-167/+201
| | | | | | | | | | | | PHPBB3-14140
* | | Merge branch '3.1.x'Joas Schilling2015-09-052-2/+33
|\ \ \ | |/ / | | | | | | | | | Conflicts: build/build.xml
| * | Merge branch 'prep-release-3.1.6' into 3.1.xJoas Schilling2015-09-052-2/+33
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * | [prep-release-3.1.6] Add migration for 3.1.6Joas Schilling2015-09-051-0/+31
| | | |
| | * | [prep-release-3.1.6] Update version for final 3.1.6 releaseJoas Schilling2015-09-053-4/+4
| | | |
* | | | Merge branch '3.1.x'Tristan Darricau2015-09-022-2/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14123] Fix typo [ticket/14123] Remove redundant help messages [ticket/14123] Add descriptive help to the CLI help output
| * | | Merge pull request #3855 from VSEphpbb/ticket/14123Tristan Darricau2015-09-022-2/+8
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14123] Add descriptive help to the CLI help output * VSEphpbb/ticket/14123: [ticket/14123] Fix typo [ticket/14123] Remove redundant help messages [ticket/14123] Add descriptive help to the CLI help output
| | * | [ticket/14123] Fix typoMatt Friedman2015-08-281-2/+2
| | | | | | | | | | | | | | | | PHPBB3-14123
| | * | [ticket/14123] Remove redundant help messagesMatt Friedman2015-08-2815-95/+6
| | | | | | | | | | | | | | | | PHPBB3-14123
| | * | [ticket/14123] Add descriptive help to the CLI help outputMatt Friedman2015-08-2316-1/+96
| | | | | | | | | | | | | | | | PHPBB3-14123
* | | | Merge branch '3.1.x'Tristan Darricau2015-09-022-0/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14075] Update version to 3.1.7-RC1 [ticket/14075] Add template event after poll preview panel
| * | | Merge pull request #3853 from marc1706/ticket/14075Tristan Darricau2015-09-023-0/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14075] Add template event after poll preview panel * marc1706/ticket/14075: [ticket/14075] Update version to 3.1.7-RC1 [ticket/14075] Add template event after poll preview panel
| | * | | [ticket/14075] Update version to 3.1.7-RC1Marc Alexander2015-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14075
| | * | | [ticket/14075] Add template event after poll preview paneljaviexin2015-08-223-0/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-14075
* | | | | Merge branch '3.1.x'Tristan Darricau2015-09-022-0/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/14126] Add viewtopic_topic_title_after template event
| * | | | Merge pull request #3860 from kinerity/ticket/14126Tristan Darricau2015-09-023-0/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14126] Add viewtopic_topic_title_after template event * kinerity/ticket/14126: [ticket/14126] Add viewtopic_topic_title_after template event
| | * | | | [ticket/14126] Add viewtopic_topic_title_after template eventKailey Truscott2015-08-243-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add content directly after the topic title link on the View topic screen (outside of the h2 HTML tag). PHPBB3-14126
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-09-021-2/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/11468] Allow controllers to set paramters of page_header()
| * | | | | Merge pull request #3872 from Zoddo/ticket/11468Tristan Darricau2015-09-021-2/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11468] Allow controllers to set paramters of page_header() * Zoddo/ticket/11468: [ticket/11468] Allow controllers to set paramters of page_header()
| | * | | | | [ticket/11468] Allow controllers to set paramters of page_header()Zoddo2015-08-301-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11468
* | | | | | | Merge pull request #3875 from hanakin/ticket/14137Tristan Darricau2015-09-011-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Ticket/14137] Fix Notification Menu Layout issue * hanakin/ticket/14137: [ticket/14137]
| * | | | | | | [ticket/14137]Michael Miday2015-09-011-0/+5
|/ / / / / / /
* | | | | | | Merge branch '3.1.x'Tristan Darricau2015-09-012-0/+32
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13950] Hide undefined categories [ticket/13950] Hide undefined permissions
| * | | | | | Merge pull request #3765 from Zoddo/ticket/13950Tristan Darricau2015-09-012-0/+32
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13950] Hide undefined permissions * Zoddo/ticket/13950: [ticket/13950] Hide undefined categories [ticket/13950] Hide undefined permissions
| | * | | | | | [ticket/13950] Hide undefined categoriesZoddo2015-08-282-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hides the categories added by disabled extensions PHPBB3-13950
| | * | | | | | [ticket/13950] Hide undefined permissionsZoddo2015-08-282-0/+16
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hides the permissions of the disabled extensions PHPBB3-13950
* | | | | | | Merge pull request #3861 from hanakin/ticket/12821Tristan Darricau2015-09-017-100/+97
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12821] Convert all images to gradients * hanakin/ticket/12821: [ticket/12821] Graceful ie9 fallbacks [ticket/12821] IE 9 requires filter: none for svg [ticket/12821] Update all Gradients to last two [ticket/12821] Convert all colors to upper [ticket/12821] Update all gradients
| * | | | | | | [ticket/12821] Graceful ie9 fallbacksMichael Miday2015-09-012-6/+10
| | | | | | | |
| * | | | | | | [ticket/12821] IE 9 requires filter: none for svgMichael Miday2015-09-011-0/+4
| | | | | | | |
| * | | | | | | [ticket/12821] Update all Gradients to last twoMichael Miday2015-09-011-59/+28
| | | | | | | |
| * | | | | | | [ticket/12821] Convert all colors to upperMichael Miday2015-09-011-62/+63
| | | | | | | |
| * | | | | | | [ticket/12821] Update all gradientsMichael Miday2015-09-016-65/+84
| | | | | | | |
* | | | | | | | Merge branch '3.1.x'Tristan Darricau2015-09-011-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | * 3.1.x: [ticket/14133] Comment fix for phpbb_get_user_rank()
| * | | | | | Merge pull request #3873 from lavigor/ticket/14133Tristan Darricau2015-09-011-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14133] Comment fix for phpbb_get_user_rank() * lavigor/ticket/14133: [ticket/14133] Comment fix for phpbb_get_user_rank()
| | * | | | | [ticket/14133] Comment fix for phpbb_get_user_rank()lavigor2015-08-311-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14133
* | | | | | Merge pull request #3866 from hanakin/ticket/14038Tristan Darricau2015-09-014-6/+82
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Ticket/14038] Jumpbox improvements * hanakin/ticket/14038: [ticket/14038] Minor color tweaks [ticket/14038] Switch to spacer spans [ticket/14038] Stylize & differintiate [ticket/14038] Give links some visual love
| * | | | | | [ticket/14038] Minor color tweaksMichael Miday2015-08-311-1/+11
| | | | | | |
| * | | | | | [ticket/14038] Switch to spacer spansMichael Miday2015-08-302-1/+10
| | | | | | |
| * | | | | | [ticket/14038] Stylize & differintiateMichael Miday2015-08-304-7/+62
| | | | | | |
| * | | | | | [ticket/14038] Give links some visual loveMichael Miday2015-08-302-1/+3
|/ / / / / /
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-08-282-5/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13988] Update tests [ticket/13988] Use absolute path for image attachments in feeds
| * | | | | Merge pull request #3764 from Zoddo/ticket/13988Tristan Darricau2015-08-282-5/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13988] Use absolute path for image attachments in feeds * Zoddo/ticket/13988: [ticket/13988] Update tests [ticket/13988] Use absolute path for image attachments in feeds
| | * | | | | [ticket/13988] Update testsZoddo2015-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13988
| | * | | | | [ticket/13988] Use absolute path for image attachments in feedsCarstenF2015-07-151-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, atom feeds use relative links for image attachments PHPBB3-13988
* | | | | | | Merge branch '3.1.x'Tristan Darricau2015-08-281-9/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14106] Fix topics sorting in MCP for topics merging.
| * | | | | | Merge pull request #3835 from rxu/ticket/14106Tristan Darricau2015-08-281-9/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14106] Fix topics sorting in MCP for topics merging. * rxu/ticket/14106: [ticket/14106] Fix topics sorting in MCP for topics merging.
| | * | | | | | [ticket/14106] Fix topics sorting in MCP for topics merging.rxu2015-08-161-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "bug" in the deleted code comment is non-existent now. The PR is for 3.1 only. PHPBB3-14106
* | | | | | | | Merge branch '3.1.x'Tristan Darricau2015-08-280-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14058] Contact us form missing email subject field in subsilver2
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-21 09:46:52 +0000