aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ticket/8319' into ticket/8319-develop2Joas Schilling2013-07-102-4/+13
|\
| * [ticket/8319] Do not repeat the replacementJoas Schilling2013-07-101-9/+5
| * [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URLJoas Schilling2013-06-032-3/+4
| * [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on updateJoas Schilling2013-06-031-0/+30
| * [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL partsJoas Schilling2013-06-031-0/+4
| * [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuseJoas Schilling2013-06-031-1/+9
* | Merge remote-tracking branch 'remotes/imkingdavid/ticket/11253' into developNathan Guse2013-07-061-0/+51
|\ \
| * | [ticket/11253] Put AND clause in correct SQL queryDavid King2013-06-231-3/+3
| * | [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
| * | [ticket/11253] Add migration to add auth check to UCP signature moduleDavid King2013-06-221-0/+52
* | | Merge branch 'develop-olympus' into developNathan Guse2013-07-052-1/+76
|\ \ \
| * \ \ Merge remote-tracking branch 'remotes/bantu/ticket/11619' into develop-olympusNathan Guse2013-07-052-1/+76
| |\ \ \
| | * | | [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.Andreas Fischer2013-07-031-1/+1
| | * | | [ticket/11619] Some tests for get_remote_file().Andreas Fischer2013-07-031-0/+75
| |/ / /
* | | | Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into developAndreas Fischer2013-07-055-0/+10
|\ \ \ \
| * | | | [feature/auth-refactor] Move auth providers to separate directoryJoseph Warner2013-07-045-0/+10
|/ / / /
* | | | Merge remote-tracking branch 'VSEphpbb/ticket/11577' into developAndreas Fischer2013-07-031-1/+1
|\ \ \ \
| * | | | [ticket/11577] Readjust min-height to 35pxMatt Friedman2013-06-291-1/+1
| * | | | [ticket/11577] Correct over-sized Topic RowsMatt Friedman2013-05-281-1/+1
* | | | | Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into developDavid King2013-07-0318-1005/+1507
|\ \ \ \ \
| * | | | | [feature/auth-refactor] Fix code style issueJoseph Warner2013-07-021-2/+2
| * | | | | [feature/auth-refactor] Fix comment grammarJoseph Warner2013-07-021-1/+1
| * | | | | [feature/auth-refactor] Fix the actual cause of test failuresJoseph Warner2013-07-012-2/+5
| * | | | | [feature/auth-refactor] A possible fix for the functional test failuresJoseph Warner2013-07-011-1/+1
| * | | | | [feature/auth-refactor] Forgot @inheritdoc on methodsJoseph Warner2013-06-283-0/+54
| * | | | | [feature/auth-refactor] Finish and clean up documentationJoseph Warner2013-06-274-74/+43
| * | | | | [feature/auth-refactor] Change phpEx to php_ext in new classesJoseph Warner2013-06-262-9/+9
| * | | | | [feature/auth-refactor] Fix two session tests broken by changesJoseph Warner2013-06-262-0/+26
| * | | | | [feature/auth-refactor] Removed no longer used variableJoseph Warner2013-06-261-1/+0
| * | | | | [feature/auth-refactor] Fix errors in acp_boardJoseph Warner2013-06-251-2/+2
| * | | | | [feature/auth-refactor] Fix indentation on acp_boardJoseph Warner2013-06-251-41/+38
| * | | | | [feature/auth-refactor] Refactor auth in acp_boardJoseph Warner2013-06-251-22/+3
| * | | | | [feature/auth-refactor] Don't truncate name then reattach same thingJoseph Warner2013-06-251-4/+4
| * | | | | [feature/auth-refactor] Remove old auth pluginsJoseph Warner2013-06-253-886/+0
| * | | | | [feature/auth-refactor] Remove references to old auth pluginsJoseph Warner2013-06-251-29/+9
| * | | | | [feature/auth-refactor] Fix auth tests to use mock objects correctlyJoseph Warner2013-06-251-25/+123
| * | | | | [feature/auth-refactor] Test validate_session on provider_apacheJoseph Warner2013-06-251-1/+5
| * | | | | [feature/auth-refactor] Test autologin() on provider_apacheJoseph Warner2013-06-251-0/+28
| * | | | | [feature/auth-refactor] Test login() for provider_apacheJoseph Warner2013-06-251-1/+20
| * | | | | [feature/auth-refactor] Test for init on provider_apacheJoseph Warner2013-06-251-4/+12
| * | | | | [feature/auth-refactor] Skeleton of provider_apache_testJoseph Warner2013-06-251-0/+49
| * | | | | [feature/auth-refactor] Finish provider_db unit test for loginJoseph Warner2013-06-251-2/+12
| * | | | | [feature/auth-refactor] Initial auth unit test provider_dbJoseph Warner2013-06-242-0/+73
| * | | | | [feature/auth-refactor] Refactor code to use servicesJoseph Warner2013-06-213-40/+24
| * | | | | [feature/auth-refactor] Create an auth.provider_collector serviceJoseph Warner2013-06-201-0/+12
| * | | | | [feature/auth-refactor] Convert provider_apache to a serviceJoseph Warner2013-06-202-41/+55
| * | | | | [feature/auth-refactor] Convert provider_ldap to a serviceJoseph Warner2013-06-202-59/+67
| * | | | | [feature/auth-refactor] Turn provider_db into a serviceJoseph Warner2013-06-202-41/+74
| * | | | | [feature/auth-refactor] Start turning auth providers into servicesJoseph Warner2013-06-202-0/+2