aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/9550] Add template event memberlist_view_user_statistics_beforerechosen2013-08-022-0/+2
| | | | | | | | | | | | | Adds a template event required for the karma extension. It allows adding entries to the user statistics part of any user profile. Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379: Used by the karma extension to add a karma score indication that allows other users to see how respected this user is. Prepend because karma score is often a more meaningful statistic than the bottom statistics (like "Most active topic"), and should therefore be more prominent. PHPBB3-9550
* [ticket/11759] Change lowercase to uppercaseOliver Schramm2013-08-0224-47/+47
| | | | PHPBB3-11759
* Merge branch 'develop-olympus' into developAndreas Fischer2013-08-011-0/+5
|\ | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC2. Conflicts: build/build.xml phpBB/install/database_update.php
| * Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-012-0/+11
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC2. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release.Andreas Fischer2013-08-011-0/+5
| | |
| | * [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.Andreas Fischer2013-08-013-3/+9
| | |
* | | Merge remote-tracking branch 'brunoais/ticket/11653' into developJoas Schilling2013-08-011-7/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11653: [ticket/11653] Use $parse_flags [ticket/11653] generate_text_for_display on mcp/mcp_topic.php
| * | | [ticket/11653] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11653
| * | | [ticket/11653] generate_text_for_display on mcp/mcp_topic.phpBruno Ais2013-07-161-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11653
* | | | Merge remote-tracking branch 'brunoais/ticket/11655' into developJoas Schilling2013-08-011-26/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11655: [ticket/11653] Use $parse_flags [ticket/11653] Missing ";" [ticket/11655] Use $parse_flags [ticket/11655] wrong var names for the uid and for the bitfield [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.php
| * | | | [ticket/11653] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11653
| * | | | [ticket/11653] Missing ";"Bruno Ais2013-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11653
| * | | | [ticket/11655] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11655
| * | | | [ticket/11655] wrong var names for the uid and for the bitfieldBruno Ais2013-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11655
| * | | | [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.phpBruno Ais2013-07-191-26/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11655
* | | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-314-12/+42
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | * develop-olympus: [ticket/10037] Fix table in subsilver2 [ticket/10037] Apply attached patch with a few changes
| * | | Merge remote-tracking branch 'Elsensee/ticket/10037' into develop-olympusJoas Schilling2013-07-314-12/+42
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/10037: [ticket/10037] Fix table in subsilver2 [ticket/10037] Apply attached patch with a few changes
| | * | | [ticket/10037] Fix table in subsilver2Oliver Schramm2013-07-311-24/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks, nickvergessen! ;-) PHPBB3-10037
| | * | | [ticket/10037] Apply attached patch with a few changesOliver Schramm2013-07-254-5/+41
| | | | | | | | | | | | | | | | | | | | PHPBB3-10037
* | | | | Merge pull request #1563 from cyberalien/ticket/11688Nathan Guse2013-07-311-13/+57
|\ \ \ \ \ | | | | | | | | | | | | [ticket/11688] Purge TWIG cache
| * | | | | [ticket/11688] Fix docblockVjacheslav Trushkin2013-07-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11688
| * | | | | [ticket/11688] Rename purge_dir to remove_dirVjacheslav Trushkin2013-07-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11688
| * | | | | [ticket/11688] tpl_ files are no longer usedVjacheslav Trushkin2013-07-141-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove tpl_ and ctpl_ from cache->purge() because those prefixes are no longer used. PHPBB3-11688
| * | | | | [ticket/11688] Purge TWIG cacheVjacheslav Trushkin2013-07-141-13/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Purge directories Replace opendir() with DirectoryIterator PHPBB3-11688
* | | | | | Merge pull request #1632 from Elsensee/ticket/11464Joas Schilling2013-07-311-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/11464] Add missing and remove unnecessary database entry
| * | | | | | [ticket/11464] Add missing and remove unnecessary database entryOliver Schramm2013-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11464
* | | | | | | 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
* | | | | | | [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
| | * | | | | | | [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
| * | | | | | | [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