aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'nickvergessen/ticket/7932' into develop-olympusAndreas Fischer2011-11-011-0/+1
|\ | | | | | | | | * nickvergessen/ticket/7932: [ticket/7932] Fix font size in select boxes
| * [ticket/7932] Fix font size in select boxesJoas Schilling2011-10-291-0/+1
| | | | | | | | PHPBB3-7932
* | Merge remote-tracking branch 'nickvergessen/ticket/9036' into develop-olympusAndreas Fischer2011-11-011-0/+1
|\ \ | | | | | | | | | | | | * nickvergessen/ticket/9036: [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
| * | [ticket/9036] Add template variable 'S_AUTH_READ' to forumlistJoas Schilling2011-10-291-0/+1
| |/ | | | | | | PHPBB3-9036
* | Merge remote-tracking branch 'remotes/marc1706/ticket/9778' into develop-olympusJoas Schilling2011-10-302-1/+2
|\ \
| * | [ticket/9778] Replaced "Find a member" with "Enter username"Marc Alexander2011-10-302-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clicking on the "Users and groups" tab in the ACP, the user is able to either enter the username of the member he wants to manage or click on "Find a member" below the input field. Unfortunately, the label for the input field is also "Find a member", which leads some users to the idea that they can search for users using that input field. By changing the label to "Enter username" this should be clear to the user. PHPBB3-9778
* | | Merge remote-tracking branch 'cs278/ticket/9307' into develop-olympusIgor Wiedler2011-10-293-2/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | * cs278/ticket/9307: [ticket/9307] Add config variable to installation schema. [ticket/9307] Remove hardcoded chunk size of mass emails.
| * | | [ticket/9307] Add config variable to installation schema.Chris Smith2011-09-251-0/+1
| | | | | | | | | | | | | | | | PHPBB3-9307
| * | | [ticket/9307] Remove hardcoded chunk size of mass emails.Chris Smith2011-09-242-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The new config option is 'email_max_chunk_size' I have not added an interface option to change this. PHPBB3-9307
* | | | Merge remote-tracking branch 'bantu/ticket/10420' into develop-olympusIgor Wiedler2011-10-291-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10420: [ticket/10420] Update includes/startup.php for PHP 5.4.
| * | | | [ticket/10420] Update includes/startup.php for PHP 5.4.Andreas Fischer2011-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP 5.4 dropped support for register globals and magic quotes. Calling set_magic_quotes_runtime() on PHP 5.4 actually results in an E_CORE_ERROR error. PHPBB3-10420
* | | | | Merge remote-tracking branch 'cyberalien/ticket/10422' into develop-olympusIgor Wiedler2011-10-291-7/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10422: [ticket/10422] Invalid "if" in viewtopic_body.html
| * | | | | [ticket/10422] Invalid "if" in viewtopic_body.htmlVjacheslav Trushkin2011-10-181-7/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixing incorrect "IF" in viewtopic_body.html PHPBB3-10422
* | | | | Merge remote-tracking branch 'bantu/ticket/10421' into develop-olympusIgor Wiedler2011-10-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10421: [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
| * | | | | [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.phpAndreas Fischer2011-10-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-10421
* | | | | Merge remote-tracking branch 'dellsystem/ticket/olympus/10430' into ↵Igor Wiedler2011-10-291-22/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * dellsystem/ticket/olympus/10430: [ticket/10430] Fix typos/etc in coding guidelines
| * | | | | [ticket/10430] Fix typos/etc in coding guidelinesdellsystem2011-10-281-22/+20
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainly minor changes to correct errors and improve readability. * "overcroud" --> "overcrowd" * "concentinations" --> "concatenations" * "SQL Statements", "SQL Formatting" - unnecessary capitalisation removed * "keep a very close eye to it" --> "keep a very close eye on it" * Fixed some fragmented sentences under the SQL Quotes section * Added capitalisation of "sql", "select", "select distinct" * "noticable" --> "noticeable" * "outputed" --> "outputted" * Added a missing "it" on the line about append_sid() * And some other grammatical/stylistic changes, not worth listing them all PHPBB3-10430
* | | | | Merge remote-tracking branch 'bantu/ticket/10259' into develop-olympusIgor Wiedler2011-10-291-28/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10259: [ticket/10259] Do not send notifications to user accounts joining free groups.
| * | | | | [ticket/10259] Do not send notifications to user accounts joining free groups.Andreas Fischer2011-10-171-28/+24
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does not make sense to send notifications to users joining a freely open group. They already know that they were added to the group, because they triggered the actual join. PHPBB3-10259
* | | | | Merge remote-tracking branch 'bantu/ticket/10166' into develop-olympusIgor Wiedler2011-10-291-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | * bantu/ticket/10166: [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt
| * | | | [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txtAndreas Fischer2011-10-291-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | It does not make much sense to say "the username you received in a previous e-mail" when the message itself contains the username. PHPBB3-10166
* | | | 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 'bantu/ticket/10416' into develop-olympusIgor Wiedler2011-10-171-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10416: [ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().
| * | | | [ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().Andreas Fischer2011-10-161-0/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10416
* | | | | 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-142-11/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Use $this->tools instead of creating a new instance of db_tools.Andreas Fischer2011-10-141-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10327
| * | | | | | [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-142-74/+45
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8240
* | | | | | [ticket/8240] Add ability to get a list of tables to db_tools.Andreas Fischer2011-10-143-49/+75
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-8240
* | | | | Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympusIgor Wiedler2011-10-142-1/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * 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-142-1/+19
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | Merge remote-tracking branch 'naderman/ticket/10212' into develop-olympusIgor Wiedler2011-10-141-1/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | * naderman/ticket/10212: [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users too
| * | | | | [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