aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge remote-tracking branch 'Elsensee/ticket/8228' into developJoas Schilling2013-07-316-13/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/8228: [ticket/8228] Fix still existing problems with code in firefox [ticket/8228] Fix whitespaces before code in Firefox
| * | | | | | | [ticket/8228] Fix still existing problems with code in firefoxOliver Schramm2013-07-306-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A user of a board mentioned that there are still some problems in firefox if php-highlighting is on. So I used a snippet which they worked on for weeks. Link to the snippet (in german): http://www.ongray-design.de/forum/viewtopic.php?t=541 PHPBB3-8228
| * | | | | | | [ticket/8228] Fix whitespaces before code in FirefoxOliver Schramm2013-07-245-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on the "[code] enhancements" modification by TerraFrost PHPBB3-8228
* | | | | | | | Merge remote-tracking branch 'Elsensee/ticket/11757' into developDhruv2013-07-311-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oliver Schramm # Via Oliver Schramm * Elsensee/ticket/11757: [ticket/11757] Fix typo in signature_module_auth migration
| * | | | | | | | [ticket/11757] Fix typo in signature_module_auth migrationOliver Schramm2013-07-301-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11757
* | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into developJoas Schilling2013-07-301-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Bruno Ais # Via Bruno Ais (1) and Joas Schilling (1) * 'develop' of https://github.com/phpbb/phpbb3: [ticket/11638] Variable names goof...
| * \ \ \ \ \ \ \ Merge pull request #1630 from brunoais/ticket/11638Joas Schilling2013-07-301-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ticket/11638] Variable names goof...
| | * | | | | | | | [ticket/11638] Variable names goof...Bruno Ais2013-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11638
* | | | | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-301-0/+19
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | / / / / / | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/11753] Remove ?> from MySQL Upgrader. [ticket/11753] Update MySQL upgrader schema data.
| * | | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusJoas Schilling2013-07-301-2/+19
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11753] Remove ?> from MySQL Upgrader. [ticket/11753] Update MySQL upgrader schema data.
| | * | | | | | | Merge remote-tracking branch 'bantu/ticket/11753' into prep-release-3.0.12Joas Schilling2013-07-301-2/+19
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11753: [ticket/11753] Remove ?> from MySQL Upgrader. [ticket/11753] Update MySQL upgrader schema data.
| | | * | | | | | | [ticket/11753] Remove ?> from MySQL Upgrader.Andreas Fischer2013-07-301-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11753
| | | * | | | | | | [ticket/11753] Update MySQL upgrader schema data.Andreas Fischer2013-07-301-0/+19
| | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11753
* | | | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-301-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
| * | | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusJoas Schilling2013-07-301-1/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
| | * | | | | | | Merge remote-tracking branch 'bantu/ticket/11524' into prep-release-3.0.12Joas Schilling2013-07-301-1/+2
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11524: [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
| | | * | | | | | | [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"Andreas Fischer2013-07-301-1/+2
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... on PHP 5.4 or higher. PHPBB3-11524
* | | | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-301-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11752] HTTP -> HTTPs in email/installed.txt
| * | | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusJoas Schilling2013-07-301-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11752] HTTP -> HTTPs in email/installed.txt
| | * | | | | | | Merge remote-tracking branch 'bantu/ticket/11752' into prep-release-3.0.12Joas Schilling2013-07-301-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11752: [ticket/11752] HTTP -> HTTPs in email/installed.txt
| | | * | | | | | [ticket/11752] HTTP -> HTTPs in email/installed.txtAndreas Fischer2013-07-301-1/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11752
* | | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-301-8/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10917] Variable used only once so delete it [ticket/10917] Revert use of phpbb wrapper
| * | | | | | | Merge remote-tracking branch 'Elsensee/ticket/10917-2' into develop-olympusJoas Schilling2013-07-301-8/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/10917-2: [ticket/10917] Variable used only once so delete it [ticket/10917] Revert use of phpbb wrapper
| | * | | | | | | [ticket/10917] Variable used only once so delete itOliver Schramm2013-07-281-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variable $this->unequal_version was only used once and only to display the version the package updates to. To display the version it updates to makes no sense when the update files just aren't meant to update from the current version. (It's already shown in an error message) So I deleted the variable from there. Furthermore the use of version_compare makes the variable useless in that context which is why I deleted the variable from the whole file and replaced it in the relevant if statement with the old comparison. PHPBB3-10917
| | * | | | | | | [ticket/10917] Revert use of phpbb wrapperOliver Schramm2013-07-271-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10917
* | | | | | | | Merge pull request #1625 from brunoais/ticket/11640Joas Schilling2013-07-291-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/11640] removed the space that I wonder what it was doing there.
| * | | | | | | | [ticket/11640] removed the space that I wonder what it was doing there.Bruno Ais2013-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11640
* | | | | | | | | Merge pull request #1624 from brunoais/ticket/11638Joas Schilling2013-07-291-8/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | [ticket/11638] Changed the layout to match the other similar commits
| * | | | | | | | [ticket/11638] Changed the layout to match the other similar commitsBruno Ais2013-07-291-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11638
* | | | | | | | | Merge pull request #1597 from marc1706/ticket/11723Nathan Guse2013-07-291-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ticket/11723] Correctly redirect user to agreement page and let him leave
| * | | | | | | | | [ticket/11723] Correctly redirect user to agreement page and let him leaveMarc Alexander2013-07-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch consists of two changes. The first one will make sure that $agree is correctly reset to 0 and the user redirected back to the agreement page after changing the display language. Secondly, by reseting 'change_lang', the user will be able to agree to the terms on the agreement page again. The changed language will still be kept, as this is correctly saved in the 'lang' field that is passed to the ucp_register page. The variable $agree has also been changed to be boolean. It is not used as an integer anywere in the ucp_register file. PHPBB3-11723
* | | | | | | | | | Merge pull request #1542 from brunoais/ticket/11638Nathan Guse2013-07-291-46/+10
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | [ticket/11638] generate_text_for_display on viewtopic.php
| * | | | | | | | | [ticket/11638] Removed the unneeded reset.Bruno Ais2013-07-241-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11638
| * | | | | | | | | [ticket/11638] Use the $parse_flags like the other commitsBruno Ais2013-07-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11638
| * | | | | | | | | [ticket/11638] Reverted to use the $parse tags way as the other onesBruno Ais2013-07-241-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11638
| * | | | | | | | | [ticket/11638] Updated: bitwise $parse_flags use optionset()Bruno Ais2013-07-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11638
| * | | | | | | | | [ticket/11638] Fixed not following guidelines for bracketsBruno Ais2013-07-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11638
| * | | | | | | | | [ticket/11638] Fixed typo in the variable name.Bruno Ais2013-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11638
| * | | | | | | | | [ticket/11638] generate_text_for_display on viewtopic.phpBruno Ais2013-07-131-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lines: 1403-1417 sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11638
| * | | | | | | | | [ticket/11638] generate_text_for_display on viewtopic.phpBruno Ais2013-07-131-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lines: 1395-1403 sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11638
| * | | | | | | | | [ticket/11638] generate_text_for_display on viewtopic.phpBruno Ais2013-07-131-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lines: 846-854 sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11638
| * | | | | | | | | [ticket/11638] generate_text_for_display on viewtopic.phpBruno Ais2013-07-131-16/+5
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lines: 835-843 sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11638
* | | | | | | | | Merge pull request #1576 from brunoais/ticket/11640Nathan Guse2013-07-291-8/+5
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | [ticket/11640] generate_text_for_display on functions_privmsgs.php
| * | | | | | | | [ticket/11640] removed the unsetBruno Ais2013-07-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11640
| * | | | | | | | [ticket/11640] generate_text_for_display on functions_privmsgs.phpBruno Ais2013-07-161-8/+6
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11640
* | | | | | | | Merge pull request #1586 from brunoais/ticket/11654Nathan Guse2013-07-291-13/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/11654] generate_text_for_display on mcp/mcp_warn.php
| * | | | | | | | [ticket/11654] Moved some code to reduce line width.Bruno Ais2013-07-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11654
| * | | | | | | | [ticket/11654] first parameter failBruno Ais2013-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11654
| * | | | | | | | [ticket/11654] generate_text_for_display on mcp/mcp_warn.phpBruno Ais2013-07-181-13/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11654
* | | | | | | | Merge pull request #1619 from VSEphpbb/ticket/11749Nathan Guse2013-07-297-2/+76
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/11749] PHP and Template Events for Topic Preview Extension