Chris Smith
138d1050fc
[ticket/9307] Remove hardcoded chunk size of mass emails.
...
The new config option is 'email_max_chunk_size' I have not added
an interface option to change this.
PHPBB3-9307
2011-09-24 22:05:40 +01:00
Nils Adermann
abc0c336af
Merge remote-tracking branch 'github-bantu/ticket/10313' into develop-olympus
...
* github-bantu/ticket/10313:
[ticket/10313] Include slow unit tests when running build script.
2011-08-07 19:19:37 -04:00
Andreas Fischer
43fc8142f5
[ticket/10313] Include slow unit tests when running build script.
...
PHPBB3-10313
2011-08-08 01:11:44 +02:00
Oleg Pudeyev
04e8468d28
Merge remote-tracking branch 'bantu/ticket/10298' into develop-olympus
...
* bantu/ticket/10298:
[ticket/10298] Properly close embed tag for QuickTime in subsilver2.
2011-08-07 16:35:31 -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
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
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
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
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
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
d59a894cd3
[ticket/10298] Properly close embed tag for QuickTime in subsilver2.
...
PHPBB3-10298
2011-07-30 16:58:33 +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
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
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
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
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
627e2644a2
[ticket/8937] Keep space characters in front of [code] bbcode content
...
PHPBB3-8937
2011-07-17 00:44:39 -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
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
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
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
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
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
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
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
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
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
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