aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developIgor Wiedler2011-11-131-6/+2
|\ | | | | | | | | * develop-olympus: [ticket/10190] Do not show hint about permissions when editing forum settings.
| * Merge remote-tracking branch 'bantu/ticket/10190' into develop-olympusIgor Wiedler2011-11-131-6/+2
| |\ | | | | | | | | | | | | * bantu/ticket/10190: [ticket/10190] Do not show hint about permissions when editing forum settings.
| | * [ticket/10190] Do not show hint about permissions when editing forum settings.Andreas Fischer2011-10-291-6/+2
| | | | | | | | | | | | PHPBB3-10190
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-132-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read [ticket/10365] Require m_report permission to see reports in mcp_post [ticket/10365] Make sure moderators only get mcp_reports link when allowed
| * | Merge remote-tracking branch 'igorw/ticket/10365' into develop-olympusAndreas Fischer2011-11-132-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10365: [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read [ticket/10365] Require m_report permission to see reports in mcp_post [ticket/10365] Make sure moderators only get mcp_reports link when allowed
| | * | [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to readIgor Wiedler2011-11-131-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10365
| | * | [ticket/10365] Require m_report permission to see reports in mcp_postIgor Wiedler2011-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This was exposed to anyone with m_ perms in mcp_post_details. PHPBB3-10365
| | * | [ticket/10365] Make sure moderators only get mcp_reports link when allowedIgor Wiedler2011-10-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The m_report permission is not not being checked when displaying the link to mcp_reports. PHPBB3-10365
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-131-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10437] Do not display announcements that are waiting for approval
| * | | Merge remote-tracking branch 'nickvergessen/ticket/10437' into develop-olympusAndreas Fischer2011-11-131-0/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10437: [ticket/10437] Do not display announcements that are waiting for approval
| | * | | [ticket/10437] Do not display announcements that are waiting for approvalJoas Schilling2011-11-131-0/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-10437
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/develop/10435' into developAndreas Fischer2011-11-131-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/develop/10435: [ticket/10435] Remove global announcement from forums total topic count Conflicts: phpBB/viewforum.php
| * | | | | [ticket/10435] Remove global announcement from forums total topic countJoas Schilling2011-11-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to remove the global announcements from the forums total topic count, otherwise the number is different from the one on the forum list. PHPBB3-10435
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-131-1/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/10435] Readd local announcements to total topic count in viewforum
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10435' into develop-olympusAndreas Fischer2011-11-131-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10435: [ticket/10435] Readd local announcements to total topic count in viewforum
| | * | | | | [ticket/10435] Readd local announcements to total topic count in viewforumJoas Schilling2011-11-111-1/+4
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to readd the local announcements to the forums total topic count, otherwise the number is different from the one in the forum list. PHPBB3-10435
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-113-9/+19
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10237] Display login-box for guests, when (un)subscribing Conflicts: phpBB/includes/functions_display.php
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10237' into develop-olympusAndreas Fischer2011-11-113-9/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10237: [ticket/10237] Display login-box for guests, when (un)subscribing
| | * | | | | [ticket/10237] Display login-box for guests, when (un)subscribingJoas Schilling2011-11-063-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also initialise $is_watching for PHP Notice: Undefined variable is_watching PHPBB3-10237
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-011-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/7932] Fix font size in select boxes
| * | | | | | 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 branch 'develop-olympus' into developAndreas Fischer2011-11-011-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
| * | | | | | 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 'nickvergessen/ticket/10410' into developAndreas Fischer2011-11-016-16/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10410: [ticket/10410] Add option to display users in their first teampage group
| * | | | | | | [ticket/10410] Add option to display users in their first teampage groupJoas Schilling2011-10-286-16/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10410
* | | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-10-302-1/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | 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 branch 'develop-olympus' into developIgor Wiedler2011-10-293-2/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9307] Add config variable to installation schema. [ticket/9307] Remove hardcoded chunk size of mass emails. Conflicts: phpBB/install/database_update.php
| * | | | | | 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 branch 'develop-olympus' into developIgor Wiedler2011-10-291-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10420] Update includes/startup.php for PHP 5.4.
| * | | | | | | 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 branch 'develop-olympus' into developIgor Wiedler2011-10-291-7/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10422] Invalid "if" in viewtopic_body.html
| * | | | | | | 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 branch 'develop-olympus' into developIgor Wiedler2011-10-291-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
| * | | | | | | 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 branch 'develop-olympus' into developIgor Wiedler2011-10-291-22/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10430] Fix typos/etc in coding guidelines
| * | | | | | | 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 branch 'develop-olympus' into developIgor Wiedler2011-10-291-28/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10259] Do not send notifications to user accounts joining free groups.
| * | | | | | | 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 branch 'develop-olympus' into developIgor Wiedler2011-10-291-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt
generated by cgit v1.2.1 (git 2.21.0) at 2025-10-09 15:17:00 +0000