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

Merge remote-tracking branch 'phpbb/develop' into ticket/9657

Browse Source 
* phpbb/develop: (216 commits)
  [ticket/11626] Remove last reference to template in ldap
  [ticket/11626] Remove LDAP dependency on template
  [develop-olympus] Increment version number to 3.0.13-dev.
  [develop-olympus] Add changelog for 3.0.12 release.
  [develop-olympus] Bump version numbers for 3.0.12-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.12 releases.
  [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
  [ticket/11668] Run lint test at the end of the test suite
  [ticket/11548] Fix test errors in groups test on develop
  [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
  [ticket/11548] Fix incorrect usage of array_map on acp groups page
  [ticket/11665] Fix test class name
  [ticket/11664] Stop creating php.html file in root path in tests
  [ticket/11665] Can't change file names already sent to set_filenames
  [ticket/11662] Typos: occured -> occurred
  [ticket/11662] Typos: occured -> occurred
  [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
  [feature/auth-refactor] Add parent::setUp() in setUp()
  [feature/auth-refactor] Changes
  [feature/auth-refactor] DataProvider for acp_board test
  ...
This commit is contained in:
Joas Schilling
2013-07-13 09:36:24 -04:00
parent 28e3341fcd b5651c0289
commit 8352a7cada
122 changed files with 3601 additions and 2825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/styles/prosilver/template/memberlist_search.html
View File

@@ -38,7 +38,7 @@ function insert_single(user)
// ]]>
</script>
<!-- ENDIF -->
<!-- INCLUDEJS template/forum_fn.js -->
<!-- INCLUDEJS forum_fn.js -->
<h2 class="solo">{L_FIND_USERNAME}</h2>
<form method="post" action="{S_MODE_ACTION}" id="search_memberlist">

10
phpBB/styles/prosilver/template/overall_footer.html
View File

@@ -53,11 +53,13 @@
<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js?assets_version={T_ASSETS_VERSION}"></script>
<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
<!-- INCLUDEJS template/ajax.js -->
{SCRIPTS}
<!-- INCLUDEJS forum_fn.js -->
<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/core.js -->
<!-- INCLUDEJS ajax.js -->
<!-- EVENT overall_footer_after -->
{$SCRIPTS}
</body>
</html>

2
phpBB/styles/prosilver/template/overall_header.html
View File

@@ -76,6 +76,8 @@
<!-- EVENT overall_header_head_append -->
{$STYLESHEETS}
</head>
<body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">

4
phpBB/styles/prosilver/template/posting_buttons.html
View File

@@ -39,7 +39,7 @@
{
dE('colour_palette');
e = document.getElementById('colour_palette');
if (e.style.display == 'block')
{
document.getElementById('bbpalette').value = '{LA_FONT_COLOR_HIDE}';
@@ -52,7 +52,7 @@
// ]]>
</script>
<!-- INCLUDEJS template/editor.js -->
<!-- INCLUDEJS editor.js -->
<!-- IF S_BBCODE_ALLOWED -->
<div id="colour_palette" style="display: none;">

2
phpBB/styles/prosilver/template/timezone_option.html
View File

@@ -15,6 +15,6 @@
{S_TZ_OPTIONS}
</select>
<!-- INCLUDEJS template/timezone.js -->
<!-- INCLUDEJS timezone.js -->
</dd>
</dl>

2
phpBB/styles/prosilver/template/ucp_avatar_options.html
View File

@@ -47,4 +47,4 @@
</div>
</div>
<!-- INCLUDEJS template/avatars.js -->
<!-- INCLUDEJS avatars.js -->

6
phpBB/styles/subsilver2/template/overall_footer.html
View File

@@ -13,9 +13,11 @@
<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
{SCRIPTS}
<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/core.js -->
<!-- EVENT overall_footer_after -->
{$SCRIPTS}
</body>
</html>

2
phpBB/styles/subsilver2/template/overall_header.html
View File

@@ -132,6 +132,8 @@ function marklist(id, name, state)
<!-- EVENT overall_header_head_append -->
{$STYLESHEETS}
</head>
<body class="{S_CONTENT_DIRECTION}">

2
phpBB/styles/subsilver2/template/timezone_option.html
View File

@@ -15,6 +15,6 @@
{S_TZ_OPTIONS}
</select>
<!-- INCLUDEJS template/timezone.js -->
<!-- INCLUDEJS timezone.js -->
</td>
</tr>

2
phpBB/styles/subsilver2/template/ucp_groups_manage.html
View File

@@ -95,7 +95,7 @@
</tr>
</table>
<!-- INCLUDEJS template/avatars.js -->
<!-- INCLUDEJS avatars.js -->
<!-- ELSEIF S_LIST -->

2
phpBB/styles/subsilver2/template/ucp_profile_avatar.html
View File

@@ -48,6 +48,6 @@
</tr>
</table>
<!-- INCLUDEJS template/avatars.js -->
<!-- INCLUDEJS avatars.js -->
<!-- INCLUDE ucp_footer.html -->