mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00
Code Issues Releases Wiki Activity
10,767 Commits 17 Branches 190 Tags
Commit Graph

10767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
3e43b53a63 [develop-olympus] Bump version numbers for 3.0.10-RC1 release. 2011-11-20 21:50:29 +01:00
Andreas Fischer
06ae98b1e5 [develop-olympus] Bumping version numbers to final for 3.0.10 releases. 2011-11-20 21:41:24 +01:00
Igor Wiedler
92e1681761 Merge remote-tracking branch 'bantu/ticket/10446' into develop-olympus 
* bantu/ticket/10446:
  [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().
  [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().
  [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.
  [ticket/10446] DRY X-AntiAbuse header addition.
 2011-11-20 18:43:27 +01:00
Andreas Fischer
37c7668193 [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers(). 
PHPBB3-10446
 2011-11-20 16:35:31 +01:00
Andreas Fischer
a7077c9149 [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers(). 
PHPBB3-10446
 2011-11-20 14:02:22 +01:00
Oleg Pudeyev
c68973a9e0 [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers. 
PHPBB3-10446
 2011-11-20 04:17:42 -05:00
Oleg Pudeyev
64d62038cd [ticket/10446] DRY X-AntiAbuse header addition. 
PHPBB3-10446
 2011-11-20 04:15:44 -05:00
Oleg Pudeyev
6155707071 Merge remote-tracking branch 'callumacrae/ticket/10402' into develop-olympus 
* callumacrae/ticket/10402:
  [ticket/10402] Fixed a formatting issue with report details.
 2011-11-20 00:15:48 -05:00
Oleg Pudeyev
2359d1e268 Merge remote-tracking branch 'callumacrae/ticket/8599' into develop-olympus 
* callumacrae/ticket/8599:
  [ticket/8599] Added ability to select all to add multiple smilies screen.
 2011-11-19 22:27:07 -05:00
Oleg Pudeyev
fb43029935 Merge remote-tracking branch 'cs278/ticket/10239' into develop-olympus 
* cs278/ticket/10239:
  [ticket/10239] Correct undefined variable error.
  [ticket/10239] Add confirm box to backup restore.
 2011-11-19 21:52:43 -05:00
Oleg Pudeyev
d03366fba2 Merge remote-tracking branch 'nickvergessen/ticket/8996' into develop-olympus 
* nickvergessen/ticket/8996:
  [ticket/8996] Also fix the BBCode bug in subsilver2 and acp
  [ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey
 2011-11-19 21:15:25 -05:00
Joas Schilling
eb1f15bc8b [ticket/8996] Also fix the BBCode bug in subsilver2 and acp 2011-11-18 23:27:25 +01:00
Chris Smith
810016ce94 [ticket/10239] Correct undefined variable error. 
PHPBB3-10239
 2011-11-18 21:29:02 +00:00
Nils Adermann
4be9c70827 Merge remote-tracking branch 'github-nickvergessen/ticket/9776' into develop-olympus 
* github-nickvergessen/ticket/9776:
  [ticket/9776] Delete poll if no poll options were submitted.
 2011-11-18 20:31:26 +01:00
Joas Schilling
4fae5eef68 [ticket/9776] Delete poll if no poll options were submitted. 
PHPBB3-9776
 2011-11-18 20:29:50 +01:00
Nils Adermann
6894477b60 Merge remote-tracking branch 'github-nickvergessen/ticket/9956' into develop-olympus 
* github-nickvergessen/ticket/9956:
  [ticket/9956] Display error message if no disapprove reason given
 2011-11-18 19:41:10 +01:00
Nils Adermann
665982bb32 Merge remote-tracking branch 'github-rxu/ticket/9416' into develop-olympus 
* github-rxu/ticket/9416:
  [ticket/9416] HTML entities in poll titles and options incorrectly re-encoded
 2011-11-18 19:32:36 +01:00
Nils Adermann
cfaf0e1e96 Merge remote-tracking branch 'github-nickvergessen/ticket/10296' into 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
 2011-11-18 19:17:20 +01:00
Andreas Fischer
93c4cdd1de Merge remote-tracking branch 'nickvergessen/ticket/10185' into develop-olympus 
* nickvergessen/ticket/10185:
  [ticket/10185] Always set board startdate on conversion
 2011-11-18 18:07:44 +01:00
Joas Schilling
a7d7083d75 Merge remote-tracking branch 'remotes/rxu/ticket/9008' into develop-olympus 2011-11-18 15:22:01 +01:00
Oleg Pudeyev
aeb896399c Merge remote-tracking branch 'nickvergessen/ticket/10157' into develop-olympus 
* nickvergessen/ticket/10157:
  [ticket/10157] Add notification to update cpfs when installing a language.
 2011-11-17 12:44:04 -05:00
rxu
3091efc501 [ticket/9416] HTML entities in poll titles and options incorrectly re-encoded 
PHPBB3-9416
 2011-11-17 22:16:41 +08:00
Joas Schilling
b2b057910e [ticket/10157] Add notification to update cpfs when installing a language. 
We currently just copy the language-strings from the default language. But the
admin should be reminded to change them.

PHPBB3-10157
 2011-11-17 10:28:16 +01:00
dmauri
3d893c8222 [ticket/10296] Fix CROSS JOIN with INNER JOIN on MSSQL, Postgres and Oracle 
PHPBB3-10296
 2011-11-15 22:19:45 +01:00
Joas Schilling
e8686d9dad [ticket/10296] Add unit test for CROSS JOIN with INNER JOIN 
PHPBB3-10296
 2011-11-15 22:14:28 +01:00
Joas Schilling
815dd3591b [ticket/10185] Always set board startdate on conversion 
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
 2011-11-15 17:23:55 +01:00
Andreas Fischer
39f8592312 Merge remote-tracking branch 'rxu/ticket/10419' into develop-olympus 
* 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
 2011-11-15 16:46:08 +01:00
rxu
f1a53659bd [ticket/10419] Reword the language strings 
PHPBB3-10419
 2011-11-15 23:43:52 +08:00
Andreas Fischer
f7286e1abe Merge remote-tracking branch 'nickvergessen/ticket/10452' into develop-olympus 
* nickvergessen/ticket/10452:
  [ticket/10452] Fix xHTML errors when print-viewing PMs
 2011-11-14 21:57:00 +01:00
Andreas Fischer
69f943c8d6 Merge remote-tracking branch 'nickvergessen/ticket/9361' into develop-olympus 
* nickvergessen/ticket/9361:
  [ticket/9361] View correct error messages when editing account information
 2011-11-14 19:01:06 +01:00
Joas Schilling
14af18cb1b [ticket/9361] View correct error messages when editing account information 
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
 2011-11-14 18:54:12 +01:00
Joas Schilling
9830453487 [ticket/10452] Fix xHTML errors when print-viewing PMs 
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
 2011-11-14 18:41:19 +01:00
Andreas Fischer
f31da015fc Merge remote-tracking branch 'nickvergessen/ticket/9066' into develop-olympus 
* 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
 2011-11-14 15:46:50 +01:00
Joas Schilling
3302305cd4 [ticket/9066] Move regex into get_preg_expression function and add tests 
PHPBB3-9066
 2011-11-14 15:10:25 +01:00
Andreas Fischer
9d7b144c54 Merge remote-tracking branch 'bantu/ticket/10254' into develop-olympus 
* 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.
 2011-11-14 13:44:38 +01:00
Andreas Fischer
e543effc64 [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css 
PHPBB3-10254
 2011-11-14 13:32:54 +01:00
maelsoucaze
cf044c363b [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com. 
PHPBB3-10254
 2011-11-14 13:29:38 +01:00
maelsoucaze
4d760630c3 [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com. 
PHPBB3-10254
 2011-11-14 13:29:28 +01:00
maelsoucaze
c79992d1cc [ticket/10254] Remove subsilver2 as default style on theme. 
PHPBB3-10254
 2011-11-14 13:29:18 +01:00
maelsoucaze
dee836315c [ticket/10254] Remove style names from themes and fix some informations on it. 
PHPBB3-10254
 2011-11-14 13:28:42 +01:00
Andreas Fischer
9553b2239c Merge remote-tracking branch 'igorw/ticket/10087' into develop-olympus 
* igorw/ticket/10087:
  [ticket/10087] Organize bans in acp_baninto optgroups
 2011-11-13 21:13:22 +01:00
Andreas Fischer
0a5d2a84d1 Merge remote-tracking branch 'igorw/ticket/8616' into develop-olympus 
* 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
 2011-11-13 20:34:39 +01:00
Andreas Fischer
0579795a17 Merge remote-tracking branch 'nickvergessen/ticket/7138' into develop-olympus 
* nickvergessen/ticket/7138:
  [ticket/7138] Allow simple header and footer for trigger_error() messages
 2011-11-13 20:24:55 +01:00
David King
b371d62dd3 [ticket/7138] Allow simple header and footer for trigger_error() messages 
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
 2011-11-13 16:30:11 +01:00
Igor Wiedler
00f792f16f Merge remote-tracking branch 'bantu/ticket/10190' into develop-olympus 
* bantu/ticket/10190:
  [ticket/10190] Do not show hint about permissions when editing forum settings.
 2011-11-13 16:08:19 +01:00
Andreas Fischer
4c765bb206 Merge remote-tracking branch 'igorw/ticket/10365' into develop-olympus 
* 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
 2011-11-13 15:47:30 +01:00
Joas Schilling
6370ef2705 [ticket/9066] Disallow some database prefix to prevent same errors and problems 
With this patch database prefixes must not be empty and only contain
alphanumeric characters, numbers and underscores.

PHPBB3-9066
 2011-11-13 15:40:18 +01:00
Igor Wiedler
52bd8c307f [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read 
PHPBB3-10365
 2011-11-13 15:37:26 +01:00
Andreas Fischer
f00f3ad8ea Merge remote-tracking branch 'nickvergessen/ticket/10437' into develop-olympus 
* nickvergessen/ticket/10437:
  [ticket/10437] Do not display announcements that are waiting for approval
 2011-11-13 15:35:18 +01:00
Joas Schilling
91155d1330 [ticket/10437] Do not display announcements that are waiting for approval 
PHPBB3-10437
 2011-11-13 15:33:47 +01:00