aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11747] ucp_prefs_view core eventsMatt Friedman2013-07-261-0/+25
| | | | PHPBB3-11747
* [ticket/11747] ucp_prefs_personal template eventsMatt Friedman2013-07-263-0/+18
| | | | PHPBB3-11747
* [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
| | * | Merge remote-tracking branch 'unknownbliss/ticket/11740' into ↵Andreas Fischer2013-07-251-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * unknownbliss/ticket/11740: [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
* | | | Merge remote-tracking branch 'EXreaction/ticket/11667' into developAndreas Fischer2013-07-244-9/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11667: [ticket/11667] Use @inheritdoc [ticket/11734] Readd accidently removed language strings of forum permissions [ticket/11667] Make functions abstract in includeasset [ticket/11667] includeasset should be abstract
| * | | | [ticket/11667] Use @inheritdocNathan Guse2013-07-232-14/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11667
| * | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11667Nathan Guse2013-07-23465-2533/+9519
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-233-5/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Quick test for fixes in ELSEIFNathaniel Guse2013-07-192-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11718
| * | | | | | [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIFNathaniel Guse2013-07-191-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11718
* | | | | | | Merge remote-tracking branch 'asperous/ticket/11620' into developAndreas Fischer2013-07-2320-204/+1014
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * asperous/ticket/11620: (46 commits) [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/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 [ticket/11615] Refactored isvalid test to be more imperative [ticket/11615] Rename continue -> check_isvalid for clarity [ticket/11620] Added a test for checking if users are banned [ticket/11620] Remove typo in beginning of session_key_test [ticket/11620] Typo in file name session_key_tests -> test ...
| * | | | | | [ticket/11620] Whitespace and combine function into test_caseAndy Chase2013-07-227-39/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | | [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarityAndy Chase2013-07-221-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | | [ticket/11620] Changed incorrect global variableAndy Chase2013-07-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | | [ticket/11620] Minor indentation changes and comment clarityAndy Chase2013-07-222-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | | Merge branch 'develop' into ticket/11620Andy Chase2013-07-225-8/+12
| |\ \ \ \ \ \
| * | | | | | | [ticket/11620] Expected and actual test conditions wrongly swappedAndy Chase2013-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | | | [ticket/11620] Space between . in directory import concatenationAndy Chase2013-07-229-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | | | [ticket/11620] Changes to match mergeAndy Chase2013-07-222-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | | | Merge branch 'develop' into ticket/11620Andy Chase2013-07-22498-5058/+11718
| |\ \ \ \ \ \ \
| * | | | | | | | [ticket/11620] Changes for code guidelines consistencyAndy Chase2013-07-223-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | | | | [ticket/11620] Fix a static calls to non-static for session captchaasperous2013-07-222-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes fixes an error in certain version of php that throws an error if you call a non-static method statically. PHPBB3-11620
| * | | | | | | | [ticket/11620] Cleanup creation_test that was renamed on a cherry-pickasperous2013-07-221-69/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | | | | [ticket/11620] Update auth_provider for new interfaceasperous2013-07-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | | | | [ticket/11620] Added garbage_collection_testasperous2013-07-222-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | | | | [ticket/11620] Fixed check_ban_test errors with cache and ban warning messageasperous2013-07-221-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | | | | [ticket/11620] Fixed a typo on check_ban_testasperous2013-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | | | | [ticket/11620] Refactored check_isvalid_test to use session_test_caseasperous2013-07-221-20/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the continue->isvalid refactoring is now in a branch with the session_test_case framework, this test can be refactored to use that framework. PHPBB3-11620
| * | | | | | | | [ticket/11615] Refactored isvalid test to be more imperativeAndy Chase2013-07-222-85/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring the continue/is_valid test to remove the confusing data provider work around, while still keeping redundancies down to a minimum. PHPBB3-11615
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-20 10:33:23 +0000