aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * [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
* | | | [ticket/11749] Move event after all template data has been definedMatt Friedman2013-07-291-13/+15
| | | | | | | | | | | | | | | | PHPBB3-11749
* | | | [ticket/11749] Template events for topic_list_row_pre/appendMatt Friedman2013-07-275-0/+28
| | | | | | | | | | | | | | | | PHPBB3-11749
* | | | [ticket/11749] PHP Events for viewforum.phpMatt Friedman2013-07-271-0/+21
| | | | | | | | | | | | | | | | PHPBB3-11749
* | | | [ticket/11749] PHP Events for search.phpMatt Friedman2013-07-271-0/+23
| | | | | | | | | | | | | | | | PHPBB3-11749
* | | | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-251-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | # By Oliver Schramm # Via Nathaniel Guse (1) and Oliver Schramm (1) * develop-olympus: [ticket/10917] Using phpbb wrapper [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
| * | | Merge remote-tracking branch 'remotes/Elsensee/ticket/10917' into ↵Nathaniel Guse2013-07-251-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus # By Oliver Schramm # Via Oliver Schramm * remotes/Elsensee/ticket/10917: [ticket/10917] Using phpbb wrapper [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
| | * | | [ticket/10917] Using phpbb wrapperOliver Schramm2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10917
| | * | | [ticket/10917] Fixed notice that files are out of date when updating to an ↵Oliver Schramm2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unreleased version PHPBB3-10917
* | | | | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-251-1/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oliver Schramm # Via Nathaniel Guse (1) and Oliver Schramm (1) * develop-olympus: [ticket/11062] If user's language is english there is no further work needed [ticket/11062] Load new strings from user's language file if provided
| * | | | Merge remote-tracking branch 'remotes/Elsensee/ticket/11062' into ↵Nathaniel Guse2013-07-251-1/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus # By Oliver Schramm # Via Oliver Schramm * remotes/Elsensee/ticket/11062: [ticket/11062] If user's language is english there is no further work needed [ticket/11062] Load new strings from user's language file if provided
| | * | | | [ticket/11062] If user's language is english there is no further work neededOliver Schramm2013-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11062
| | * | | | [ticket/11062] Load new strings from user's language file if providedOliver Schramm2013-07-251-0/+7
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-11062
* | | | | Merge remote-tracking branch 'Elsensee/ticket/11741' into developAndreas Fischer2013-07-251-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/11741: [ticket/11741] Fix empty brackets and remove bullet
| * | | | | [ticket/11741] Fix empty brackets and remove bulletOliver Schramm2013-07-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11741
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-251-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/11740] Update FAQ to include Ideas Centre
| * | | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-251-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11740] Update FAQ to include Ideas Centre
| | * | | | [ticket/11740] Update FAQ to include Ideas CentreMichaelC2013-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11740
* | | | | | Merge remote-tracking branch 'brunoais/ticket/11656' into developJoas Schilling2013-07-241-11/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11656: [ticket/11656] Made the check for the bitfield just like other PR's [ticket/11656] Wrong bitwise OR [ticket/11656] Remove line break in function call [ticket/11656] generate_text_for_display on memberlist.php
| * | | | | [ticket/11656] Made the check for the bitfield just like other PR'sBruno Ais2013-07-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11656
| * | | | | [ticket/11656] Wrong bitwise ORBruno Ais2013-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11656
| * | | | | [ticket/11656] Remove line break in function callBruno Ais2013-07-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11656
| * | | | | [ticket/11656] generate_text_for_display on memberlist.phpBruno Ais2013-07-131-11/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11656
* | | | | [ticket/11667] Use @inheritdocNathan Guse2013-07-232-14/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11667
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-20 06:53:51 +0000