aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10190] Do not show hint about permissions when editing forum settings.Andreas Fischer2011-10-291-6/+2
| | | | PHPBB3-10190
* Merge remote-tracking branch 'nickvergessen/ticket/9525' into develop-olympusAndreas Fischer2011-10-172-2/+2
|\ | | | | | | | | * nickvergessen/ticket/9525: [ticket/9525] Minimum post length 0 is accepted but not working.
| * [ticket/9525] Minimum post length 0 is accepted but not working.Joas Schilling2011-10-142-2/+2
| | | | | | | | PHPBB3-9525
* | Merge remote-tracking branch 'igorw/ticket/10413' into develop-olympusAndreas Fischer2011-10-161-6/+2
|\ \ | | | | | | | | | | | | | | | * igorw/ticket/10413: [ticket/10413] Fix CS [ticket/10413] Make create_schema_files usable
| * | [ticket/10413] Fix CSIgor Wiedler2011-10-161-2/+2
| | | | | | | | | | | | PHPBB3-10413
| * | [ticket/10413] Make create_schema_files usableIgor Wiedler2011-10-141-6/+2
| | | | | | | | | | | | PHPBB3-10413
* | | Merge remote-tracking branch 'github-igorw/ticket/10377' into develop-olympusNils Adermann2011-10-141-9/+8
|\ \ \ | | | | | | | | | | | | | | | | * github-igorw/ticket/10377: [ticket/10377] Do not allow all moderators to sticky posts
| * | | [ticket/10377] Do not allow all moderators to sticky postsIgor Wiedler2011-10-141-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the mcp the change_topic_type does not properly check permissions, allowing moderators to make any post sticky or announced by visiting the correct URL. PHPBB3-10377
* | | | Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympusIgor Wiedler2011-10-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10327: [ticket/10327] Use $this->tools instead of creating a new instance of db_tools. [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
| * | | | [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.Andreas Fischer2011-10-141-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-10327
* | | | [ticket/8240] Add ability to get a list of columns of a tables to db_tools.Andreas Fischer2011-10-141-74/+37
| | | | | | | | | | | | | | | | PHPBB3-8240
* | | | [ticket/8240] Add ability to get a list of tables to db_tools.Andreas Fischer2011-10-142-49/+68
|/ / / | | | | | | | | | PHPBB3-8240
* | | Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympusIgor Wiedler2011-10-141-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * bantu/ticket/10327: [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.
| * | | [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.Andreas Fischer2011-10-141-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * CREATE INDEX is internally mapped to an ALTER INDEX statement. * CREATE INDEX requires the INDEX permission. * ALTER TABLE requires the (more powerful) ALTER permission. * We require the ALTER permission anyway for operation. * Changing CREATE INDEX to ALTER TABLE thus removes dependency on the INDEX permission which is good because some management software does not give out the INDEX permission by default. http://dev.mysql.com/doc/refman/5.0/en/create-index.html PHPBB3-10327
* | | Merge remote-tracking branch 'remotes/igorw/ticket/10189' into develop-olympusJoas Schilling2011-10-148-35/+56
|\ \ \
| * | | [ticket/10189] Get rid of $id$ from schema filesIgor Wiedler2011-10-148-50/+1
| | | | | | | | | | | | | | | | PHPBB3-10189
| * | | [ticket/10189] Add "automatically generated" comment into schema-filesIgor Wiedler2011-10-148-0/+70
| | | | | | | | | | | | | | | | PHPBB3-10189
* | | | [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users tooNils Adermann2011-10-141-1/+10
|/ / / | | | | | | | | | PHPBB3-10212
* | | Merge remote-tracking branch 'github-nickvergessen/ticket/10074' into ↵Nils Adermann2011-10-141-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/10074: [ticket/10074] Change default value of 'Set as special rank' to No
| * | | [ticket/10074] Change default value of 'Set as special rank' to NoJoas Schilling2011-10-141-1/+1
| | |/ | |/| | | | | | | PHPBB3-10074
* | | 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 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 'igorw/ticket/10307' into develop-olympusAndreas Fischer2011-10-131-1/+7
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | * igorw/ticket/10307: [ticket/10307] Add a test for PHPBB3-10307 [ticket/10307] Return false in mysqli sql_fetchrow on empty result
| * | | [ticket/10307] Return false in mysqli sql_fetchrow on empty resultIgor Wiedler2011-10-131-1/+7
| | |/ | |/| | | | | | | PHPBB3-10307
* | | [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 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 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 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 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 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 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
* | | | [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 'nickvergessen/ticket/10315' into develop-olympusAndreas Fischer2011-09-271-5/+3
|\ \ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/10315: [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping
| * | | [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlappingJoas Schilling2011-09-211-5/+3
| | | | | | | | | | | | | | | | PHPBB3-10315
* | | | [ticket/10370] Add function documentation for get_stacktrace().Andreas Fischer2011-09-191-1/+6
| | | | | | | | | | | | | | | | PHPBB3-10370
* | | | [ticket/10370] Explain that we are not the ones hiding backtrace pieces.Andreas Fischer2011-09-191-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Taken from 2db54cf7e809e731e4440377bcc06e2aa05f190d. PHPBB3-10370
* | | | [ticket/10370] Call htmlspecialchars() after phpbb_filter_root_path().Andreas Fischer2011-09-191-2/+1
| | | | | | | | | | | | | | | | PHPBB3-10370