aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11747] ucp_prefs_personal core eventsMatt Friedman2013-07-261-0/+25
| | | | PHPBB3-11747
* [ticket/11747] Add $phpbb_dispatcher to globalMatt Friedman2013-07-261-1/+1
| | | | PHPBB3-11747
* 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
* | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11667Nathan Guse2013-07-23373-2157/+5085
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 pull request #1601 from nickvergessen/ticket/11734Nathan Guse2013-07-231-0/+11
| |\ \ \ \ | | | | | | | | | | | | [ticket/11734] Readd accidently removed language strings of forum permissions
| | * | | | [ticket/11734] Readd accidently removed language strings of forum permissionsJoas Schilling2013-07-231-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11734
| * | | | | 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-232-2/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * asperous/ticket/11731: [ticket/11731] Remove static calls to captcha garbage collector
| | * | | | | | [ticket/11731] Remove static calls to captcha garbage collectorAndy Chase2013-07-222-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-224-5/+9
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | [ticket/11717] Use topic_posts_approved instead of topic_replies
| | * | | | | [ticket/11717] Add 'has' to boolean variable and reduce line lengthMarc Alexander2013-07-221-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11717
| | * | | | | [ticket/11717] Use topic_posts_approved instead of topic_repliesMarc Alexander2013-07-204-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-226-219/+523
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Ticket/11582 Split permission logic from translations
| | * | | | | | [ticket/11582] Move global declaration to beginning of blockJoas Schilling2013-07-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| | * | | | | | [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/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| | * | | | | | [ticket/11582] Fix missing closing bracketJoas Schilling2013-07-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| | * | | | | | [ticket/11582] Fix missing @params in the doc blocksJoas Schilling2013-07-141-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| | * | | | | | [ticket/11582] Remove useless prefixJoas Schilling2013-07-141-133/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| | * | | | | | [ticket/11582] Fix documentation for adding permissionsJoas Schilling2013-07-141-27/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| | * | | | | | [ticket/11582] Split permission language strings from logicJoas Schilling2013-07-142-258/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| | * | | | | | [ticket/11582] Remove left over calls to lang['acl_*']Joas Schilling2013-07-142-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| | * | | | | | [ticket/11582] Use member isntead of a new variable everytimeJoas Schilling2013-07-142-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| | * | | | | | [ticket/11582] Use new methods and remove duplicated entriesJoas Schilling2013-07-145-32/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| | * | | | | | [ticket/11582] Add methods to return the language stringJoas Schilling2013-07-144-10/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| | * | | | | | [ticket/11582] Add event in constructor and add docsJoas Schilling2013-07-142-42/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| | * | | | | | [ticket/11582] Fix event dispatcher class nameJoas Schilling2013-07-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
| | * | | | | | [ticket/11582] Use new class for categoriesJoas Schilling2013-07-144-37/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11582
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-19 07:51:08 +0000