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

11796 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
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
bb733b0204 [ticket/6632] Better viewing of topics for wide screen displays 
Also fixes PHPBB3-6458 "Width of Topics and Posts columns in Board Index is causing problems with language packs" by increasing the size to 90px instead of the ~70 it was like. Also tested on RTL languages.

PHPBB3-6458
PHPBB3-6632
 2011-07-14 15:05:25 +02: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
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
1ff0f221fa [ticket/10266] Add "Return to forum" link after reporting a post 
PHPBB3-10266
 2011-07-14 02:52:05 +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
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
271c277ecc [ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003. 
PHPBB3-10257
 2011-07-13 01:06:32 +02:00
Patrick Webster
ae8eee16cc [ticket/10257] Fix AAAA record parsing for old versions of Windows 
Older versions of Windows use a different output format for AAAA records.

PHPBB3-10257
 2011-07-13 01:06:26 +02:00
Andreas Fischer
99db533524 [ticket/10257] Add missing break statement after CNAME block. 
PHPBB3-10257
 2011-07-13 00:55:26 +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
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
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
9efb080875 Merge remote-tracking branch 'p/ticket/10003' into develop-olympus 
* p/ticket/10003:
  [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.
 2011-07-09 15:59:59 +02:00
Oleg Pudeyev
00f7db66f2 [ticket/10003] Fixed comment referring to db_tools duplication. 
PHPBB3-10003
 2011-07-09 01:56:43 -04:00
Oleg Pudeyev
fd728c2815 [ticket/10003] Require db_tools.php in database_update.php. 
Use require_updated to use the new version of db_tools if one
is present.

PHPBB3-10003
 2011-07-09 01:53:07 -04:00
Oleg Pudeyev
5b5c227423 [ticket/10003] Use phpbb_db_tools in database_update.php. 
Now that the copy of db tools has been deleted, change which
class name is used.

PHPBB3-10003
 2011-07-09 01:53:07 -04:00
Oleg Pudeyev
919ba8eb3f [ticket/10003] Delete the copy of db_tools in database_update.php. 
PHPBB3-10003
 2011-07-09 01:53:01 -04:00
Andreas Fischer
f2110183e0 Merge branch 'prep-release-3.0.9' into develop-olympus 
* prep-release-3.0.9:
  [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release.
  [prep-release-3.0.9] Decreasing version for an RC4 release.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2011-07-07 20:29:14 +02:00
Andreas Fischer
1fa77c2fd5 [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release. 2011-07-07 20:20:52 +02:00
Andreas Fischer
787245a113 [prep-release-3.0.9] Decreasing version for an RC4 release. 2011-07-07 20:19:11 +02:00
Andreas Fischer
71df03960c Merge branch 'prep-release-3.0.9' into develop-olympus 
* prep-release-3.0.9:
  [ticket/10250] The site_logo hash is different depending on imageset & language
  [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset
  [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used
  [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
 2011-07-07 20:06:11 +02:00
Andreas Fischer
5fefdecc50 Merge remote-tracking branch 'naderman/ticket/10250' into prep-release-3.0.9 
* naderman/ticket/10250:
  [ticket/10250] The site_logo hash is different depending on imageset & language
  [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset
  [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used
  [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
 2011-07-07 20:05:47 +02:00
Joas Schilling
b2a65ac76d [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions 
PHPBB3-10237
 2011-07-07 12:40:35 +02:00
Nils Adermann
cf4e6d8a3e Merge branch 'prep-release-3.0.9' into develop-olympus 
* prep-release-3.0.9:
  [ticket/9859] Changing all phpBB footers to match the new credit line
  [ticket/9859] New footer copyright line with registered symbol
 2011-07-06 21:51:33 -04:00
Nils Adermann
02bba23844 Merge branch 'ticket/marshalrusty/9859' into prep-release-3.0.9 
* ticket/marshalrusty/9859:
  [ticket/9859] Changing all phpBB footers to match the new credit line
  [ticket/9859] New footer copyright line with registered symbol
 2011-07-06 21:50:43 -04:00
Yuriy Rusko
a275d17625 [ticket/9859] Changing all phpBB footers to match the new credit line 
PHPBB3-9859
 2011-07-06 21:46:33 -04:00
Yuriy Rusko
f22081d21e [ticket/9859] New footer copyright line with registered symbol 
PHPBB3-9859
 2011-07-06 19:36:25 -04:00
Nils Adermann
b261a1a31a [ticket/10250] The site_logo hash is different depending on imageset & language 
PHPBB3-10250
 2011-07-06 17:53:57 -04:00
Andreas Fischer
5eeb870442 Merge branch 'prep-release-3.0.9' into develop-olympus 
* prep-release-3.0.9:
  [ticket/10247] Remove attempt_id as primary key from database_update.php
 2011-07-06 23:19:02 +02:00
Andreas Fischer
ca2d6a01f1 Merge remote-tracking branch 'nickvergessen/ticket/10247' into prep-release-3.0.9 
* nickvergessen/ticket/10247:
  [ticket/10247] Remove attempt_id as primary key from database_update.php
 2011-07-06 23:18:51 +02:00