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
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
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
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
65921ae67a
[ticket/10453] PM viewmessage page is misplacing the online icon
...
PHPBB3-10453
http://tracker.phpbb.com/browse/PHPBB3-10453
2011-11-13 20:10:51 +01:00
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
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
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
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
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
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
52bd8c307f
[ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read
...
PHPBB3-10365
2011-11-13 15:37:26 +01:00
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
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
91155d1330
[ticket/10437] Do not display announcements that are waiting for approval
...
PHPBB3-10437
2011-11-13 15:33:47 +01:00
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
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
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
edd5866a6e
[ticket/10087] Organize bans in acp_baninto optgroups
...
PHPBB3-10087
2011-11-11 23:08:52 +01:00
2b3effb13c
[ticket/8616] Include old U_INBOX var for BC
...
PHPBB3-8616
2011-11-11 22:34:45 +01:00
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
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
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
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
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
2918fbc970
[ticket/10419] Reword some language strings, minor code changes
...
PHPBB3-10419
2011-11-05 01:02:40 +08:00
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
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
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
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
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
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
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
1dfb52b805
Merge branch 'develop-olympus' into develop
2011-10-30 16:12:22 +01:00
a63490f744
Merge remote-tracking branch 'remotes/marc1706/ticket/9778' into develop-olympus
2011-10-30 16:10:45 +01:00
75a44a6970
[ticket/9778] Replaced "Find a member" with "Enter username"
...
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
2011-10-30 15:46:52 +01:00
bb40789552
[ticket/10434] Add script for creating search index from CLI.
...
PHPBB3-10434
2011-10-30 14:00:30 +01:00
baac9e5d15
[ticket/10349] Removed duplicated functions from schema loading in tests
...
PHPBB3-10349
2011-10-29 17:10:10 -05:00
cf49b5f46f
[ticket/7932] Fix font size in select boxes
...
PHPBB3-7932
2011-10-29 23:32:47 +02:00
da8cac280c
[ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
...
PHPBB3-9036
2011-10-29 16:26:17 +02:00
72a3bcd048
Merge branch 'develop-olympus' into develop
...
* 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
2011-10-29 13:03:04 +02:00
6d913d3646
Merge remote-tracking branch 'cs278/ticket/9307' into develop-olympus
...
* cs278/ticket/9307:
[ticket/9307] Add config variable to installation schema.
[ticket/9307] Remove hardcoded chunk size of mass emails.
2011-10-29 13:01:03 +02:00
5351195dd7
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10420] Update includes/startup.php for PHP 5.4.
2011-10-29 12:37:32 +02:00
319d12bedf
Merge remote-tracking branch 'bantu/ticket/10420' into develop-olympus
...
* bantu/ticket/10420:
[ticket/10420] Update includes/startup.php for PHP 5.4.
2011-10-29 12:37:16 +02:00
27a80d0379
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10422] Invalid "if" in viewtopic_body.html
2011-10-29 12:35:44 +02:00
d0bbb3f7f0
Merge remote-tracking branch 'cyberalien/ticket/10422' into develop-olympus
...
* cyberalien/ticket/10422:
[ticket/10422] Invalid "if" in viewtopic_body.html
2011-10-29 12:35:30 +02:00
189bd6dc9b
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
2011-10-29 12:32:39 +02:00
020106eeb9
Merge remote-tracking branch 'bantu/ticket/10421' into develop-olympus
...
* bantu/ticket/10421:
[ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
2011-10-29 12:32:25 +02:00
acd72fad7b
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10430] Fix typos/etc in coding guidelines
2011-10-29 12:22:17 +02:00
17451e0842
Merge remote-tracking branch 'dellsystem/ticket/olympus/10430' into develop-olympus
...
* dellsystem/ticket/olympus/10430:
[ticket/10430] Fix typos/etc in coding guidelines
2011-10-29 12:22:02 +02:00
