1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch 'develop' of github.com:phpbb/phpbb3 into feature/twig

# By Dhruv (35) and others
# Via Andreas Fischer (15) and others
* 'develop' of github.com:phpbb/phpbb3: (75 commits)
  [ticket/10776] update min php version 5.3.3 in readme
  [ticket/11503] similar implementation for mssql_native and odbc
  [ticket/11603] Fix out dated comment
  [ticket/11603] Fix usage note
  [ticket/11604] Skip installer step where config.php is created.
  [ticket/11603] Throw RuntimeExceptions instead of using exit()
  [ticket/11603] Avoid using cURL
  [ticket/11604] Fix case where config.php is not generated by phpBB.
  [ticket/11604] Use variables for config.php filesnames.
  [ticket/11561] Specify used tables in notification fixture, so they are emptied
  [ticket/11094] Add textbox for jabber while memberlist search
  [ticket/10820] fix if condition to check for IE
  [ticket/11603] Split api_request into two functions (query only vs. full url)
  [ticket/11603] Fix spacing and add some comments
  [ticket/10820] Add additional check for IE in condition
  [ticket/11603] Fix github API calls
  [ticket/11603] Rename network to forks and fix handling
  [ticket/11603] Fix github api url and use curl with valid user agent
  [ticket/10820] Fix function docblock
  [ticket/10820] Inject IE version in function
  ...
This commit is contained in:
Nathan Guse
2013-06-24 13:49:29 -05:00
37 changed files with 1403 additions and 303 deletions

View File

@@ -74,6 +74,10 @@ function insert_single(user)
<dt><label for="msn">{L_MSNM}{L_COLON}</label></dt>
<dd><input type="text" name="msn" id="msn" value="{MSNM}" class="inputbox" /></dd>
</dl>
<dl>
<dt><label for="jabber">{L_JABBER}:</label></dt>
<dd><input type="text" name="jabber" id="jabber" value="{JABBER}" class="inputbox" /></dd>
</dl>
</fieldset>
<fieldset class="fields1 column2">