aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Andreas Fischer2015-06-161-10/+10
|\ | | | | | | | | * 3.1.x: [ticket/12952] Check obvious errors before status in functional tests
| * Merge pull request #3710 from marc1706/ticket/12952Andreas Fischer2015-06-161-10/+10
| |\ | | | | | | | | | | | | | | | | | | [ticket/12952] Check obvious errors before status in functional tests * marc1706/ticket/12952: [ticket/12952] Check obvious errors before status in functional tests
| | * [ticket/12952] Check obvious errors before status in functional testsMarc Alexander2015-06-161-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | This will change the output from just saying that the status did not match the expected one to actually showing any errors before complaining about a possible difference in the status code. PHPBB3-12952
* | | Merge branch '3.1.x'Marc Alexander2015-06-1613-15/+54
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/phpbb/user_loader.php
| * | Merge pull request #3653 from callumacrae/ticket/13882Marc Alexander2015-06-1613-15/+54
| |\ \ | | |/ | |/| | | | [ticket/13882] Lazy load the notification avatars.
| | * [ticket/13882] Added tiny docblock to lazyLoadAvatarsCallum Macrae2015-05-301-0/+3
| | | | | | | | | | | | PHPBB3-13882
| | * [ticket/13882] no more egyptian brackets /o/Callum Macrae2015-05-301-2/+5
| | | | | | | | | | | | PHPBB3-13882
| | * [ticket/13882] Lazy load the notification avatars.Callum Macrae2015-05-2813-15/+48
| | | | | | | | | | | | | | | | | | | | | This moves them further down the waterfall, making the page load quicker. PHPBB3-13882
* | | Merge branch '3.1.x'CHItA2015-06-161-0/+1
|\ \ \ | |/ /
| * | Merge branch 'nickvergessen/ticket/13947' into 3.1.xCHItA2015-06-161-0/+1
| |\ \
| | * | [ticket/13947] Add CHItA to the list of developersJoas Schilling2015-06-161-0/+1
| |/ / | | | | | | | | | PHPBB3-13947
* | | Merge branch '3.1.x'Joas Schilling2015-06-148-21/+68
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: build/build.xml phpBB/phpbb/user.php
| * | Merge branch 'prep-release-3.1.5' into 3.1.xJoas Schilling2015-06-149-22/+69
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * | [prep-release-3.1.5] Add migration for 3.1.5Joas Schilling2015-06-141-0/+31
| | | |
| | * | [prep-release-3.1.5] Update version for final 3.1.5 releaseJoas Schilling2015-06-144-4/+6
| | | |
| | * | Merge branch 'ticket/13938' into prep-release-3.1.5Joas Schilling2015-06-144-18/+32
| | |\ \
| | | * | [ticket/13938] Fix inconsistencies between <link> tagscyberalien2015-06-141-9/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-13938
| | | * | [ticket/13938] Remove type and / from <link> elementscyberalien2015-06-142-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13938
| | | * | [ticket/13938] Change web font code in simple_headercyberalien2015-06-141-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply ticket 13876 to simple_header.html PHPBB3-13938
| | | * | [ticket/13938] Remove link to print.css in simple_header.htmlcyberalien2015-06-141-7/+6
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Remaining fixes for ticket 13873: remove link to print.css and remove type and media from other links. PHPBB3-13938
| | * | Merge pull request #3706 from marc1706/ticket/13942Joas Schilling2015-06-141-1/+1
| | |\ \ | | | | | | | | | | | | | | | [ticket/13942] Check if path to language file contains language path
| | | * | [ticket/13942] Check if path to language file contains language pathMarc Alexander2015-06-131-1/+1
| | |/ / | | | | | | | | | | | | PHPBB3-13942
| | * | Merge branch 'ticket/13939' into prep-release-3.1.5Joas Schilling2015-06-131-1/+1
| | |\ \
| | | * | [ticket/13939] Check if loadingIndicator exists before accessing itcyberalien2015-06-131-1/+1
| | |/ / | | | | | | | | | | | | PHPBB3-13939
* | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 01:18:34 +0000