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

11503 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Nils Adermann
e327baaa89 Merge remote-tracking branch 'github-bantu/ticket/10208' into develop-olympus 
* github-bantu/ticket/10208:
  [ticket/10208] Explain what happens when 'Warning duration' is set to 0.
 2011-07-15 19:55:02 -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
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
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
Joas Schilling
7f7a0d8b9f Merge remote branch 'remotes/bantu/ticket/10267' into develop-olympus 
* remotes/bantu/ticket/10267:
  [ticket/10267] Call strlen() on $table_prefix for $max_length calculation.
 2011-07-14 20:13:15 +02:00
Callum Macrae
e9319ee2aa [ticket/10216] Fixed a grammar error in SOME_QUERIES_FAILED. 
Previously "errors are listing below", should have said "errors are
listed below".

PHPBB3-10216
 2011-07-14 18:48:37 +01:00
Joas Schilling
8ebc8ec182 [ticket/5506] Do not display an empty last page after deleting logs. 
The fix is copied from view_inactive_users().
Also add keywords and sort parameters to url for deleting logs and inactive users.
And finally save some queries if there are no logs/users to display anyway
 2011-07-14 04:05:20 +02:00
Andreas Fischer
d16525e176 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10255] Add leading slash in gitignore to only ignore specified files

Conflicts:
	.gitignore
 2011-07-14 03:20:55 +02:00
Andreas Fischer
4b2ff05a3b Merge remote-tracking branch 'nickvergessen/ticket/10255' into develop-olympus 
* nickvergessen/ticket/10255:
  [ticket/10255] Add leading slash in gitignore to only ignore specified files
 2011-07-14 03:18:16 +02:00
Joas Schilling
b7459cc5f7 [ticket/10255] Add leading slash in gitignore to only ignore specified files 
PHPBB3-10255
 2011-07-14 02:33:32 +02:00
Andreas Fischer
b1608ae860 [ticket/10267] Call strlen() on $table_prefix for $max_length calculation. 
PHPBB3-10267
 2011-07-14 02:09:22 +02:00
Andreas Fischer
10384f2179 Merge remote-tracking branch 'igorw/ticket/7090' into develop 
* igorw/ticket/7090:
  [ticket/7090] Update documented minimum PHP version to  5.2.0
 2011-07-13 13:36:55 +02:00
Igor Wiedler
541a7db101 [ticket/7090] Update documented minimum PHP version to 5.2.0 
PHPBB3-7090
 2011-07-13 13:02:37 +02:00
Andreas Fischer
fdfd4ce5fd [ticket/10263] Adding unit tests for phpbb_version_compare(). 
PHPBB3-10263
 2011-07-13 02:35:11 +02:00
Andreas Fischer
f926acf1b8 [ticket/10263] Add wrapper for version_compare() that allows the use of A and B 
Add wrapper function for version_compare() that allows using uppercase A and B
for alpha and beta release version strings.

PHPBB3-10263
 2011-07-13 02:33:29 +02:00
Andreas Fischer
e11f9afdce [ticket/10265] Move mt_rand.php to wrapper folder and add _test suffix. 
PHPBB3-10265
 2011-07-13 01:44:41 +02:00
Andreas Fischer
0e85704d75 [ticket/10243] Adding a few unit tests for phpbb_gmgetdate(). 
PHPBB3-10243
 2011-07-13 00:44:10 +02:00
Andreas Fischer
91fd6df430 [ticket/10243] Call phpbb_gmgetdate() from various places. 
PHPBB3-10243
 2011-07-13 00:01:37 +02:00
Andreas Fischer
db352c17f8 [ticket/10243] Adding wrapper function for getdate() for UTC timestamps. 
PHPBB3-10243
 2011-07-12 23:46:20 +02:00
Igor Wiedler
4fe7e40f14 [ticket/10260] Remove prosilver styleswitcher 
The styleswitcher is an odd invention that allows setting the font size
of the page dynamically via JavaScript (and CSS). This should be done by
browser settings instead.

PHPBB3-10260
 2011-07-12 01:43:55 +02:00
Joas Schilling
d60ffdd55c [ticket/10237] Also display login-box on subscribing 
PHPBB3-10237
 2011-07-11 19:31:11 +02:00
Joas Schilling
773561f862 [ticket/10237] Handle watching and unwatching the same way. 
Also add some information to the confirm-box (forum_name / topic title)

PHPBB3-10237
 2011-07-11 19:24:40 +02:00
Andreas Fischer
09e0460e5b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.9] Bumping version number for 3.0.9 final.

Conflicts:
	phpBB/install/database_update.php
 2011-07-10 23:11:29 +02:00
Andreas Fischer
e4707a8be7 Merge branch 'prep-release-3.0.9' into develop-olympus 
* prep-release-3.0.9:
  [prep-release-3.0.9] Bumping version number for 3.0.9 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2011-07-10 23:08:56 +02:00
Andreas Fischer
e6572b766f [prep-release-3.0.9] Bumping version number for 3.0.9 final. 2011-07-10 22:36:17 +02:00
Andreas Fischer
e2d27a30a6 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10003] Fixed comment referring to db_tools duplication.
  [ticket/10003] Require db_tools.php in database_update.php.
  [ticket/10003] Use phpbb_db_tools in database_update.php.
  [ticket/10003] Delete the copy of db_tools in database_update.php.

Conflicts:
	phpBB/install/database_update.php
 2011-07-09 16:01:54 +02:00