aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11781] Include func update_post_information()Vjacheslav Trushkin2013-08-111-0/+5
| | | | | | Include functions_posting before using functions defined in that file PHPBB3-11781
* Merge pull request #1633 from nickvergessen/ticket/11751Nathan Guse2013-08-091-0/+55
|\ | | | | [ticket/11751] Add mcp modules for softdelete on update
| * [ticket/11751] Add mcp modules for softdelete on updateJoas Schilling2013-07-311-0/+55
| | | | | | | | PHPBB3-11751
* | Merge remote-tracking branch 'EXreaction/ticket/11701' into developJoas Schilling2013-08-092-10/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11701: [ticket/11701] New line at EOF [ticket/11701] Test events in loops [ticket/11701] Refix regex for appending |length [ticket/11701] Fix regex for appending |length [ticket/11701] Fix loops var check [ticket/11701] Remove useless str_replace [ticket/11701] Loop variables are not passed correctly to events
| * | [ticket/11701] Refix regex for appending |lengthNathaniel Guse2013-07-231-2/+2
| | | | | | | | | | | | PHPBB3-11701
| * | [ticket/11701] Fix regex for appending |lengthNathaniel Guse2013-07-231-2/+2
| | | | | | | | | | | | PHPBB3-11701
| * | [ticket/11701] Fix loops var checkNathaniel Guse2013-07-231-2/+6
| | | | | | | | | | | | PHPBB3-11701
| * | [ticket/11701] Remove useless str_replaceNathaniel Guse2013-07-231-3/+0
| | | | | | | | | | | | PHPBB3-11701
| * | [ticket/11701] Loop variables are not passed correctly to eventsNathaniel Guse2013-07-232-7/+7
| | | | | | | | | | | | PHPBB3-11701
* | | Merge remote-tracking branch 'nickvergessen/ticket/11574' into developDhruv2013-08-083-7/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (16) and Igor Wiedler (6) # Via Joas Schilling (5) and Igor Wiedler (2) * nickvergessen/ticket/11574: (22 commits) [ticket/11574] Remove install/udpate/new/ fallback from database_update.php [ticket/11574] Do not display incompatible package note after successful update [ticket/11574] Remove old "continue step"-message [ticket/11574] Change order of files and database update [ticket/11574] Fix more issues in the updater [ticket/11574] Add trailing slash for consistency [ticket/11574] Fix table prefix in database updater [ticket/11574] Fix various path issues in the updater [ticket/11574] Make install language filename less crazy [ticket/11574] Use alternate DI config file for updater [ticket/11574] Include normalizer so it loads form the correct directory [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;) [ticket/11574] Use log object instead of old function [ticket/11574] Include vendor into update packages [ticket/11574] Create phpbb_log object before using it. [ticket/11574] Add correct language parameter to return links [ticket/11574] Use request object rather then request_var function [ticket/11574] Load new language files whenever possible [ticket/11574] Require new files in install/index.php and add a class loader [ticket/11574] Require new files in database_update.php and add a class loader ...
| * \ \ Merge remote-tracking branch 'phpbb/develop' into ticket/11574Joas Schilling2013-07-309-22/+385
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (130 commits) [ticket/11638] Changed the layout to match the other similar commits [ticket/11640] removed the space that I wonder what it was doing there. [ticket/11749] Move event after all template data has been defined [ticket/10917] Variable used only once so delete it [ticket/10917] Revert use of phpbb wrapper [ticket/11749] Template events for topic_list_row_pre/append [ticket/11749] PHP Events for viewforum.php [ticket/11749] PHP Events for search.php [ticket/11740] Update FAQ to include Ideas Centre [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/10917] Using phpbb wrapper [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version [ticket/11741] Fix empty brackets and remove bullet [ticket/11638] Removed the unneeded reset. [ticket/11638] Use the $parse_flags like the other commits [ticket/11638] Reverted to use the $parse tags way as the other ones [ticket/11638] Updated: bitwise $parse_flags use optionset() [ticket/11656] Made the check for the bitfield just like other PR's [ticket/11667] Use @inheritdoc ...
| * | | | [ticket/11574] Fix more issues in the updaterIgor Wiedler2013-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Stupid mistake in phpbb_create_update_container * Do not bootstrap extensions in installer/updater * Fix template lookup in installer/updater * Do not attempt to delete posts from bots The latter is a really fun problem. Since deleting posts now depends on a new db column that does not exist yet, we cannot call delete_post from a migration, ever. By using retain, we can hack around the issue for now. PHPBB3-11574
| * | | | Merge remote-tracking branch 'upstream/develop' into ticket/11574Igor Wiedler2013-07-141-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: [ticket/11704] Use the correct directory for dependency checking. [ticket/11704] Correctly escape " [ticket/11697] author_search() used incorrect parameter
| * | | | | Merge remote-tracking branch 'upstream/develop' into ticket/11574Igor Wiedler2013-07-142-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (575 commits) [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php [ticket/11696] Move file to new directory [ticket/11696] Rename constructor to __construct() [ticket/11696] Remove manual loading of db_tools in extension controller test [ticket/11696] Rename db_tools.php so it can be autoloaded [ticket/11698] Moving all autoloadable files to phpbb/ [ticket/11694] Do not locate assets with root path [ticket/11692] Don't update search_type in dev migration if already appended [ticket/11675] Fix template loop [ticket/11690] Old module class names may get autoloaded by class_exists [ticket/9649] Display information on index for moderators on unapproved posts [ticket/10999] Fix assets_version in ACP [prep-release-3.0.12] More changelog items for the 3.0.12 release. [ticket/11687] Add assets_version to phpbb_config [ticket/11686] Not checking for phpBB Debug errors on functional tests [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)". [ticket/11674] Do not include vendor folder if there are no dependencies. [ticket/11685] Remove logout confirmation page [ticket/11684] Remove useless confirmation page after login and admin login [ticket/9657] Define user before injecting ... Conflicts: phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php
* | | | | | [ticket/11759] Change lowercase to uppercaseOliver Schramm2013-08-0224-47/+47
| |_|_|_|/ |/| | | | | | | | | | | | | | PHPBB3-11759
* | | | | 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
* | | | | [ticket/11757] Fix typo in signature_module_auth migrationOliver Schramm2013-07-301-1/+1
| |_|/ / |/| | | | | | | | | | | PHPBB3-11757
* | | | [ticket/11667] Use @inheritdocNathan Guse2013-07-232-14/+4
| | | | | | | | | | | | | | | | PHPBB3-11667
* | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11667Nathan Guse2013-07-233-9/+36
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (224) and others # Via Andreas Fischer (23) and others * 'develop' of github.com:phpbb/phpbb3: (385 commits) [ticket/11734] Readd accidently removed language strings of forum permissions [ticket/11620] Whitespace and combine function into test_case [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity [ticket/11620] Changed incorrect global variable [ticket/11620] Minor indentation changes and comment clarity [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed [ticket/11733] Add browse test for feed.php [ticket/11731] Remove static calls to captcha garbage collector [ticket/11728] Replace topic_approved with topic_visibility [ticket/11620] Expected and actual test conditions wrongly swapped [ticket/11620] Space between . in directory import concatenation [ticket/11620] Changes to match merge [ticket/11620] Changes for code guidelines consistency [ticket/11620] Fix a static calls to non-static for session captcha [ticket/11620] Cleanup creation_test that was renamed on a cherry-pick [ticket/11620] Update auth_provider for new interface [ticket/11620] Added garbage_collection_test [ticket/11620] Fixed check_ban_test errors with cache and ban warning message [ticket/11620] Fixed a typo on check_ban_test [ticket/11620] Refactored check_isvalid_test to use session_test_case ...
* | | Merge remote-tracking branch 'EXreaction/ticket/11718' into developAndreas Fischer2013-07-231-4/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11718: [ticket/11718] Quick test for fixes in ELSEIF [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF Conflicts: tests/template/template_test.php
| * | | [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIFNathaniel Guse2013-07-191-4/+5
| | | | | | | | | | | | | | | | PHPBB3-11718
* | | | Merge remote-tracking branch 'nickvergessen/ticket/11733' into developAndreas Fischer2013-07-231-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11733: [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed [ticket/11733] Add browse test for feed.php
| * | | | [ticket/11733] Fix "Illegal offset type" Warning caused by overall feedJoas Schilling2013-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11733
* | | | | Merge remote-tracking branch 'asperous/ticket/11731' into developAndreas Fischer2013-07-231-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * asperous/ticket/11731: [ticket/11731] Remove static calls to captcha garbage collector
| * | | | | [ticket/11731] Remove static calls to captcha garbage collectorAndy Chase2013-07-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11731
* | | | | | [ticket/11728] Replace topic_approved with topic_visibilityJoas Schilling2013-07-221-1/+1
| |/ / / / |/| | | | | | | | | | | | | | PHPBB3-11728
* | | | | Merge pull request #1589 from marc1706/ticket/11717Nathan Guse2013-07-221-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | [ticket/11717] Use topic_posts_approved instead of topic_replies
| * | | | [ticket/11717] Use topic_posts_approved instead of topic_repliesMarc Alexander2013-07-201-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Due to the move to soft-delete, the topic_replies column no longer exists in the topics table. Instead, the column topic_posts_approved should be used. PHPBB3-11717
* | | | Merge pull request #1513 from nickvergessen/ticket/11582Nathan Guse2013-07-221-0/+340
|\ \ \ \ | | | | | | | | | | Ticket/11582 Split permission logic from translations
| * | | | [ticket/11582] Test the event and and fix it.Joas Schilling2013-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| * | | | [ticket/11582] Move file to new directoryJoas Schilling2013-07-141-0/+340
| | |/ / | |/| | | | | | | | | | PHPBB3-11582
* | | | [ticket/11707] Twig DEFINE not working as expectedNathaniel Guse2013-07-191-4/+8
| |/ / |/| | | | | | | | PHPBB3-11707
* | | [ticket/11706] Use @ to suppress errors for getimagesize in remote avatarMarc Alexander2013-07-141-1/+1
| |/ |/| | | | | PHPBB3-11706
* | Merge remote-tracking branch 'galaxyAbstractor/ticket/11697' into developAndreas Fischer2013-07-141-1/+1
|/ | | | | * galaxyAbstractor/ticket/11697: [ticket/11697] author_search() used incorrect parameter
* [ticket/11696] Move file to new directoryJoas Schilling2013-07-141-0/+2486
| | | | PHPBB3-11696
* [ticket/11696] Rename db_tools.php so it can be autoloadedJoas Schilling2013-07-141-5/+0
| | | | PHPBB3-11696
* [ticket/11698] Moving all autoloadable files to phpbb/Nils Adermann2013-07-14246-0/+46786
PHPBB3-11698
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-30 20:38:44 +0000