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

260 Commits

Author SHA1 Message Date
Nathan Guse
0c56bd45ef [ticket/11021] Better language strings for site home url/text
Correct the logo title to be {L_HOME} if {U_HOME} is used.

Check if the Home text is instead of just equal to false when
outputting it to the template

PHPBB3-11021
2012-09-15 10:28:37 -05:00
Nathan Guse
a5dd64195a [ticket/11021] Add the option to specify a Site home URL and text
PHPBB3-11021
2012-07-22 22:26:38 -05:00
Joas Schilling
8f027b68d6 Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling
Conflicts:
	phpBB/includes/functions_profile_fields.php
	phpBB/includes/session.php
	phpBB/install/database_update.php
2012-06-04 18:09:35 +02:00
Andreas Fischer
7edb52b9be Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10908] Document that 0 filesize configuration means limited by PHP
  [ticket/10908] Download files only up to max_upload_filesize if limit is 0
2012-05-31 11:55:12 +02:00
Nils Adermann
c494abc8c7 [ticket/10908] Document that 0 filesize configuration means limited by PHP
PHPBB3-10908
2012-05-29 15:49:52 +02:00
Oleg Pudeyev
3b6ca178aa Merge PR #721 branch 'rahulr92/ticket/10650' into develop
* rahulr92/ticket/10650:
  [ticket/10650] Subject is cleared if no permissions exist
  [ticket/10650] Changed apostrophe to utf8 single quote
  [ticket/10650] Moving censoring to before truncation
  [ticket/10650] Added apostrophe in explanation in language file
  [ticket/10650] Inserted correct utf ELLIPSIS character
  [ticket/10650] Added space after if and comment
  [ticket/10650] Added ellipsis to language file
  [ticket/10650] Added href title to subject link
  [ticket/10650] Made use of truncate_string() function
  [ticket/10650] Removed changes from acp_forums.php
  [ticket/10650]Removed incorrect newline
  [ticket/10650] Changed acp option from per forum to global
  [ticket/10650] Added checking for empty subjects
  [ticket/10650] Corrected intendation
  [ticket/10650]Added permission checking and utf8 functions
  [ticket/10650] Cropped subject and inserted newline
  [ticket/10650] Corrected space before true
  [ticket/10650] Changed language files and forumlist
  [ticket/10650] Added static sql files
  [ticket/10650] Displaying last topic on forum list

Conflicts:
	phpBB/install/database_update.php
	phpBB/language/en/common.php
2012-05-21 23:42:48 -04:00
Senky
b83fa0349a [ticket/10847] fixing all misspelled "dependant" to "dependent"
PHPBB3-10847
2012-04-30 21:55:24 +02:00
Senky
3741e99aab [ticket/10161] all "e-mail" strings in language files changed to "email"
according to Oleg's comment:
email is preferred by RFCs and probably the way of the future

PHPBB3-10161
2012-04-15 20:10:51 +02:00
Rahul R
bab32bd56a [ticket/10650] Changed apostrophe to utf8 single quote
The apostrophe in language entry DISPLAY_LAST_SUBJECT_EXPLAIN
was changed to utf8 single quote character.

PHPBB3-10650
2012-04-11 06:23:56 +05:30
Rahul R
6661c92dd3 [ticket/10650] Added apostrophe in explanation in language file
A missing apostrophe was added to the language file entry
of DISPLAY_LAST_SUBJECT_EXPLAIN

PHPBB3-10650
2012-04-09 03:22:35 +05:30
Rahul R
2dec700aab [ticket/10650] Added ellipsis to language file
Added ELLIPSIS to language file common.php and also corrected
language explanation of ACP option.

PHPBB3-10650
2012-04-08 22:52:49 +05:30
Rahul R
c524236ef6 [ticket/10650] Changed acp option from per forum to global
Changed the display last subject acp toggle option from
per forum to global. Modified associated database entries.
New option is available in ACP General->Board Features.
Also corrected <br /> in forumlist_body.html.

PHPBB3-10650
2012-04-08 10:34:44 +05:30
Oleg Pudeyev
e8e5d2b2c0 [feature/new-tz-handling] Removed DST and numeric timezone-related language.
PHPBB3-9558
2012-03-14 22:57:31 -04:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
Oleg Pudeyev
83d71ecb88 Merge remote-tracking branch 'VSEphpbb/ticket/10390' into develop
* VSEphpbb/ticket/10390:
  [ticket/10390] Revert back to escaped script tags inside document.write
  [ticket/10390] Fix wording: fallback should be fall back
  [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
  [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback
  [ticket/10390] Drop http protocol for Microsoft's CDN option
  [ticket/10390] Reword the language for jQuery host/server options
  [ticket/10390] Fix a type-o - captialize AJAX
  [ticket/10390] Improve the jQuery CDN url generation function
  [ticket/10390] Move jQuery version definition
  [ticket/10390] Allow option for jQuery to be hosted by a remote CDN

Conflicts:
	phpBB/install/database_update.php
2011-10-20 20:46:48 -04:00
Andreas Fischer
c6e370d33a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9525] Minimum post length 0 is accepted but not working.
2011-10-17 16:44:08 +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
Matt Friedman
9bea7c3278 [ticket/10390] Fix wording: fallback should be fall back
PHPBB3-10390
2011-09-27 20:15:41 -07:00
Matt Friedman
2dca3c3c27 [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
jQuery will now be available via remote CDN from Google. Microsoft and
jQuery CDNs have been removed, so we can simplify this option for the user.
Default mode is NO so the copy of jQuery included with phpBB is served by
default.

PHPBB3-10390
2011-09-27 11:12:11 -07:00
Matt Friedman
81e8faecbc [ticket/10390] Reword the language for jQuery host/server options
Reword some of the language used for the description and pull-down options
to try and make it more clear to users that they have the option to use
jQuery from their own server with the copy included with phpBB, or from one
of the remote CDN servers.

PHPBB3-10390
2011-09-27 11:10:43 -07:00
Matt Friedman
d4fe81f8f0 [ticket/10390] Fix a type-o - captialize AJAX
AJAX should be capitalized where it appears in the ACP as the
option: "Google AJAX API CDN"

PHPBB3-10390
2011-09-26 11:16:38 -07:00
Matt Friedman
56c6476233 [ticket/10390] Allow option for jQuery to be hosted by a remote CDN
Add an option to the ACP so admins can choose to host jQuery
from the local version shipped with phpBB, or via a popular CDN.

PHPBB3-10390
2011-09-26 11:15:22 -07: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
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
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
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
Joas Schilling
8fa44cc3b9 [ticket/8542] Display custom profile fields in private messages
Introduce an option to display the cpf in the PM view.

PHPBB3-8542
2011-05-20 16:45:29 +02:00
Oleg Pudeyev
8155bc5a9d [ticket/10067] Clarify language for user activation options in ACP.
PHPBB3-10067
2011-04-30 15:39:19 -04:00
Oleg Pudeyev
f07aeba9c0 [feature/system-cron] Added acp ui for use_system_cron config setting.
PHPBB3-9596
2011-02-12 22:05:50 -05:00
Nils Adermann
adfa1656fb Merge branch 'ticket/igorw/9556' into develop
* ticket/igorw/9556:
  [ticket/9556] Drop php closing tags, add trailing newline

Conflicts:
	phpBB/includes/constants.php
2010-12-13 16:35:55 +01:00
RMcGirr83
7e934c6362 [ticket/9897] A few language fixes
PHPBB3-9897
2010-11-21 23:46:09 +01:00
Igor Wiedler
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
2010-11-11 19:10:55 +01:00
SA007
babfd0075d [ticket/9883] Change an American English spelling to British English.
PHPBB3-9883
2010-11-08 01:29:46 +00:00
Chris Smith
7b1d9fbbe2 [ticket/9880] Changing the term 'CAPTCHA' to something more obvious.
PHPBB3-9880
2010-11-07 05:28:29 +00:00
narqelion
71b35a924f [ticket/9095] Update CAPTCHA related strings to reflect CAPTCHAs plugins.
With the addition of CAPTCHA plugins in 3.0.6 a number of language
strings need updating to account for non visual based CAPTCHAs.

PHPBB3-9095
2010-11-07 01:52:53 +00:00
Andreas Fischer
f9764c684f [ticket/9613] Slightly update language strings.
PHPBB3-9613
2010-08-29 16:50:57 +02:00