aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2011-10-141-1/+8
|\ | | | | | | | | * develop-olympus: [ticket/10187] XHTML fix for empty groups in UCP.
| * Merge remote-tracking branch 'github-bantu/ticket/10187' into develop-olympusNils Adermann2011-10-141-1/+8
| |\ | | | | | | | | | | | | * github-bantu/ticket/10187: [ticket/10187] XHTML fix for empty groups in UCP.
| | * [ticket/10187] XHTML fix for empty groups in UCP.Andreas Fischer2011-10-131-1/+8
| | | | | | | | | | | | PHPBB3-10187
* | | Merge branch 'develop-olympus' into developNils Adermann2011-10-143-2/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT. [ticket/10278] Also timeout when receiving data over a slow connection. [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds. [ticket/10278] Return with a timeout error when fread() or fgets() time out. [ticket/10278] Also set timeout on stream in get_remote_file().
| * | Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympusNils Adermann2011-10-143-2/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10278: [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT. [ticket/10278] Also timeout when receiving data over a slow connection. [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds. [ticket/10278] Return with a timeout error when fread() or fgets() time out. [ticket/10278] Also set timeout on stream in get_remote_file().
| | * | [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.Andreas Fischer2011-10-131-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10278
| | * | [ticket/10278] Also timeout when receiving data over a slow connection.Andreas Fischer2011-10-131-1/+2
| | | | | | | | | | | | | | | | PHPBB3-10278
| | * | [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.Andreas Fischer2011-08-251-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10278
| | * | [ticket/10278] Return with a timeout error when fread() or fgets() time out.Andreas Fischer2011-08-252-0/+9
| | | | | | | | | | | | | | | | PHPBB3-10278
| | * | [ticket/10278] Also set timeout on stream in get_remote_file().Andreas Fischer2011-08-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the PHP manual for fsockopen(): If you need to set a timeout for reading/writing data over the socket, use stream_set_timeout(), as the timeout parameter to fsockopen() only applies while connecting the socket. http://www.php.net/manual/en/function.fsockopen.php PHPBB3-10278
* | | | Merge remote-tracking branch 'remotes/igorw/feature/remove-imagesets' into ↵Joas Schilling2011-10-142-32/+1
|\ \ \ \ | | | | | | | | | | | | | | | develop
| * | | | [feature/remove-imagesets] Fix create_schema_files, get rid of imagesetsIgor Wiedler2011-10-142-32/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10336
* | | | | Merge pull request #415 from naderman/ticket/10412Igor Wiedler2011-10-133-19/+6
|\ \ \ \ \ | |/ / / / |/| | | | [ticket/10412] Replace memory_get_usage with memory_get_peak_usage
| * | | | [ticket/10412] Replace memory_get_usage with memory_get_peak_usageNils Adermann2011-10-143-19/+6
|/ / / / | | | | | | | | | | | | PHPBB3-10412
* | | | Merge remote-tracking branch 'nickvergessen/ticket/10300' into developAndreas Fischer2011-10-131-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10300: [ticket/10300] Always set group attributes for teampage and legend
| * | | | [ticket/10300] Always set group attributes for teampage and legendJoas Schilling2011-08-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code in acp_groups.php removes unchanged attributes from the group_attributes array, to prevent issues with reapplying avatar/rank and more. This code causes problems with the new teampage/legend feature, because when the attribute is not set, the group is removed from the feature. Therefore I added an array with the keys that need to be set, when calling the function. PHPBB3-10300
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10409' into developAndreas Fischer2011-10-131-28/+57
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10409: [ticket/10409] Running database_update.php multiple times breaks the update
| * | | | | [ticket/10409] Running database_update.php multiple times breaks the updateJoas Schilling2011-10-131-28/+57
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10409
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-132-2/+24
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10307] Add a test for PHPBB3-10307 [ticket/10307] Return false in mysqli sql_fetchrow on empty result
| * | | | | Merge remote-tracking branch 'igorw/ticket/10307' into develop-olympusAndreas Fischer2011-10-132-2/+24
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10307: [ticket/10307] Add a test for PHPBB3-10307 [ticket/10307] Return false in mysqli sql_fetchrow on empty result
| | * | | | [ticket/10307] Add a test for PHPBB3-10307Igor Wiedler2011-10-131-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10307
| | * | | | [ticket/10307] Return false in mysqli sql_fetchrow on empty resultIgor Wiedler2011-10-131-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10307
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-51/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10246] Move coding guidelines VCS section to wiki
| * | | | | Merge remote-tracking branch 'igorw/ticket/10246' into develop-olympusAndreas Fischer2011-10-131-51/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10246: [ticket/10246] Move coding guidelines VCS section to wiki
| | * | | | | [ticket/10246] Move coding guidelines VCS section to wikiIgor Wiedler2011-10-131-51/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VCS section can now be found at: * http://wiki.phpbb.com/Git#Branches PHPBB3-10246
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/8094] Remove ambiguity of "phpBB has no categories"
| * | | | | Merge remote-tracking branch 'igorw/ticket/8094' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/8094: [ticket/8094] Remove ambiguity of "phpBB has no categories"
| | * | | | | [ticket/8094] Remove ambiguity of "phpBB has no categories"Igor Wiedler2011-10-131-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-8094
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10275] Remove incorrect password information from FAQ
| * | | | | Merge remote-tracking branch 'igorw/ticket/10275' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10275: [ticket/10275] Remove incorrect password information from FAQ
| | * | | | | [ticket/10275] Remove incorrect password information from FAQIgor Wiedler2011-10-131-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FAQ contains instructions to find the password in the registration e-mail. We no longer send the password on registration. So let's just remove this incorrect piece of information from the FAQ. PHPBB3-10275
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9898] Encourage patches in README
| * | | | | Merge remote-tracking branch 'igorw/ticket/9898' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/9898: [ticket/9898] Encourage patches in README
| | * | | | | [ticket/9898] Encourage patches in READMEIgor Wiedler2011-10-131-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-9898
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-132-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10408' into develop-olympusAndreas Fischer2011-10-132-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10408: [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP
| | * | | | | [ticket/10408] Layout of topics/attachments list is broken in UCP and MCPJoas Schilling2011-10-132-3/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-10408
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10304] Fix URL for ICQ while view private messages
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10304' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10304: [ticket/10304] Fix URL for ICQ while view private messages
| | * | | | | [ticket/10304] Fix URL for ICQ while view private messagesJoas Schilling2011-10-131-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-10304
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10400] Allow forum name to be '0'
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10400' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10400: [ticket/10400] Allow forum name to be '0'
| | * | | | | [ticket/10400] Allow forum name to be '0'Joas Schilling2011-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10400
* | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-10-132-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions.php
| * | | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/10397' into ↵Joas Schilling2011-10-132-3/+3
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | develop-olympus
| | * | | | | [ticket/10397] Pagination inconsistency fixVjacheslav Trushkin2011-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing topic_generate_pagination() PHPBB3-10397
| | * | | | | [ticket/10397] Pagination inconsistency fixVjacheslav Trushkin2011-10-041-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing inconsistency in code generated by generate_pagination() PHPBB3-10397
* | | | | | Merge remote-tracking branch 'ckwalsh/ticket/9661' into developIgor Wiedler2011-10-101-33/+78
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ckwalsh/ticket/9661: [ticket/9661] Remove eval() from functions_privmsgs.php
| * | | | | | [ticket/9661] Remove eval() from functions_privmsgs.phpCullen Walsh2011-09-251-33/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested by sending messages to myself on a test board. PHPBB3-9661
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-09-271-2/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10394] Use call_user_func_array to pass a ref into a dynamic function
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-20 13:24:24 +0000