aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Andreas Fischer2015-06-131-0/+4
|\ | | | | | | | | * 3.1.x: [ticket/10711] Duplicate key error on forum_tracks_table
| * Merge pull request #3703 from javiexin/ticket/10711Andreas Fischer2015-06-131-0/+4
| |\ | | | | | | | | | | | | | | | | | | [ticket/10711] Duplicate key error on forum_tracks_table * javiexin/ticket/10711: [ticket/10711] Duplicate key error on forum_tracks_table
| | * [ticket/10711] Duplicate key error on forum_tracks_tablejaviexin2015-06-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain situations, an SQL error DUPLICATE ERROR for KEY 'PRIMARY' in the forums_track table is produced when marking forums read (viewforum.php?f=xx&mark=forums). The problem happens when there are duplicates in the forum_id array. The solution is to remove those duplicates. PHPBB3-10711
* | | Merge branch '3.1.x'Andreas Fischer2015-06-131-2/+4
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3
| * | Merge pull request #3704 from Nicofuma/ticket/13941Andreas Fischer2015-06-131-2/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3 * Nicofuma/ticket/13941: [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3
| | * | [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3Tristan Darricau2015-06-131-2/+4
| | | | | | | | | | | | | | | | PHPBB3-13941
* | | | Merge branch '3.1.x'Joas Schilling2015-06-110-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * | | [3.1.x] Update dev version to 3.1.6-RC1Joas Schilling2015-06-113-4/+4
| | | |
| * | | Merge branch 'prep-release-3.1.5' into 3.1.xJoas Schilling2015-06-1110-20/+134
| |\ \ \ | | |/ / | |/| |
* | | | Merge branch '3.1.x'Joas Schilling2015-06-116-13/+127
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | | [3.1.x] Increase dev version to 3.1.6-devJoas Schilling2015-06-113-4/+4
| | | | |
| * | | | Merge branch 'prep-release-3.1.5' into 3.1.xJoas Schilling2015-06-1110-20/+134
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge pull request #3699 from nickvergessen/ticket/13823Joas Schilling2015-06-101-5/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | [ticket/13823] Move the part of the query, so the update will get it …
| | | * | | [ticket/13823] Move the part of the query, so the update will get it correctlyJoas Schilling2015-06-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13823
| | * | | | Merge branch '3.0.x' into prep-release-3.1.5Joas Schilling2015-06-102-7/+7
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Merge pull request #3700 from Nicofuma/ticket/13823Joas Schilling2015-06-102-7/+7
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13823] Change diff options while packaging to not ignore all whitespaces
| | | | * | | [ticket/13823] Change diff options while packaging to not ignore all whitespacesTristan Darricau2015-06-102-7/+7
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed: -w, --ignore-all-space Ignore white space when comparing lines. Added: -Z, --ignore-trailing-space Ignore white space at line end. -b, --ignore-space-change Ignore changes in the amount of white space. PHPBB3-13823
| | * | | | [prep-release-3.1.5] Add changelog for 3.1.5-RC1Joas Schilling2015-06-091-0/+83
| | | | | |
| | * | | | [prep-release-3.1.5] Add migration for 3.1.5-RC1Joas Schilling2015-06-091-0/+31
| | | | | |
| | * | | | [prep-release-3.1.5] Update version to 3.1.5-RC1Joas Schilling2015-06-096-8/+8
| |/ / / /
* | | | | Merge branch '3.1.x'Andreas Fischer2015-06-091-1/+5
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13923] CS [ticket/13923] Update startup.php
| * | | | Merge pull request #3685 from Nicofuma/ticket/13923Andreas Fischer2015-06-091-1/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13923] Update startup.php * Nicofuma/ticket/13923: [ticket/13923] CS [ticket/13923] Update startup.php
| | * | | | [ticket/13923] CSTristan Darricau2015-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13923
| | * | | | [ticket/13923] Update startup.phpAJ Quick2015-06-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While suppressing the output from the 'set_magic_quotes_runtime(0)' is sufficient with normal phpBB installs, using this file in association with the oauth plugin will cause an error on some versions of PHP. This fixes a potential bug where set_magic_quotes_runtime is depreciated in newer versions of PHP. PHPBB3-13923
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-06-090-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * 3.1.x:
| * | | | | Merge pull request #3694 from marc1706/ticket/13930Andreas Fischer2015-06-0912-19/+82
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13930] Check for correct spacing between keyword & parenthesis * marc1706/ticket/13930: [ticket/13930] Add missing spaces to code [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset [ticket/13930] Remove not needed return statements [ticket/13930] Add missing spaces to code [ticket/13930] Check for correct spacing between keyword & parenthesis
* | | | | | Merge pull request #3696 from marc1706/ticket/13930-masterAndreas Fischer2015-06-0910-14/+77
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13930] Check for correct spacing between keyword & parenthesis * marc1706/ticket/13930-master: [ticket/13930] Add missing space to mssql_extractor [ticket/13930] Add missing spaces to code [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset [ticket/13930] Remove not needed return statements [ticket/13930] Add missing spaces to code [ticket/13930] Check for correct spacing between keyword & parenthesis
| * | | | | | [ticket/13930] Add missing space to mssql_extractorMarc Alexander2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13930
| * | | | | | Merge branch 'ticket/13930' into ticket/13930-masterMarc Alexander2015-06-089-13/+76
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_database.php
| | * | | | | [ticket/13930] Add missing spaces to codeMarc Alexander2015-06-086-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13930
| | * | | | | [ticket/13930] Use OpeningParenthesisSniff in legacy rulesetMarc Alexander2015-06-082-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13930
| | * | | | | [ticket/13930] Remove not needed return statementsMarc Alexander2015-06-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13930
| | * | | | | [ticket/13930] Add missing spaces to codeMarc Alexander2015-06-074-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13930
| | * | | | | [ticket/13930] Check for correct spacing between keyword & parenthesisMarc Alexander2015-06-072-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The codesniffer should check for a correct spacing between keywords like if or foreach and its opening parenthesis. PHPBB3-13930
* | | | | | | Merge branch '3.1.x'Joas Schilling2015-06-093-4/+214
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #3551 from rxu/ticket/13779Joas Schilling2015-06-093-4/+214
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13779] Set new auth options to the role only if matching the role type
| | * | | | | | [ticket/13779] Add permission set testsrxu2015-06-062-0/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13779
| | * | | | | | [ticket/13779] Set new auth options to the role only if matching the role typerxu2015-04-261-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrations' permission tool allows setting permissions to the role which doesn't match the role type, e.g. m_ permissions for u_ role types and so on. As one of side effects, this may lead to granting users moderative/admin permissions silently. With this patch the only new permissions matching the role type will be set. PHPBB3-13779
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+49
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3486 from brunoais/ticket/13693Marc Alexander2015-06-091-0/+49
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13693] Allow modifying the MySQL author search query
| | * | | | | | | [ticket/13693] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13693
| | * | | | | | | [ticket/13693] Allow modifying the MySQL author search querybrunoais2015-03-121-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13693
* | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+49
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #3485 from brunoais/ticket/13694Marc Alexander2015-06-091-0/+49
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13694] Allow modifying the Postgres native author search query for results
| | * | | | | | | | [ticket/13694] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13694
| | * | | | | | | | [ticket/13694] Allow modifying the Postgres native author search querybrunoais2015-03-121-0/+49
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13694
* | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+43
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #3484 from brunoais/ticket/13691Marc Alexander2015-06-091-0/+43
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13691] Allow modifying the fulltext native search query for total results for author
| | * | | | | | | | [ticket/13691] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13691
| | * | | | | | | | [ticket/13691] Allow changing query to search for posts by author in nativebrunoais2015-03-121-0/+43
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13691
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-21 02:15:27 +0000