mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-03 04:55:36 +02:00
Code Issues Releases Wiki Activity
11,561 Commits 18 Branches 192 Tags
Commit Graph

11561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleg Pudeyev
e81c7a788a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8937] Keep space characters in front of [code] bbcode content
 2011-08-07 16:30:32 -04:00
Oleg Pudeyev
eb4660f4ef Merge remote-tracking branch 'naderman/ticket/8937' into develop-olympus 
* naderman/ticket/8937:
  [ticket/8937] Keep space characters in front of [code] bbcode content
 2011-08-07 16:23:26 -04:00
Oleg Pudeyev
88eb822126 Merge branch 'ticket/imkingdavid/10290' into develop 
* ticket/imkingdavid/10290:
  [ticket/10290] Fixed malformed SQL query in viewonline.php
 2011-08-04 23:16:59 -04:00
David King
554ec1cbd4 [ticket/10290] Fixed malformed SQL query in viewonline.php 
As per Oleg's suggestion, the offending equals sign was removed
so that the query did not return an error.

PHPBB3-10290
 2011-08-04 23:16:23 -04:00
Oleg Pudeyev
22389d4324 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()
 2011-08-04 23:11:16 -04:00
Oleg Pudeyev
ec3f4db425 Merge remote-tracking branch 'bantu/ticket/10299' into develop-olympus 
* bantu/ticket/10299:
  [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()
 2011-08-04 23:07:06 -04:00
Oleg Pudeyev
0bfd4639ab Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10303] Removed HTTP_VERSION code path from send_status_line().
 2011-08-04 23:05:35 -04:00
Oleg Pudeyev
66867b5ac0 Merge remote-tracking branch 'cs278/ticket/10303' into develop-olympus 
* cs278/ticket/10303:
  [ticket/10303] Removed HTTP_VERSION code path from send_status_line().
 2011-08-04 22:56:20 -04:00
Chris Smith
cc87d553d0 [ticket/10303] Removed HTTP_VERSION code path from send_status_line(). 
PHPBB3-10303
 2011-08-05 01:17:57 +01:00
Andreas Fischer
08ca84a3e7 [ticket/10299] Fix typo in comment about $max_store_length in truncate_string() 
PHPBB3-10299
 2011-07-31 15:34:45 +02:00
Oleg Pudeyev
124b8a92ec Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8173] Removed some redundant code in the BBCode JavaScript.
 2011-07-30 19:37:24 -04:00
Oleg Pudeyev
edb745e951 Merge remote-tracking branch 'callumacrae/ticket/8173' into develop-olympus 
* callumacrae/ticket/8173:
  [ticket/8173] Removed some redundant code in the BBCode JavaScript.

Conflicts:
	phpBB/adm/style/acp_users_signature.html
 2011-07-30 19:33:41 -04:00
Oleg Pudeyev
139f8e84d8 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9645] Added code to repair invalid anchor names in acp_php_info.
 2011-07-30 18:55:32 -04:00
Oleg Pudeyev
5653be8e16 Merge remote-tracking branch 'callumacrae/ticket/9645' into develop-olympus 
* callumacrae/ticket/9645:
  [ticket/9645] Added code to repair invalid anchor names in acp_php_info.
 2011-07-30 18:47:54 -04:00
Oleg Pudeyev
a8ee16b82d Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10293] Fixed the JavaScript in the jumpbox.
 2011-07-30 18:36:15 -04:00
Oleg Pudeyev
7ebec68616 Merge remote-tracking branch 'callumacrae/ticket/10293' into develop-olympus 
* callumacrae/ticket/10293:
  [ticket/10293] Fixed the JavaScript in the jumpbox.
 2011-07-30 18:36:04 -04:00
Andreas Fischer
366b14b6c5 Merge remote-tracking branch 'igorw/ticket/10258' into develop 
* igorw/ticket/10258:
  [ticket/10258] Add HTML5 meta charset tag
 2011-07-30 16:49:39 +02:00
Andreas Fischer
cb74439046 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10199] Delete a useless join in viewtopic.
 2011-07-30 16:45:37 +02:00
Andreas Fischer
25902c3bfc Merge remote-tracking branch 'p/ticket/10199' into develop-olympus 
* p/ticket/10199:
  [ticket/10199] Delete a useless join in viewtopic.
 2011-07-30 16:44:27 +02:00
Andreas Fischer
9fd849b3fd Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10263] Fix comment about return value of phpbb_version_compare().
 2011-07-30 16:44:08 +02:00
Andreas Fischer
bd2fd4ec1d Merge remote-tracking branch 'bantu/ticket/10263' into develop-olympus 
* bantu/ticket/10263:
  [ticket/10263] Fix comment about return value of phpbb_version_compare().
 2011-07-30 16:43:37 +02:00
Callum Macrae
9c6339fb57 [ticket/8173] Removed some redundant code in the BBCode JavaScript. 
The following code can be found in the ACP, when changing a user's
signature:

t: '{ BBCODE_T_HELP }',

The code that uses it and the code that produces it were changed or
removed a while ago, but this code remained. In 2c4c1f9, the accesskey
for the list item button was changed to y from t, explaining the origin of
the redundant code - although it wasn't being used then, either.

This commit also changes the helpline code of "[*]" to y, as the access
key is y, so this makes it more consistent.

PHPBB3-8173
 2011-07-30 08:57:17 +01:00
Oleg Pudeyev
a824a90d5e Merge branch 'develop-olympus' into develop 
* develop-olympus:
 2011-07-30 00:48:13 -04:00
Oleg Pudeyev
b960dd4e0d Merge remote-tracking branch 'callumacrae/ticket/10032' into develop-olympus 
* callumacrae/ticket/10032:
  [ticket/10032] Fixed typos in bbcode button name.
 2011-07-30 00:48:03 -04:00
Oleg Pudeyev
45b19e6419 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10032] Fixed typos in bbcode button name.
 2011-07-30 00:45:31 -04:00
Oleg Pudeyev
43b5ca32be Merge remote-tracking branch 'callumacrae/ticket/10032' into develop-olympus 
* callumacrae/ticket/10032:
  [ticket/10032] Fixed typos in bbcode button name.
 2011-07-30 00:45:17 -04:00
Igor Wiedler
681c4a478d [ticket/10258] Add HTML5 meta charset tag 
This allows knowing the charset when saving web pages to disk. Also, this is
supported by all browsers.

PHPBB3-10258
 2011-07-29 16:32:22 +02:00
Callum Macrae
381ebcf195 [ticket/9645] Added code to repair invalid anchor names in acp_php_info. 
Some of the anchor tags produced by php_info had names like "module_Zend
Optimizer", which is obviously invalid. This commit adds some code that
repairs the names by replacing all spaces found in the names with
underscores.

PHPBB3-9645
 2011-07-28 16:41:04 +01:00
Andreas Fischer
65ec47abfa [ticket/10263] Fix comment about return value of phpbb_version_compare(). 
PHPBB3-10263
 2011-07-27 00:13:23 +02:00
Callum Macrae
7e01850a42 [ticket/10293] Fixed the JavaScript in the jumpbox. 
The current code is invalid, and results in an critical error which
aborts the script before it gets to return false, thus allowing the form
to submit with an invalid forum ID. This commit fixes that by
referencing "this" instead of "document.jumpbox", which didn't exist
because the form had no name.

PHPBB3-10293
 2011-07-26 13:43:52 +01:00
Andreas Fischer
04c0d6461f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10292] Fixed a whitespace inconsistency in acp_ranks.
 2011-07-25 22:26:57 +02:00
Andreas Fischer
efc7aa00cd Merge remote-tracking branch 'callumacrae/ticket/10292' into develop-olympus 
* callumacrae/ticket/10292:
  [ticket/10292] Fixed a whitespace inconsistency in acp_ranks.
 2011-07-25 22:26:44 +02:00
Callum Macrae
f51b2f8fec [ticket/10292] Fixed a whitespace inconsistency in acp_ranks. 
There is no space between the first radio button and "Yes", while there
is a space between the second radio button and "No". This commit fixes
that.

PHPBB3-10292
 2011-07-25 21:08:26 +01:00
Oleg Pudeyev
0648923b19 [ticket/10199] Delete a useless join in viewtopic. 
PHPBB3-10199
 2011-07-24 04:39:00 -04:00
Nils Adermann
ddbad5551d Merge remote-tracking branch 'github-igorw/ticket/10258' into develop 
* github-igorw/ticket/10258:
  [ticket/10258] Remove the meta charset tag
  [ticket/10258] Adjust some deprecated tags for HTML5 in coding-guidelines
  [ticket/10258] Remove copyright meta tag from docs
  [ticket/10258] Remove resource-type and distribution meta tags
  [ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tags
  [ticket/10258] Change the DOCTYPE to HTML5
 2011-07-20 09:21:16 -04:00
Nils Adermann
627e2644a2 [ticket/8937] Keep space characters in front of [code] bbcode content 
PHPBB3-8937
 2011-07-17 00:44:39 -04:00
Nils Adermann
014dc53a80 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/6632] Better viewing of topics for wide screen displays

Conflicts:
	phpBB/styles/prosilver/template/forumlist_body.html
	phpBB/styles/prosilver/template/viewforum_body.html
 2011-07-16 23:16:23 -04:00
Nils Adermann
13ca659f1f Merge remote-tracking branch 'github-nickvergessen/ticket/6632' into develop-olympus 
* github-nickvergessen/ticket/6632:
  [ticket/6632] Better viewing of topics for wide screen displays
 2011-07-16 23:08:31 -04:00
Nils Adermann
8da1d5e187 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003.
  [ticket/10257] Fix AAAA record parsing for old versions of Windows
  [ticket/10257] Add missing break statement after CNAME block.
 2011-07-16 22:52:36 -04:00
Nils Adermann
afa377d028 Merge remote-tracking branch 'github-bantu/ticket/10257' into develop-olympus 
* github-bantu/ticket/10257:
  [ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003.
  [ticket/10257] Fix AAAA record parsing for old versions of Windows
  [ticket/10257] Add missing break statement after CNAME block.
 2011-07-16 22:48:58 -04:00
Nils Adermann
66a1ea52c4 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10274] Remove hardcoded module_id from U_VERSIONCHECK_FORCE on acp_main
 2011-07-16 22:46:39 -04:00
Nils Adermann
7c84cb5f5f Merge remote-tracking branch 'github-bantu/ticket/10274' into develop-olympus 
* github-bantu/ticket/10274:
  [ticket/10274] Remove hardcoded module_id from U_VERSIONCHECK_FORCE on acp_main
 2011-07-16 22:45:56 -04:00
Nils Adermann
26326937f2 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10266] Add "Return to forum" link after reporting a post
 2011-07-16 22:28:55 -04:00
Nils Adermann
d80be455b9 Merge remote-tracking branch 'github-nickvergessen/ticket/10266' into develop-olympus 
* github-nickvergessen/ticket/10266:
  [ticket/10266] Add "Return to forum" link after reporting a post
 2011-07-16 22:26:46 -04:00
Nils Adermann
ee12a66c74 Merge remote-tracking branch 'github-bantu/ticket/10265' into develop 
* github-bantu/ticket/10265:
  [ticket/10265] Move mt_rand.php to wrapper folder and add _test suffix.
 2011-07-16 22:24:55 -04:00
Nils Adermann
e9ae88338b Merge remote-tracking branch 'github-bantu/ticket/10265' into develop-olympus 
* github-bantu/ticket/10265:
  [ticket/10265] Move mt_rand.php to wrapper folder and add _test suffix.
 2011-07-16 22:24:07 -04:00
Nils Adermann
6923069e0e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_main.php
  [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_update.php
  [ticket/10263] Adding unit tests for phpbb_version_compare().
  [ticket/10263] Add wrapper for version_compare() that allows the use of A and B
 2011-07-16 22:22:35 -04:00
Nils Adermann
82fa4eff7e Merge remote-tracking branch 'github-bantu/ticket/10263' into develop-olympus 
* github-bantu/ticket/10263:
  [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_main.php
  [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_update.php
  [ticket/10263] Adding unit tests for phpbb_version_compare().
  [ticket/10263] Add wrapper for version_compare() that allows the use of A and B
 2011-07-16 22:21:49 -04:00
Nils Adermann
aa0c3a0f45 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10226] Use is_numeric() instead of preg_replace()
  [ticket/10226] Allow mysqli connections via local sockets/pipes
 2011-07-16 22:19:02 -04:00
Nils Adermann
825d44fcc2 Merge remote-tracking branch 'github-rxu/ticket/10226' into develop-olympus 
* github-rxu/ticket/10226:
  [ticket/10226] Use is_numeric() instead of preg_replace()
  [ticket/10226] Allow mysqli connections via local sockets/pipes
 2011-07-16 22:18:48 -04:00