aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14089] Remove subsilver2 file from events.mdMarc Alexander2015-09-121-1/+0
| | | | PHPBB3-14089
* Merge branch '3.1.x'Marc Alexander2015-09-122-1/+9
|\ | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/posting_body.html
| * Merge pull request #3767 from Zoddo/ticket/14020Marc Alexander2015-09-123-2/+10
| |\ | | | | | | | | | | | | | | | | | | [ticket/14089] Add posting_topic_title_after template event Conflicts: phpBB/docs/events.md
| | * [ticket/14089] Add posting_topic_title_after template eventZoddo2015-08-233-2/+10
| | | | | | | | | | | | | | | | | | Allows to add some information after the topic title in the posting form PHPBB3-14089
* | | Merge branch '3.1.x'Marc Alexander2015-09-111-0/+6
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: phpBB/styles/prosilver/theme/common.css phpBB/styles/subsilver2/theme/stylesheet.css
| * | Merge pull request #3892 from cyberalien/ticket/14153Marc Alexander2015-09-112-0/+12
| |\ \ | | | | | | | | | | | | [ticket/14153] Fix floating elements in notifications dropdown header
| | * | [ticket/14153] Fix floating elements in notifications dropdown headercyberalien2015-09-102-0/+12
| |/ / | | | | | | | | | PHPBB3-14153
* | | Merge branch '3.1.x'Tristan Darricau2015-09-092-1/+2
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/7362] Add alt attribute on topic icons
| * | Merge pull request #3868 from Zoddo/ticket/7362Tristan Darricau2015-09-093-2/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/7362] Add alt attribute on topic icons * Zoddo/ticket/7362: [ticket/7362] Add alt attribute on topic icons
| | * | [ticket/7362] Add alt attribute on topic iconsZoddo2015-08-303-2/+3
| | | | | | | | | | | | | | | | PHPBB3-7362
* | | | Merge pull request #3870 from Zoddo/ticket/9485Tristan Darricau2015-09-0914-2/+107
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/9485] Add a "View post" link in the moderation logs * Zoddo/ticket/9485: [ticket/9485] Fix tests [ticket/9485] Add post_id to relevant $phpbb_log->add() [ticket/9485] Add a "View post" link in the moderation logs
| * | | | [ticket/9485] Fix testsZoddo2015-08-304-0/+45
| | | | | | | | | | | | | | | | | | | | PHPBB3-9485
| * | | | [ticket/9485] Add post_id to relevant $phpbb_log->add()Zoddo2015-08-306-0/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-9485
| * | | | [ticket/9485] Add a "View post" link in the moderation logsZoddo2015-08-304-2/+52
| | | | | | | | | | | | | | | | | | | | PHPBB3-9485
* | | | | Merge pull request #3876 from VSEphpbb/ticket/14138Tristan Darricau2015-09-092-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14138] Use span tags instead of abbr * VSEphpbb/ticket/14138: [ticket/14138] Use span tags instead of abbr
| * | | | | [ticket/14138] Use span tags instead of abbrMatt Friedman2015-09-012-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14138
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-09-091-0/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * 3.1.x: [ticket/13423] Set busyTimeout on connect to prevent db locking
| * | | | | Merge pull request #3890 from marc1706/ticket/13423Tristan Darricau2015-09-091-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13423] Set busyTimeout on connect to prevent db locking * marc1706/ticket/13423: [ticket/13423] Set busyTimeout on connect to prevent db locking
| | * | | | | [ticket/13423] Set busyTimeout on connect to prevent db lockingMarc Alexander2015-09-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13423
* | | | | | | Merge pull request #3891 from marc1706/ticket/14150Tristan Darricau2015-09-099-19/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14150] Update fast-image-size to newest version * marc1706/ticket/14150: [ticket/14150] Update fast-image-size to newest version
| * | | | | | | [ticket/14150] Update fast-image-size to newest versionMarc Alexander2015-09-089-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14150
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-09-082-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | Merge pull request #3881 from VSEphpbb/ticket/14142Marc Alexander2015-09-082-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | [ticket/14142] Remove unused ignore_configs from avatar drivers
| | * | | | | [ticket/14142] Remove unused ignore_configs from avatar driversMatt Friedman2015-09-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14142
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-09-071-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions_messenger.php
| * | | | | | Merge pull request #3884 from Nicofuma/ticket/14143Marc Alexander2015-09-071-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14143] Flush the mail queue when writing it
| | * | | | | | [ticket/14143] Flush the mail queue when writing itTristan Darricau2015-09-051-0/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-14143
* | | | | | | Merge pull request #3878 from Nicofuma/ticket/14140-masterAndreas Fischer2015-09-051-57/+57
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14140] Update Symfony to latest 2.8-dev version - #3877 * Nicofuma/ticket/14140-master: [ticket/14140] Update Symfony to latest 2.8-dev version [ticket/14140] Update SYmfony to 2.3.32
| * | | | | | | [ticket/14140] Update Symfony to latest 2.8-dev versionTristan Darricau2015-09-021-57/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14140
| * | | | | | | Merge branch 'ticket/14140' into ticket/14140-masterTristan Darricau2015-09-020-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/14140: [ticket/14140] Update SYmfony to 2.3.32
| | * | | | | | | [ticket/14140] Update SYmfony to 2.3.32Tristan Darricau2015-09-021-167/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14140
* | | | | | | | | 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