aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNathaniel Guse2013-07-111-1/+6
|\ | | | | | | | | | | | | # By Igor Wiedler # Via Igor Wiedler (1) and Nathaniel Guse (1) * develop-olympus: [ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
| * Merge remote-tracking branch 'remotes/igorw/ticket/11644' into develop-olympusNathaniel Guse2013-07-111-1/+6
| |\ | | | | | | | | | | | | | | | | | | # By Igor Wiedler # Via Igor Wiedler * remotes/igorw/ticket/11644: [ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
| | * [ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6Igor Wiedler2013-07-111-1/+6
| | | | | | | | | | | | PHPBB3-11644
* | | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-110-0/+0
|\ \ \ | |/ / | | | | | | * develop-olympus:
| * | Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympusNathaniel Guse2013-07-113-4/+43
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/8319: [ticket/8319] Do not repeat the replacement [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
* | | Merge remote-tracking branch 'remotes/nickv/ticket/8319-develop' into developNathaniel Guse2013-07-113-4/+70
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/8319-develop: [ticket/8319] Add migration file for update change [ticket/8319] Do not repeat the replacement [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
| * | | [ticket/8319] Add migration file for update changeJoas Schilling2013-07-101-0/+57
| | | | | | | | | | | | | | | | PHPBB3-8319
| * | | Merge branch 'ticket/8319' into ticket/8319-develop2Joas Schilling2013-07-102-4/+13
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/8319: [ticket/8319] Do not repeat the replacement [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse Conflicts: phpBB/install/database_update.php
| | * | [ticket/8319] Do not repeat the replacementJoas Schilling2013-07-101-9/+5
| | | | | | | | | | | | | | | | PHPBB3-8319
| | * | [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URLJoas Schilling2013-06-032-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | The explanation now states that links are prefixed with the board URL. PHPBB3-8319
| | * | [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on updateJoas Schilling2013-06-031-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To fix http://tracker.phpbb.com/browse/PHPBB3-8319 we changed the second_pass_replace value, so that needs updating for existing ones. PHPBB3-8319
| | * | [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL partsJoas Schilling2013-06-031-0/+4
| | | | | | | | | | | | | | | | PHPBB3-8319
| | * | [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuseJoas Schilling2013-06-031-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The description says: "The URL must be relative to the topic page and cannot contain a server name or protocol." We now enforce this and will add a new token with the current behaviour back. PHPBB3-8319
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-111-52/+5
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| * develop-olympus: [ticket/11630] Improvements to the PHP lint pre-commit hook
| * | Merge remote-tracking branch 'EXreaction/ticket/11630' into develop-olympusAndreas Fischer2013-07-111-52/+5
| |\ \ | | | | | | | | | | | | | | | | * EXreaction/ticket/11630: [ticket/11630] Improvements to the PHP lint pre-commit hook
| | * | [ticket/11630] Improvements to the PHP lint pre-commit hookMatthew Fonda2013-07-061-52/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The PHP lint pre-commit hook fails to display any output when an error other than a parse error is decteced. Additionally, the hook may not display any meaningful output depending on php.ini settings. This commit removes the dependency on php.ini. PHPBB3-11630
* | | Merge remote-tracking branch 'remotes/imkingdavid/ticket/11253' into developNathan Guse2013-07-061-0/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By David King # Via David King * remotes/imkingdavid/ticket/11253: [ticket/11253] Put AND clause in correct SQL query [ticket/11253] Fix a few things brought up in the PR [ticket/11253] Fix typo in constant [ticket/11253] Add migration to add auth check to UCP signature module
| * | | [ticket/11253] Put AND clause in correct SQL queryDavid King2013-06-231-3/+3
| | | | | | | | | | | | | | | | PHPBB3-11253
| * | | [ticket/11253] Fix a few things brought up in the PRDavid King2013-06-231-7/+6
| | | |
| * | | [ticket/11253] Fix typo in constantDavid King2013-06-221-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11253
| * | | [ticket/11253] Add migration to add auth check to UCP signature moduleDavid King2013-06-221-0/+52
| | | | | | | | | | | | | | | | PHPBB3-11253
* | | | Merge branch 'develop-olympus' into developNathan Guse2013-07-052-1/+76
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Nathan Guse (1) * develop-olympus: [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file().
| * | | Merge remote-tracking branch 'remotes/bantu/ticket/11619' into develop-olympusNathan Guse2013-07-052-1/+76
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * remotes/bantu/ticket/11619: [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file().
| | * | | [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.Andreas Fischer2013-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11619
| | * | | [ticket/11619] Some tests for get_remote_file().Andreas Fischer2013-07-031-0/+75
| |/ / / | | | | | | | | | | | | PHPBB3-11619
* | | | Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into developAndreas Fischer2013-07-055-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * Hardolaf/feature/auth-refactor: [feature/auth-refactor] Move auth providers to separate directory
| * | | | [feature/auth-refactor] Move auth providers to separate directoryJoseph Warner2013-07-045-0/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Moves the provider files to their own directory per bantu's suggestion. PHPBB3-9734
* | | | Merge remote-tracking branch 'VSEphpbb/ticket/11577' into developAndreas Fischer2013-07-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/11577: [ticket/11577] Readjust min-height to 35px [ticket/11577] Correct over-sized Topic Rows
| * | | | [ticket/11577] Readjust min-height to 35pxMatt Friedman2013-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing min-height to 35px in order to get pixel-for-pixel accurate height settings as before for topic-rows. PHPBB3-11577
| * | | | [ticket/11577] Correct over-sized Topic RowsMatt Friedman2013-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a change made in PR 1331 that oversized topic rows. Icons in topic rows, in Prosilver, are only 27px high, so we do not need a min-height as high as 40px. Setting it to 30px is more conservative and reclaims the original height of topic rows from before PR 1331. http://tracker.phpbb.com/browse/PHPBB3-11577 PHPBB3-11577
* | | | | Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into developDavid King2013-07-0318-1005/+1507
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Hardolaf/feature/auth-refactor: (44 commits) [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [feature/auth-refactor] A possible fix for the functional test failures [feature/auth-refactor] Forgot @inheritdoc on methods [feature/auth-refactor] Finish and clean up documentation [feature/auth-refactor] Change phpEx to php_ext in new classes [feature/auth-refactor] Fix two session tests broken by changes [feature/auth-refactor] Removed no longer used variable [feature/auth-refactor] Fix errors in acp_board [feature/auth-refactor] Fix indentation on acp_board [feature/auth-refactor] Refactor auth in acp_board [feature/auth-refactor] Don't truncate name then reattach same thing [feature/auth-refactor] Remove old auth plugins [feature/auth-refactor] Remove references to old auth plugins [feature/auth-refactor] Fix auth tests to use mock objects correctly [feature/auth-refactor] Test validate_session on provider_apache [feature/auth-refactor] Test autologin() on provider_apache [feature/auth-refactor] Test login() for provider_apache [feature/auth-refactor] Test for init on provider_apache ...
| * | | | | [feature/auth-refactor] Fix code style issueJoseph Warner2013-07-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9734
| * | | | | [feature/auth-refactor] Fix comment grammarJoseph Warner2013-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9734
| * | | | | [feature/auth-refactor] Fix the actual cause of test failuresJoseph Warner2013-07-012-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables super globals before the new container is instantiated in the final step of installation to prevent issues caused by trying to create a phpbb_request object when super globals are disabled. PHPBB3-9734
| * | | | | [feature/auth-refactor] A possible fix for the functional test failuresJoseph Warner2013-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't like this fix as it really shouldn't be needed. But it makes the functional tests pass. PHPBB3-9734
| * | | | | [feature/auth-refactor] Forgot @inheritdoc on methodsJoseph Warner2013-06-283-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9734
| * | | | | [feature/auth-refactor] Finish and clean up documentationJoseph Warner2013-06-274-74/+43
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9734
| * | | | | [feature/auth-refactor] Change phpEx to php_ext in new classesJoseph Warner2013-06-262-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9734
| * | | | | [feature/auth-refactor] Fix two session tests broken by changesJoseph Warner2013-06-262-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9734
| * | | | | [feature/auth-refactor] Removed no longer used variableJoseph Warner2013-06-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9734
| * | | | | [feature/auth-refactor] Fix errors in acp_boardJoseph Warner2013-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes errors introduced by the last several commits. PHPBB3-9734
| * | | | | [feature/auth-refactor] Fix indentation on acp_boardJoseph Warner2013-06-251-41/+38
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9734
| * | | | | [feature/auth-refactor] Refactor auth in acp_boardJoseph Warner2013-06-251-22/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the acp_board code to directly call the auth providers out of the $auth_providers variable that is populated by the phpbb_container. PHPBB3-9734
| * | | | | [feature/auth-refactor] Don't truncate name then reattach same thingJoseph Warner2013-06-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9734
| * | | | | [feature/auth-refactor] Remove old auth pluginsJoseph Warner2013-06-253-886/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9734
| * | | | | [feature/auth-refactor] Remove references to old auth pluginsJoseph Warner2013-06-251-29/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes what is hopefully the last references to the old auth plugins in the code base. PHPBB3-9734
| * | | | | [feature/auth-refactor] Fix auth tests to use mock objects correctlyJoseph Warner2013-06-251-25/+123
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9734
| * | | | | [feature/auth-refactor] Test validate_session on provider_apacheJoseph Warner2013-06-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provides a test for the validate_session() method of provider_apache. PHPBB3-9734
| * | | | | [feature/auth-refactor] Test autologin() on provider_apacheJoseph Warner2013-06-251-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provides a test for the autologin() method of provider_apache that assumes the user already exists in the database. PHPBB3-9734
| * | | | | [feature/auth-refactor] Test login() for provider_apacheJoseph Warner2013-06-251-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provides a test for the login() method for provider_apache. Appears to be failing due to an issue with the mock phpBB request class. PHPBB3-9734
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 04:44:02 +0000