aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/9746] Adding unit tests for inet_ntop() and inet_pton().Andreas Fischer2011-01-032-0/+44
* [ticket/9746] Adding calls to phpbb_ip_normalise() from session management.Andreas Fischer2011-01-031-0/+18
* [ticket/9746] Adding new function phpbb_ip_normalise().Andreas Fischer2011-01-031-0/+53
* [ticket/9746] Adding tests for phpbb_ip_normalise().Andreas Fischer2011-01-032-0/+67
* Merge branch 'develop-olympus' into developAndreas Fischer2010-12-296-6/+6
|\
| * Merge branch 'ticket/bantu/9859' into develop-olympusAndreas Fischer2010-12-292-2/+2
| |\
| | * [ticket/9859] Remove years from the credit line.Andreas Fischer2010-12-162-2/+2
| * | Merge branch 'ticket/bantu/9348' into develop-olympusAndreas Fischer2010-12-291-1/+1
| |\ \
| | * | [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.Richard Foote2010-12-281-1/+1
| * | | Merge branch 'ticket/noxwizard/9953' into develop-olympusAndreas Fischer2010-12-292-2/+2
| |\ \ \
| | * | | [ticket/9953] Set focus to password on re-authenticationPatrick Webster2010-12-282-2/+2
| | |/ /
| * | | Merge branch 'ticket/noxwizard/9905' into develop-olympusAndreas Fischer2010-12-291-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/9905] Add SQLite to the DSN descriptionPatrick Webster2010-12-281-1/+1
| |/ /
* | | Merge branch 'feature/igorw/update-session-api' into developAndreas Fischer2010-12-291-9/+20
|\ \ \
| * | | [feature/update-session-api] Add update_session methodIgor Wiedler2010-12-291-9/+20
|/ / /
* | | Merge branch 'ticket/igorw/9574' into developAndreas Fischer2010-12-2810-241/+46
|\ \ \
| * | | [ticket/9574] Add pcre_utf8_support() functionIgor Wiedler2010-12-285-11/+21
| * | | [ticket/9574] Remove conditional PHP<5.2 codeIgor Wiedler2010-12-2810-136/+32
| * | | [ticket/9574] Drop fallback implementationsIgor Wiedler2010-12-281-101/+0
* | | | Merge branch 'ticket/VSE/9532' into developAndreas Fischer2010-12-285-4/+5
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/9532] Simplified page titles by removing meaningless text.Matt2010-05-165-4/+5
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-12-212-1/+10
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'ticket/igorw/9937' into develop-olympusAndreas Fischer2010-12-211-1/+1
| |\ \ \
| | * | | [ticket/9937] Make sure feed icon only shows for FORUM_POSTIgor Wiedler2010-12-211-1/+1
| |/ / /
| * | | Merge branch 'ticket/rmcgirr83/9937' into develop-olympusIgor Wiedler2010-12-211-1/+1
| |\ \ \
| | * | | [ticket/9937] The feed icon displays on External links...which we don't wantRMcGirr832010-12-211-1/+1
| * | | | Merge branch 'ticket/marc1706/9925' into develop-olympusIgor Wiedler2010-12-211-0/+9
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | [ticket/9925] prosilver logo margin bug in IE 6-7-8Marc Alexander2010-12-191-0/+9
| |/ / /
* | | | Merge branch 'feature/igorw/request-class' into developAndreas Fischer2010-12-1610-29/+38
|\ \ \ \
| * | | | [feature/request-class] Convert some remaining cookiesIgor Wiedler2010-10-176-15/+18
| * | | | [feature/request-class] Adjust misleading commentIgor Wiedler2010-10-171-1/+1
| * | | | [feature/request-class] Remove direct access to _REQUEST in acp_searchIgor Wiedler2010-10-172-11/+5
| * | | | [feature/request-class] Special case of direct access to _REQUESTIgor Wiedler2010-10-141-2/+14
* | | | | Merge branch 'develop-olympus' into developNils Adermann2010-12-132-1/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'ticket/igorw/9924' into develop-olympusNils Adermann2010-12-132-1/+3
| |\ \ \ \
| | * | | | [ticket/9924] Pass template instance into $template->display hookIgor Wiedler2010-11-232-1/+3
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2010-12-1317-33/+313
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'ticket/adamreyher/9928' into develop-olympusNils Adermann2010-12-131-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/9928] Do not link "login to your board" to the "send statistics" page.Adam Reyher2010-12-031-1/+1
| * | | | | | Merge branch 'task/naderman/phpdoc' into develop-olympusAndreas Fischer2010-12-132-1/+113
| |\ \ \ \ \ \
| | * | | | | | [task/phpdoc] Added a phpdoc task to the build processNils Adermann2010-12-131-1/+7
| | * | | | | | [task/phpdoc] Added a configuration file for phpDocumentor.Nils Adermann2010-12-131-0/+106
| * | | | | | | Merge branch 'feature/ChrisTX/acm-wincache' into develop-olympusAndreas Fischer2010-12-131-0/+84
| |\ \ \ \ \ \ \
| | * | | | | | | [feature/acm-wincache] Adding caching module for WinCache's User Cache.ChrisTX2010-12-131-0/+84
| | |/ / / / / /
| * | | | | | | Merge branch 'ticket/rxu/9851' into develop-olympusAndreas Fischer2010-12-132-22/+35
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | [ticket/9851] "Search new posts" should require login.rxu2010-12-132-22/+35
| |/ / / / / /
| * | | | | | Merge branch 'ticket/igorw/9939' into develop-olympusChris Smith2010-12-051-1/+1
| |\ \ \ \ \ \
| | * | | | | | [ticket/9939] Fix JavaScript error in admin recaptcha templateIgor Wiedler2010-12-051-1/+1
| |/ / / / / /
| * | | | | | Merge branch 'ticket/adamreyher/9575' into develop-olympusIgor Wiedler2010-12-055-5/+5
| |\ \ \ \ \ \
| | * | | | | | [ticket/9575] Also change 'administrate' to 'administer' in templatesIgor Wiedler2010-12-052-2/+2