mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-17 06:04:10 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop

Browse Source 
# By Oleg Pudeyev (45) and others
# Via Oleg Pudeyev (42) and others
* remotes/phpbb/develop: (289 commits)
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10780] Use L_COLON on LDAP page.
  [ticket/10780] Use L_COLON on search backend ACP pages.
  [ticket/10780] Use L_COLON for "download all attachments".
  [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
  [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
  [ticket/10780] Replace colon usage in adm template output with {L_COLON}
  [ticket/10780] Replace colon usage in template output with {L_COLON}
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
  [ticket/10172] Show prosilver birthday list even if there are no birthdays.
  [ticket/11050] make all properties protected in all search backends
  [ticket/11050] get_common_words() returns empty array for sphinx
  [ticket/11050] fix tidied search query docblock language
  [ticket/11050] fix min/max length docblock language
  [ticket/11050] multi sentences separated by period in docblocks
  [ticket/11050] fix separated spelling in docblock
  [ticket/11050] fix split words doc block language
  [ticket/11050] remove class word from docblocks
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/language/en/acp/permissions_phpbb.php
	phpBB/styles/prosilver/template/posting_editor.html
This commit is contained in:
Joas Schilling
2012-11-10 12:27:19 +01:00
parent 03821ad2a2 29fdad396d
commit 948bfcbe77
384 changed files with 6315 additions and 2112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/styles/prosilver/template/mcp_queue.html
View File

@@ -3,7 +3,7 @@
<form id="mcp" method="post" action="{S_MCP_ACTION}">
<fieldset class="forum-selection">
<label for="fo">{L_FORUM}: <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label>
<label for="fo">{L_FORUM}{L_COLON} <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label>
<input type="submit" name="sort" value="{L_GO}" class="button2" />
{S_FORM_TOKEN}
</fieldset>
@@ -51,8 +51,8 @@
</dt>
<dd class="moderation">
<span>
<!-- IF S_TOPICS --><br /><!-- ELSE -->{L_TOPIC}: <a href="{postrow.U_TOPIC}">{postrow.TOPIC_TITLE}</a> <br /><!-- ENDIF -->
{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a>
<!-- IF S_TOPICS --><br /><!-- ELSE -->{L_TOPIC}{L_COLON} <a href="{postrow.U_TOPIC}">{postrow.TOPIC_TITLE}</a> <br /><!-- ENDIF -->
{L_FORUM}{L_COLON} <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a>
</span>
</dd>
@@ -73,7 +73,7 @@
<fieldset class="display-options">
<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label>
<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />&nbsp; <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->
<input type="submit" name="sort" value="{L_GO}" class="button2" />