aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developIgor Wiedler2011-10-141-0/+9
|\
| * [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users tooNils Adermann2011-10-141-1/+10
* | Merge branch 'develop-olympus' into developNils Adermann2011-10-141-1/+1
|\ \ | |/
| * Merge remote-tracking branch 'github-nickvergessen/ticket/10074' into develop...Nils Adermann2011-10-141-1/+1
| |\
| | * [ticket/10074] Change default value of 'Set as special rank' to NoJoas Schilling2011-10-141-1/+1
* | | Merge branch 'develop-olympus' into developNils Adermann2011-10-142-2/+13
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympusNils Adermann2011-10-142-2/+13
| |\ \
| | * | [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.Andreas Fischer2011-10-131-1/+1
| | * | [ticket/10278] Also timeout when receiving data over a slow connection.Andreas Fischer2011-10-131-1/+2
| | * | [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.Andreas Fischer2011-08-251-1/+1
| | * | [ticket/10278] Return with a timeout error when fread() or fgets() time out.Andreas Fischer2011-08-251-0/+8
| | * | [ticket/10278] Also set timeout on stream in get_remote_file().Andreas Fischer2011-08-251-0/+2
* | | | [ticket/10412] Replace memory_get_usage with memory_get_peak_usageNils Adermann2011-10-142-10/+6
* | | | Merge remote-tracking branch 'nickvergessen/ticket/10300' into developAndreas Fischer2011-10-131-1/+4
|\ \ \ \
| * | | | [ticket/10300] Always set group attributes for teampage and legendJoas Schilling2011-08-021-1/+4
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+7
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'igorw/ticket/10307' into develop-olympusAndreas Fischer2011-10-131-1/+7
| |\ \ \ \
| | * | | | [ticket/10307] Return false in mysqli sql_fetchrow on empty resultIgor Wiedler2011-10-131-1/+7
| | | |_|/ | | |/| |
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10304' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \
| | * | | | [ticket/10304] Fix URL for ICQ while view private messagesJoas Schilling2011-10-131-1/+1
| | |/ / /
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10400' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \
| | * | | | [ticket/10400] Allow forum name to be '0'Joas Schilling2011-10-071-1/+1
* | | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-10-132-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/10397] Pagination inconsistency fixVjacheslav Trushkin2011-10-041-1/+1
| * | | | | [ticket/10397] Pagination inconsistency fixVjacheslav Trushkin2011-10-041-2/+2
| | |/ / / | |/| | |
* | | | | Merge remote-tracking branch 'ckwalsh/ticket/9661' into developIgor Wiedler2011-10-101-33/+78
|\ \ \ \ \
| * | | | | [ticket/9661] Remove eval() from functions_privmsgs.phpCullen Walsh2011-09-251-33/+78
* | | | | | Merge remote-tracking branch 'cs278/ticket/10387' into developAndreas Fischer2011-09-271-0/+1
|\ \ \ \ \ \
| * | | | | | [ticket/10387] Add CURRENT_PAGE var to the template when pagination is used.Chris Smith2011-09-251-0/+1
| |/ / / / /
* | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into developAndreas Fischer2011-09-271-5/+14
|\ \ \ \ \ \
| * | | | | | [ticket/10392] Alter parent namespace stripping.Chris Smith2011-09-271-2/+9
| * | | | | | [ticket/10392] Missed fix for S_BLOCK_NAME.Chris Smith2011-09-271-1/+1
| * | | | | | [ticket/10392] Fix access to nested special block variables.Chris Smith2011-09-261-4/+6
| |/ / / / /
* | | | | | Merge remote-tracking branch 'cs278/ticket/10384' into developAndreas Fischer2011-09-241-2/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/10384] Language variable replacements should not check for var prefix.Chris Smith2011-09-241-2/+3
* | | | | | [ticket/10375] Rework $source_file setting.Chris Smith2011-09-211-3/+12
* | | | | | [ticket/10375] Make _tpl_load() a little leaner.Chris Smith2011-09-211-19/+6
* | | | | | [ticket/10375] Use existing method to generate cache file name.Chris Smith2011-09-211-2/+1
|/ / / / /
* | | | | Merge remote-tracking branch 'github-cs278/feature/remove-db-styles' into dev...Nils Adermann2011-09-213-750/+106
|\ \ \ \ \
| * | | | | [feature/remove-db-styles] Remove forgotten template variables.Chris Smith2011-09-201-6/+0
| * | | | | [feature/remove-db-styles] Removed style.php!Chris Smith2011-09-201-1/+1
| * | | | | [feature/remove-db-styles] Rework filesystem permission checks from 6d24a71.Chris Smith2011-09-201-18/+52
| * | | | | [feature/remove-db-styles] Add error if template/theme file is unwritable.Chris Smith2011-09-201-29/+25
| * | | | | [feature/remove-db-styles] Readd table constant for upgrades etc.Chris Smith2011-09-201-0/+1
| * | | | | [feature/remove-db-styles] Remove style.php DB storage.Chris Smith2011-09-202-7/+2
| * | | | | [feature/remove-db-styles] Remove DB theme handling code from session.Chris Smith2011-09-201-49/+2
| * | | | | [feature/remove-db-styles] ACP has forgotten how to store themes in the DB.Chris Smith2011-09-201-120/+22
| * | | | | [feature/remove-db-styles] Missed a few template DB bits in acp_styles.Chris Smith2011-09-201-23/+3