1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

1726 Commits

Author SHA1 Message Date
rxu
2918fbc970 [ticket/10419] Reword some language strings, minor code changes
PHPBB3-10419
2011-11-05 01:02:40 +08:00
rxu
88b31c2ab3 [ticket/10419] Add mbstring PHP ini parameters checks to ACP
PHPBB3-10419
2011-10-18 02:09:08 +08:00
Andreas Fischer
cfb5135805 Merge remote-tracking branch 'nickvergessen/ticket/9525' into develop-olympus
* nickvergessen/ticket/9525:
  [ticket/9525] Minimum post length 0 is accepted but not working.
2011-10-17 16:43:58 +02:00
Joas Schilling
e40abfbde9 [ticket/9525] Minimum post length 0 is accepted but not working.
PHPBB3-9525
2011-10-14 15:19:47 +02:00
Nils Adermann
dda1e13126 Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympus
* github-bantu/ticket/10278:
  [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
  [ticket/10278] Also timeout when receiving data over a slow connection.
  [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
  [ticket/10278] Return with a timeout error when fread() or fgets() time out.
  [ticket/10278] Also set timeout on stream in get_remote_file().
2011-10-14 02:47:45 +02:00
Andreas Fischer
b957639abb Merge remote-tracking branch 'igorw/ticket/8094' into develop-olympus
* igorw/ticket/8094:
  [ticket/8094] Remove ambiguity of "phpBB has no categories"
2011-10-13 17:25:10 +02:00
Igor Wiedler
ee91656968 [ticket/10275] Remove incorrect password information from FAQ
FAQ contains instructions to find the password in the registration
e-mail. We no longer send the password on registration. So let's just
remove this incorrect piece of information from the FAQ.

PHPBB3-10275
2011-10-13 17:09:34 +02:00
Igor Wiedler
6698a9cbd6 [ticket/8094] Remove ambiguity of "phpBB has no categories"
PHPBB3-8094
2011-10-13 16:25:41 +02:00
Andreas Fischer
29a23ae217 [ticket/10278] Return with a timeout error when fread() or fgets() time out.
PHPBB3-10278
2011-08-25 20:34:01 +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
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
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
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
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
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
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
237af043d6 [ticket/10228] Correct "trigger" to "triggered" in acp registration settings
PHPBB3-10228
2011-06-22 02:27:37 +02:00
Raimon
dd0606a317 [ticket/10229] On languge/acp/styles.php "%s" should be %s
PHPBB3-10229
2011-06-18 15:00:39 +02:00
Nils Adermann
63b9b91dee [ticket/10221] Append unit (seconds) after input field, remove from explanation
PHPBB3-10221
2011-06-16 16:02:34 +02:00
Nils Adermann
8475a8bec5 [ticket/10211] Add spce after dot in new language string
PHPBB3-10211
2011-06-12 19:36:22 +02:00
Nils Adermann
f1998ddbc7 [ticket/9992] Clarify explanations of ip and account limits on login
PHPBB3-9992
2011-06-11 01:56:25 +02:00
Nils Adermann
cbcc48b8e3 [ticket/9992] Add a comma to language for IP_LOGIN_LIMIT_MAX_EXPLAIN
PHPBB3-9992
2011-06-11 01:36:28 +02:00
Nils Adermann
2dee57fd43 [ticket/9992] Adding a limit on login attempts per IP.
A new table was created to save all failed login attempts with
corresponding information on username, ip and useragent. By default
the limit is 50 login attempts within 6 hours per IP. The limit is
relatively high to avoid big problems on sites behind a reverse
proxy that don't receive the forwarded-for value as REMOTE_ADDR but
see all users as coming from the same IP address. But if these
users run into problems a special forwarded-for option is available
to limit logins by forwarded-for value instead of ip.

PHPBB3-9992
2011-06-10 12:18:19 +02:00
Nils Adermann
5b701dc3ed Merge branch 'ticket/rxu/6712' into develop-olympus
* ticket/rxu/6712:
  [ticket/6712] Properly explain result of setting the bump interval to 0.
  [ticket/6712] Add phpbb_ function name prefix, more docs, rename current_time
  [ticket/6712] Pass $post_data by the value instead of by the reference.
  [ticket/6712] Bump does not create new topic icon on index.
2011-06-10 00:24:43 +02:00
Nils Adermann
7f3d6150fc [ticket/6712] Properly explain result of setting the bump interval to 0.
PHPBB3-6712
2011-06-10 00:20:15 +02:00
Andreas Fischer
f7578e29b3 Merge remote-tracking branch 'naderman/ticket/10005' into develop-olympus
* naderman/ticket/10005:
  [ticket/10005] Add description to test cases
  [ticket/10005] Add validation of dropdown custom profile field values
2011-06-09 12:47:26 +02:00
Joas Schilling
d2b5d77b2c [ticket/10203] Fix quotations and hyphen in language strings for PHPBB3-10067
PHPBB3-10203
2011-06-09 00:33:27 +02:00
Nils Adermann
a9f4e00234 Merge branch 'ticket/p/10067' into develop-olympus
* ticket/p/10067:
  [ticket/10067] Clarify language for user activation options in ACP.
2011-06-05 02:49:35 +02:00
Nils Adermann
27e1f1319f Merge branch 'ticket/nickvergessen/10158' into develop-olympus
* ticket/nickvergessen/10158:
  [ticket/10158] Remove some code duplication from generating the message.
  [ticket/10158] Only view "Return to" links if they are useful.
  [ticket/10158] Add return-link to folder, when the user replied from a folder.
  [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
2011-06-05 01:58:37 +02:00
Nils Adermann
7b10f859de [ticket/10005] Add validation of dropdown custom profile field values
PHPBB3-10005
2011-06-02 08:49:59 +02:00
Andreas Fischer
e0ce73e3b8 Merge remote-tracking branch 'p/ticket/9630' into develop-olympus
* p/ticket/9630:
  [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
2011-05-23 23:56:31 +02:00
Joas Schilling
67449f8f1b [ticket/10158] Only view "Return to" links if they are useful.
PHPBB3-10158
2011-05-23 12:03:04 +02:00
Oleg Pudeyev
f670aefd36 Merge remote-tracking branch 'bantu/ticket/10170' into develop-olympus
* bantu/ticket/10170:
  [ticket/10170] Fix broken recaptcha verification host.
  [ticket/10170] Include www in hostname in language strings.
  [ticket/10170] Update language entries
  [ticket/10170] reCaptcha API has been moved.
2011-05-10 22:06:23 -04:00
Andreas Fischer
2c0c8a580f [ticket/10170] Include www in hostname in language strings.
PHPBB3-10170
2011-05-11 03:14:14 +02:00
Erik Frèrejean
46fcf9c8e4 [ticket/10170] Update language entries
Update the language entries to reflect the reCaptcha
API change.

PHPBB3-10170
2011-05-10 23:34:38 +02:00
Andreas Fischer
ccb78f74a4 [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.
PHPBB3-9999
2011-05-09 23:20:17 +02:00
Oleg Pudeyev
c651948cb3 [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
PHPBB3-9630
2011-05-02 23:54:35 -04:00
Oleg Pudeyev
8155bc5a9d [ticket/10067] Clarify language for user activation options in ACP.
PHPBB3-10067
2011-04-30 15:39:19 -04:00
Andreas Fischer
6ee6245e5b [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
PHPBB3-10137
2011-04-22 00:30:13 +02:00
Oleg Pudeyev
5f05899588 Merge branch 'ticket/bantu/10123' into develop-olympus
* ticket/bantu/10123:
  [ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.
2011-04-10 19:52:04 -04:00
Oleg Pudeyev
d3b5df2548 Merge branch 'ticket/erikfrerejean/9581' into develop-olympus
* ticket/erikfrerejean/9581:
  [ticket/9581] Fix missing index
  [ticket/9581] Slightly tweaked queries
  [ticket/9581] Make banlist table select optional
  [ticket/9581] Mass e-mail to banned users
2011-04-10 11:58:29 -04:00
Andreas Fischer
5798c8f02e [ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.
PHPBB3-10123
2011-04-08 12:31:56 +02:00
Joas Schilling
851bb9fcd8 [ticket/10084] Add smilie/icon errors out when file is missing
PHPBB3-10084
2011-04-07 20:36:11 +02:00
Joas Schilling
1564c01c38 [ticket/10033] "Disallow usernames" does not check already disallowed names.
PHPBB3-10033
2011-03-23 22:48:22 +01:00
Andreas Fischer
67fa589ba2 [ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.
PHPBB3-8802
2011-03-10 16:47:00 +01:00
Andreas Fischer
dfbd8f7de9 [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
Clicking "Mark forums read" when not browsing on the index page only marks
all subforums (and sub-sub forums etc.) read, topics in the current forum have
to marked seperately by clicking the "Mark topics read" link.

Let's indicate this circumstance by using the word "subforums".

PHPBB3-8802
2011-03-10 16:28:46 +01:00
Erik Frèrejean
1b60613319 [ticket/9581] Mass e-mail to banned users
Implement the suggestion made by Adam in the ticket, this will add
an additional checkbox to the mass e-mail page. By checking this
the mass e-mail shall also be send to banned users. By default
banned users however are excluded from the mass e-mail.

PHPBB3-9581
2011-03-04 11:10:08 +01:00
Joas Schilling
0e02f5cb0b [ticket/9675] Put the code into methods to avoid code duplication.
PHPBB3-9675
2011-02-08 14:57:42 +01:00
Joas Schilling
18fedfce17 [ticket/9675] Adjust the language-string to reflect the changes.
PHPBB3-9675
2011-02-08 14:57:29 +01:00
Joas Schilling
ffcd307746 [ticket/9675] Add option to delete template/theme/imageset when deleting style.
PHPBB3-9675
2011-02-08 14:27:27 +01:00