makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 13:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
11541 commits 18 branches 192 tags 207 MiB
Commit graph

10952 commits

Author SHA1 Message Date
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
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
Andreas Fischer
65ec47abfa [ticket/10263] Fix comment about return value of phpbb_version_compare(). 
PHPBB3-10263
 2011-07-27 00:13:23 +02: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
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
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
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
Nils Adermann
61e33675be Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10252] Correctly document behaviour of acl_get_list() for a_ permission
 2011-07-16 22:11:32 -04:00
Nils Adermann
03b1f500e7 Merge remote-tracking branch 'github-nickvergessen/ticket/10252' into develop-olympus 
* github-nickvergessen/ticket/10252:
  [ticket/10252] Correctly document behaviour of acl_get_list() for a_ permission
 2011-07-16 22:10:57 -04:00
Nils Adermann
a33b67fd1a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10243] Adding a few unit tests for phpbb_gmgetdate().
  [ticket/10243] Call phpbb_gmgetdate() from various places.
  [ticket/10243] Adding wrapper function for getdate() for UTC timestamps.
 2011-07-16 22:06:49 -04:00
Nils Adermann
0f86034f03 Merge remote-tracking branch 'github-bantu/ticket/10243' into develop-olympus 
* github-bantu/ticket/10243:
  [ticket/10243] Adding a few unit tests for phpbb_gmgetdate().
  [ticket/10243] Call phpbb_gmgetdate() from various places.
  [ticket/10243] Adding wrapper function for getdate() for UTC timestamps.
 2011-07-16 22:05:03 -04:00
Nils Adermann
19925ad059 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10237] Also display login-box on subscribing
  [ticket/10237] Handle watching and unwatching the same way.
  [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions

Conflicts:
	phpBB/includes/functions_display.php
 2011-07-16 21:57:16 -04:00
Nils Adermann
b3cdd1d169 Merge remote-tracking branch 'github-nickvergessen/ticket/10237' into develop-olympus 
* github-nickvergessen/ticket/10237:
  [ticket/10237] Also display login-box on subscribing
  [ticket/10237] Handle watching and unwatching the same way.
  [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions
 2011-07-16 21:43:17 -04:00
Nils Adermann
6291a37644 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/7291] Use template loop for character list, to avoid double &first_char
 2011-07-16 21:06:49 -04:00
Nils Adermann
dcceeb8012 Merge remote-tracking branch 'github-nickvergessen/ticket/7291' into develop-olympus 
* github-nickvergessen/ticket/7291:
  [ticket/7291] Use template loop for character list, to avoid double &first_char
 2011-07-16 21:05:04 -04:00
Nils Adermann
6f851d89aa Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/5506] Do not display an empty last page after deleting logs.
 2011-07-16 21:00:14 -04:00
Nils Adermann
83f955a2c5 Merge remote-tracking branch 'github-nickvergessen/ticket/5506' into develop-olympus 
* github-nickvergessen/ticket/5506:
  [ticket/5506] Do not display an empty last page after deleting logs.
 2011-07-16 20:53:30 -04:00
Nils Adermann
b876a1ff20 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10208] Explain what happens when 'Warning duration' is set to 0.
 2011-07-15 19:55:38 -04:00
Andreas Fischer
ec7ec9ecac Merge remote-tracking branch 'igorw/ticket/10260' into develop 
* igorw/ticket/10260:
  [ticket/10260] Remove the icon_fontsize.gif image (thanks Vinny)
 2011-07-16 01:17:54 +02:00
Tabitha Backoff
2bba22e9d3 [ticket/10208] Explain what happens when 'Warning duration' is set to 0. 
PHPBB3-10208
 2011-07-16 01:16:46 +02:00
Igor Wiedler
45dc1c2eff [ticket/10260] Remove the icon_fontsize.gif image (thanks Vinny) 
PHPBB3-10260
 2011-07-15 23:05:47 +02:00
Nils Adermann
8024a794a6 Merge branch 'ticket/igorw/10260' into develop 
* ticket/igorw/10260:
  [ticket/10260] Remove prosilver styleswitcher
 2011-07-15 12:14:13 -04:00
Joas Schilling
2231488543 [ticket/10252] Correctly document behaviour of acl_get_list() for a_ permission 
Be careful when using this function with permissions a_, m_, u_ and f_ ! It may not work correctly. When a user group grants an a_* permission, e.g. a_foo, but the user's a_foo permission is set to "Never", then the user does not in fact have the a_ permission. But the user will still be listed as having the a_ permission.

PHPBB3-10252
 2011-07-15 10:23:06 +02:00
Andreas Fischer
0690e9f103 [ticket/10274] Remove hardcoded module_id from U_VERSIONCHECK_FORCE on acp_main 
PHPBB3-10274
 2011-07-15 00:06:25 +02:00
Andreas Fischer
7f56c05f24 [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_main.php 
PHPBB3-10263
 2011-07-14 23:58:51 +02:00
Andreas Fischer
b0940f52e5 [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_update.php 
PHPBB3-10263
 2011-07-14 23:53:41 +02:00
Joas Schilling
91b20ddba5 [ticket/7291] Use template loop for character list, to avoid double &first_char 
PHPBB3-7291
 2011-07-14 22:29:27 +02:00
Callum Macrae
16c5352a12 [ticket/10032] Fixed typos in bbcode button name. 
addlistitem was addlitsitem.

PHPBB3-10032
 2011-07-14 21:00:10 +01:00
Joas Schilling
0b1ed71b8a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10216] Fixed a grammar error in SOME_QUERIES_FAILED.
 2011-07-14 20:46:08 +02:00
Joas Schilling
1ace10ab92 Merge remote branch 'remotes/callumacrae/ticket/10216' into develop-olympus 
* remotes/callumacrae/ticket/10216:
  [ticket/10216] Fixed a grammar error in SOME_QUERIES_FAILED.
 2011-07-14 20:41:10 +02:00
Joas Schilling
381e31d738 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10267] Call strlen() on $table_prefix for $max_length calculation.
 2011-07-14 20:13:44 +02:00