aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | | | [ticket/9575] Change 'administrate' to 'administer'Adam Reyher2010-12-013-3/+3
| * | | | | Merge branch 'ticket/rmgcirr83/8736' into develop-olympusIgor Wiedler2010-12-051-1/+8
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | [ticket/8736] guest can have 255 chars long usernameRMcGirr832010-12-041-1/+8
| |/ / / /
| * | | | Merge branch 'ticket/nickvergessen/9930' into develop-olympusAndreas Fischer2010-12-031-2/+2
| |\ \ \ \
| | * | | | [ticket/9930] Redirect failes with open_basedir enabled.Joas Schilling2010-11-251-2/+2
| | | |/ / | | |/| |
| * | | | Merge branch 'ticket/igorw/9910' into develop-olympusAndreas Fischer2010-12-031-0/+3
| |\ \ \ \
| | * | | | [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMsIgor Wiedler2010-11-211-0/+3
| * | | | | Merge branch 'ticket/igorw/9932' into develop-olympusAndreas Fischer2010-12-031-0/+1
| |\ \ \ \ \
| | * | | | | [ticket/9932] Add the Bing bot when convertingRichard Foote2010-11-291-0/+1
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'ticket/mungo/9921' into develop-olympusAndreas Fischer2010-12-031-0/+60
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | [ticket/9921] Adding sample configuration file for the lighttpd webserver.Ingo Migliarina2010-12-011-0/+60
| |/ / / /
* | | | | Merge branch 'ticket/igorw/9556' into developNils Adermann2010-12-13474-737/+274
|\ \ \ \ \
| * | | | | [ticket/9556] Drop php closing tags, add trailing newlineIgor Wiedler2010-11-11474-738/+274
* | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2010-11-292-3/+23
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'task/github-readme' into develop-olympusIgor Wiedler2010-11-291-0/+20
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | [task/github-readme] Add README file for GitHubIgor Wiedler2010-11-291-0/+20
| |/ / / /
| * | | | Merge branch 'ticket/rmcgirr83/9897' into develop-olympusIgor Wiedler2010-11-211-3/+3
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [ticket/9897] A few language fixesRMcGirr832010-11-211-3/+3
* | | | | Merge branch 'develop-olympus' into developNils Adermann2010-11-207-45/+265
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.0.8' into develop-olympusNils Adermann2010-11-207-46/+266
| |\ \ \ \
| | * | | | [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelogNils Adermann2010-11-195-10/+28
| | * | | | Merge branch 'ticket/9903' into prep-release-3.0.8Nils Adermann2010-11-192-0/+172
| | |\ \ \ \
| | | * | | | [ticket/9903] Script for detecting potentially malicious flash bbcodesIgor Wiedler2010-11-191-0/+163
| | | * | | | [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode.Ruslan Uzdenov2010-11-181-0/+9
| | * | | | | Merge branch 'ticket/igorw/9904' into prep-release-3.0.8Nils Adermann2010-11-191-41/+71
| | |\ \ \ \ \
| | | * | | | | [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix.Chris Sfanos2010-11-191-41/+71
| | |/ / / / /
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-11-185-8/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | Merge branch 'prep-release-3.0.8' into develop-olympusAndreas Fischer2010-11-182-3/+4
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |