1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

1332 Commits

Author SHA1 Message Date
Andreas Fischer
e9677e6980 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8094] Remove ambiguity of "phpBB has no categories"
2011-10-13 17:25:19 +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
Andreas Fischer
563fb56c4a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10275] Remove incorrect password information from FAQ
2011-10-13 17:21:02 +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
Chris Smith
8b21983222 [feature/remove-db-styles] Update language to reflect removal of db storage.
PHPBB3-9741
2011-09-20 22:42:52 +01:00
Chris Smith
58c3556e19 [feature/remove-db-styles] Mark log entrys as deprecated.
PHPBB3-9741
2011-09-20 22:42:17 +01:00
Chris Smith
6d24a7191f [feature/remove-db-styles] Add error if template/theme file is unwritable.
PHPBB3-9741
2011-09-20 22:18:06 +01:00
Chris Smith
9e4349e7fa [feature/remove-db-styles] Removed database storage of style components.
The bulk of database storage of templates is removed, rendering template
stored in the database as useless.

Theme database storage is reduced to a skeleton for full removal soon.

This commit was cherry picked from the old feature/ascraeus-experiment branch
the old commit hash is 0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e.

PHPBB3-9741
2011-09-20 21:06:51 +01:00
Vjacheslav Trushkin
98590201d8 [feature/remove-imagesets] Changing admin control panel styles module
Removing imagesets. Changing admin control panel styles module

PHPBB3-10336
2011-09-03 18:57:16 +03:00
Vjacheslav Trushkin
33adfd633b [feature/remove-imagesets] Changing database structure
Removing imagesets. Changing database structure

PHPBB3-10336
2011-09-03 18:55:30 +03:00
Oleg Pudeyev
124b8a92ec Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8173] Removed some redundant code in the BBCode JavaScript.
2011-07-30 19:37:24 -04: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
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
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
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
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
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
Igor Wiedler
541a7db101 [ticket/7090] Update documented minimum PHP version to 5.2.0
PHPBB3-7090
2011-07-13 13:02:37 +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
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
Andreas Fischer
63bf9ef6f1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10228] Correct "trigger" to "triggered" in acp registration settings
2011-06-22 02:32:45 +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
Andreas Fischer
540545c4bd Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10229] On languge/acp/styles.php "%s" should be %s
2011-06-18 15:12:52 +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
Andreas Fischer
d79d093d11 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10221] Append unit (seconds) after input field, remove from explanation
2011-06-16 16:11:38 +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
Andreas Fischer
ecc9a7dd9b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10211] Add spce after dot in new language string
2011-06-12 19:42:55 +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
Andreas Fischer
fe5d616349 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9992] Clarify explanations of ip and account limits on login
  [ticket/9992] Add a comma to language for IP_LOGIN_LIMIT_MAX_EXPLAIN
  [ticket/9992] Use sql_fetchfield for single row and single column result
  [ticket/9992] Adding a limit on login attempts per IP.
  [ticket/9992] Make sql_create_table and sql_table_exists available in updater
2011-06-11 19:42:04 +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
735cae076a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [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.

Conflicts:
	phpBB/includes/functions_posting.php
2011-06-10 00:26:41 +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
c49dce2be3 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10005] Add description to test cases
  [ticket/10005] Add validation of dropdown custom profile field values
2011-06-09 12:47:27 +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
Andreas Fischer
b87fcf70c0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10203] Fix quotations and hyphen in language strings for PHPBB3-10067
2011-06-09 01:22:45 +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
cc14f4b9e0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10067] Clarify language for user activation options in ACP.
2011-06-05 02:50:17 +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
a30ec6e052 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10158] Remove some code duplication from generating the message.
  [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
  [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:52 +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
09776d2302 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
2011-05-23 23:56:55 +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