aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-nickvergessen/ticket/9956' into ↵Nils Adermann2011-11-183-1/+5
|\ | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/9956: [ticket/9956] Display error message if no disapprove reason given
| * [ticket/9956] Display error message if no disapprove reason givenJoas Schilling2011-10-143-1/+5
| | | | | | | | PHPBB3-9956
* | Merge remote-tracking branch 'github-rxu/ticket/9416' into develop-olympusNils Adermann2011-11-181-3/+3
|\ \ | | | | | | | | | | | | * github-rxu/ticket/9416: [ticket/9416] HTML entities in poll titles and options incorrectly re-encoded
| * | [ticket/9416] HTML entities in poll titles and options incorrectly re-encodedrxu2011-11-171-3/+3
| | | | | | | | | | | | PHPBB3-9416
* | | Merge remote-tracking branch 'github-nickvergessen/ticket/10296' into ↵Nils Adermann2011-11-183-1/+99
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/10296: [ticket/10296] Fix CROSS JOIN with INNER JOIN on MSSQL, Postgres and Oracle [ticket/10296] Add unit test for CROSS JOIN with INNER JOIN
| * | | [ticket/10296] Fix CROSS JOIN with INNER JOIN on MSSQL, Postgres and Oracledmauri2011-11-151-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10296
| * | | [ticket/10296] Add unit test for CROSS JOIN with INNER JOINJoas Schilling2011-11-152-0/+98
| | | | | | | | | | | | | | | | PHPBB3-10296
* | | | Merge remote-tracking branch 'nickvergessen/ticket/10185' into develop-olympusAndreas Fischer2011-11-181-12/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10185: [ticket/10185] Always set board startdate on conversion
| * | | | [ticket/10185] Always set board startdate on conversionJoas Schilling2011-11-151-12/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The board startdate should always be set to first user registration date. The current code did not do anything at all, as the board_startdate was always set on installation before running the convertor. PHPBB3-10185
* | | | Merge remote-tracking branch 'remotes/rxu/ticket/9008' into develop-olympusJoas Schilling2011-11-181-3/+9
|\ \ \ \
| * | | | [ticket/9008] Incorrect unread topic tracking for unapproved topicsrxu2011-09-251-3/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-9008
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10157' into develop-olympusOleg Pudeyev2011-11-172-1/+9
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | * nickvergessen/ticket/10157: [ticket/10157] Add notification to update cpfs when installing a language.
| * | | | [ticket/10157] Add notification to update cpfs when installing a language.Joas Schilling2011-11-172-1/+9
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | We currently just copy the language-strings from the default language. But the admin should be reminded to change them. PHPBB3-10157
* | | | Merge remote-tracking branch 'rxu/ticket/10419' into develop-olympusAndreas Fischer2011-11-153-0/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu/ticket/10419: [ticket/10419] Reword the language strings [ticket/10419] Reword some language strings, minor code changes [ticket/10419] Add mbstring PHP ini parameters checks to ACP
| * | | | [ticket/10419] Reword the language stringsrxu2011-11-151-8/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-10419
| * | | | [ticket/10419] Reword some language strings, minor code changesrxu2011-11-052-8/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-10419
| * | | | [ticket/10419] Add mbstring PHP ini parameters checks to ACPrxu2011-10-183-0/+51
| | | | | | | | | | | | | | | | | | | | PHPBB3-10419
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10452' into develop-olympusAndreas Fischer2011-11-142-110/+47
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10452: [ticket/10452] Fix xHTML errors when print-viewing PMs
| * | | | | [ticket/10452] Fix xHTML errors when print-viewing PMsJoas Schilling2011-11-142-110/+47
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also changed the layout of prosilvers PM print-view, so it looks like the post print-view and not like the subsilver2 print-view. PHPBB3-10452
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/9361' into develop-olympusAndreas Fischer2011-11-142-6/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/9361: [ticket/9361] View correct error messages when editing account information
| * | | | | [ticket/9361] View correct error messages when editing account informationJoas Schilling2011-11-142-6/+9
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the "current password" is only checked, when you change something. This means you get "Your profile has been updated." although you enter a wrong password. I also added proper error messages, when you leave the confirm fields empty, and sorted them in the order of the field appearances on the html page. PHPBB3-9361
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/9066' into develop-olympusAndreas Fischer2011-11-144-1/+47
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/9066: [ticket/9066] Move regex into get_preg_expression function and add tests [ticket/9066] Disallow some database prefix to prevent same errors and problems
| * | | | | [ticket/9066] Move regex into get_preg_expression function and add testsJoas Schilling2011-11-143-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9066
| * | | | | [ticket/9066] Disallow some database prefix to prevent same errors and problemsJoas Schilling2011-11-132-1/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch database prefixes must not be empty and only contain alphanumeric characters, numbers and underscores. PHPBB3-9066
* | | | | Merge remote-tracking branch 'bantu/ticket/10254' into develop-olympusAndreas Fischer2011-11-1411-33/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10254: [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com. [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com. [ticket/10254] Remove subsilver2 as default style on theme. [ticket/10254] Remove style names from themes and fix some informations on it.
| * | | | | [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.cssAndreas Fischer2011-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10254
| * | | | | [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.maelsoucaze2011-11-141-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10254
| * | | | | [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.maelsoucaze2011-11-141-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10254
| * | | | | [ticket/10254] Remove subsilver2 as default style on theme.maelsoucaze2011-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10254
| * | | | | [ticket/10254] Remove style names from themes and fix some informations on it.maelsoucaze2011-11-1411-30/+26
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10254
* | | | | | Merge remote-tracking branch 'igorw/ticket/10087' into develop-olympusAndreas Fischer2011-11-132-5/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10087: [ticket/10087] Organize bans in acp_baninto optgroups
| * | | | | | [ticket/10087] Organize bans in acp_baninto optgroupsIgor Wiedler2011-11-112-5/+32
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-10087
* | | | | | Merge remote-tracking branch 'igorw/ticket/8616' into develop-olympusAndreas Fischer2011-11-134-6/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/8616: [ticket/8616] Include old U_INBOX var for BC [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE [ticket/8616] Direct links in pm notification emails
| * | | | | | [ticket/8616] Include old U_INBOX var for BCIgor Wiedler2011-11-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8616
| * | | | | | [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGEIgor Wiedler2011-10-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8616
| * | | | | | [ticket/8616] Direct links in pm notification emailsAlan2011-10-133-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import the "Direct links in pm notification emails" modification, version 1.0.1. PHPBB3-8616
* | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/7138' into develop-olympusAndreas Fischer2011-11-131-2/+10
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/7138: [ticket/7138] Allow simple header and footer for trigger_error() messages
| * | | | | | [ticket/7138] Allow simple header and footer for trigger_error() messagesDavid King2011-11-131-2/+10
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a template condition using S_SIMPLE_MESSAGE that must be set to true before calling trigger_error() which will automatically use the simple header and footer files in the template directory instead of the overall header and footer files. PHPBB3-7138
* | | | | | 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 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 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/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 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