aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2011-10-141-1/+8
|\
| * Merge remote-tracking branch 'github-bantu/ticket/10187' into develop-olympusNils Adermann2011-10-141-1/+8
| |\
| | * [ticket/10187] XHTML fix for empty groups in UCP.Andreas Fischer2011-10-131-1/+8
* | | Merge branch 'develop-olympus' into developNils Adermann2011-10-143-2/+14
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympusNils Adermann2011-10-143-2/+14
| |\ \
| | * | [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-252-0/+9
| | * | [ticket/10278] Also set timeout on stream in get_remote_file().Andreas Fischer2011-08-251-0/+2
* | | | Merge remote-tracking branch 'remotes/igorw/feature/remove-imagesets' into de...Joas Schilling2011-10-142-32/+1
|\ \ \ \
| * | | | [feature/remove-imagesets] Fix create_schema_files, get rid of imagesetsIgor Wiedler2011-10-142-32/+1
* | | | | [ticket/10412] Replace memory_get_usage with memory_get_peak_usageNils Adermann2011-10-143-19/+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 remote-tracking branch 'nickvergessen/ticket/10409' into developAndreas Fischer2011-10-131-28/+57
|\ \ \ \ \
| * | | | | [ticket/10409] Running database_update.php multiple times breaks the updateJoas Schilling2011-10-131-28/+57
* | | | | | 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-51/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/10246] Move coding guidelines VCS section to wikiIgor Wiedler2011-10-131-51/+1
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'igorw/ticket/8094' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/8094] Remove ambiguity of "phpBB has no categories"Igor Wiedler2011-10-131-1/+1
| | |/ / / /
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'igorw/ticket/10275' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/10275] Remove incorrect password information from FAQIgor Wiedler2011-10-131-1/+1
| | |/ / / /
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'igorw/ticket/9898' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/9898] Encourage patches in READMEIgor Wiedler2011-10-131-1/+1
| | |/ / / /
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-132-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10408' into develop-olympusAndreas Fischer2011-10-132-3/+3
| |\ \ \ \ \
| | * | | | | [ticket/10408] Layout of topics/attachments list is broken in UCP and MCPJoas Schilling2011-10-132-3/+3
| | |/ / / /
* | | | | | 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 branch 'develop-olympus' into developAndreas Fischer2011-09-271-5/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10315' into develop-olympusAndreas Fischer2011-09-271-5/+3
| |\ \ \ \ \ \
| | * | | | | | [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlappingJoas Schilling2011-09-211-5/+3
* | | | | | | | 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
| | |_|/ / / / / | |/| | | | | |