Andreas Fischer
2236849511
Merge remote-tracking branch 'nickvergessen/ticket/10457' into develop
...
* nickvergessen/ticket/10457:
[ticket/10457] Undefined variable $request, when print-viewing PMs
2011-11-14 19:01:28 +01:00
Andreas Fischer
2761a993ff
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9361] View correct error messages when editing account information
2011-11-14 19:01:15 +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
160e89aa06
[ticket/10457] Undefined variable $request, when print-viewing PMs
...
PHPBB3-10457
2011-11-14 18:49:07 +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
34ed1352a6
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[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:58 +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
b21e343b5e
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[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:45:01 +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
3dfb116942
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10087] Organize bans in acp_baninto optgroups
2011-11-13 21:14:21 +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
1b003fd244
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[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:53 +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
d3a1b670bd
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/7138] Allow simple header and footer for trigger_error() messages
Conflicts:
phpBB/styles/prosilver/template/message_body.html
2011-11-13 20:28:29 +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
ac8db51c47
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10190] Do not show hint about permissions when editing forum settings.
2011-11-13 16:09:12 +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
8f381fc8ae
Merge branch 'develop-olympus' into develop
...
* 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
2011-11-13 15:47:40 +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
ec1445371d
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10437] Do not display announcements that are waiting for approval
2011-11-13 15:35:27 +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
Andreas Fischer
526fca73e7
Merge remote-tracking branch 'nickvergessen/ticket/develop/10435' into develop
...
* nickvergessen/ticket/develop/10435:
[ticket/10435] Remove global announcement from forums total topic count
Conflicts:
phpBB/viewforum.php
2011-11-13 14:31:33 +01:00
Andreas Fischer
c865146065
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10435] Readd local announcements to total topic count in viewforum
2011-11-13 14:29:21 +01:00
Andreas Fischer
2d989d4322
Merge remote-tracking branch 'nickvergessen/ticket/10435' into develop-olympus
...
* nickvergessen/ticket/10435:
[ticket/10435] Readd local announcements to total topic count in viewforum
2011-11-13 14:13:42 +01:00
Igor Wiedler
edd5866a6e
[ticket/10087] Organize bans in acp_baninto optgroups
...
PHPBB3-10087
2011-11-11 23:08:52 +01:00
Igor Wiedler
2b3effb13c
[ticket/8616] Include old U_INBOX var for BC
...
PHPBB3-8616
2011-11-11 22:34:45 +01:00
Andreas Fischer
019e43bc2d
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10237] Display login-box for guests, when (un)subscribing
Conflicts:
phpBB/includes/functions_display.php
2011-11-11 22:17:12 +01:00
Andreas Fischer
f3c9133a6c
Merge remote-tracking branch 'nickvergessen/ticket/10237' into develop-olympus
...
* nickvergessen/ticket/10237:
[ticket/10237] Display login-box for guests, when (un)subscribing
2011-11-11 22:07:11 +01:00
Joas Schilling
6a379f1a55
[ticket/10435] Remove global announcement from forums total topic count
...
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
2011-11-11 14:11:00 +01:00
Joas Schilling
0d3e9bf446
[ticket/10435] Readd local announcements to total topic count in viewforum
...
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
2011-11-11 14:06:02 +01:00
Joas Schilling
1a19388aa3
[ticket/10237] Display login-box for guests, when (un)subscribing
...
Also initialise $is_watching for PHP Notice: Undefined variable is_watching
PHPBB3-10237
2011-11-06 23:51:29 +01:00
rxu
2918fbc970
[ticket/10419] Reword some language strings, minor code changes
...
PHPBB3-10419
2011-11-05 01:02:40 +08:00
Andreas Fischer
5546e8cf57
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/7932] Fix font size in select boxes
2011-11-01 20:24:00 +01:00
Andreas Fischer
945a63d204
Merge remote-tracking branch 'nickvergessen/ticket/7932' into develop-olympus
...
* nickvergessen/ticket/7932:
[ticket/7932] Fix font size in select boxes
2011-11-01 20:23:20 +01:00
Andreas Fischer
d4cc53dfef
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
2011-11-01 20:08:44 +01:00
Andreas Fischer
0b1199f7b2
Merge remote-tracking branch 'nickvergessen/ticket/9036' into develop-olympus
...
* nickvergessen/ticket/9036:
[ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
2011-11-01 20:08:17 +01:00
Andreas Fischer
589f7ac8e4
Merge remote-tracking branch 'nickvergessen/ticket/10410' into develop
...
* nickvergessen/ticket/10410:
[ticket/10410] Add option to display users in their first teampage group
2011-11-01 20:04:08 +01:00
Igor Wiedler
18ca3a32bc
[ticket/10365] Require m_report permission to see reports in mcp_post
...
This was exposed to anyone with m_ perms in mcp_post_details.
PHPBB3-10365
2011-10-30 19:10:58 +01:00
Igor Wiedler
d6c3e7785d
[ticket/10365] Make sure moderators only get mcp_reports link when allowed
...
The m_report permission is not not being checked when displaying the link to
mcp_reports.
PHPBB3-10365
2011-10-30 19:10:57 +01:00
