1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-28 10:09:15 +02:00

172 Commits

Author SHA1 Message Date
Marc Alexander
d26ad8ed26 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
	phpBB/install/database_update.php
2013-03-04 00:22:15 +01:00
Nathaniel Guse
a01da0c1ee Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
	phpBB/install/database_update.php
2013-02-26 15:32:27 -06:00
Nils Adermann
5361a14c1e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID
  [ticket/10896] Adds email validation to email settings in ACP

Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php
	phpBB/language/en/ucp.php
2013-02-24 17:42:14 +01:00
David Tobin
293b65e3ef [ticket/10896] Adds email validation to email settings in ACP
Adds a new validation type to the ACP validate_config_vars function
and implements it on the board_contact and board_email settings.

PHPBB3-10896
2013-02-04 23:10:10 -06:00
Marc Alexander
9e001153d6 [feature/avatars] Pass phpbb_user object to prepare_form_acp()
The phpbb_user object might be used for language variables. Pass it as a
function argument to prepare_form_acp() instead of using globals.

PHPBB3-10018
2013-01-08 15:42:30 +01:00
Marc Alexander
8867cb60b1 [feature/avatars] Use empty() instead of sizeof()
PHPBB3-10018
2013-01-07 21:16:39 +01:00
Marc Alexander
fb139a8820 [feature/avatars] Fix behavior of avatar manager and variables
The $force_all variable was only partially removed and the behavior was
not consistent in all files.

PHPBB3-10018
2012-12-04 15:12:04 +01:00
Marc Alexander
fc4069f81d [feature/avatars] Use seperate function for retrieving all drivers
PHPBB3-10018
2012-12-04 00:59:37 +01:00
Marc Alexander
081440f6c4 [feature/avatars] Create setting for enabling avatar in manager
PHPBB3-10018
2012-11-30 23:11:44 +01:00
Marc Alexander
33b98dc5ba [feature/avatars] Fix variable names
PHPBB3-10018
2012-11-30 16:46:11 +01:00
Marc Alexander
f4ad60e2cf [feature/avatars] Get list of enabled drivers from avatar manager
This shouldn't be done in the avatar drivers. We need to force the
display all avatar drivers in the ACP or it won't be possible to enable
avatars after they have been disabled.

PHPBB3-10018
2012-11-30 01:07:10 +01:00
Marc Alexander
67c2e48d15 [feature/avatars] Only create avatar objects if necessary
PHPBB3-10018
2012-11-25 14:33:13 +01:00
Marc Alexander
726d1a16d7 [feature/avatars] Move avatar specific settings to drivers
PHPBB3-10018
2012-11-21 17:15:35 +01:00
Marc Alexander
ca30135391 [feature/avatars] Add gravatar to avatar settings
PHPBB3-10018
2012-11-16 22:59:29 +01:00
Nathan Guse
0bab8ff777 [ticket/11103] ACP option to enable/disable notifications output in header
PHPBB3-11103
2012-10-05 13:43:03 -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
7df1c84447 [feature/new-tz-handling] Don't use global user but make it a parameter
PHPBB3-9558
2012-07-19 17:41:27 +02:00
Joas Schilling
196e634370 [feature/new-tz-handling] Fall back to UTC, if the timezone is invalid
This should avoid problems, when the board files are updated but database isn't.

PHPBB3-9558
2012-07-19 15:46:12 +02:00
Joas Schilling
a71e60cdbd [feature/new-tz-handling] Rename $user->tz back to $user->timezone
PHPBB3-9558
2012-07-18 16:52:52 +02:00
Joas Schilling
515e1662a9 [feature/new-tz-handling] Remove "timezone might be numeric"
As we updated all of the used values, there really shouldn't be one anymore.

PHPBB3-9558
2012-07-18 15:01:29 +02:00
Joas Schilling
3637cd395e [feature/new-tz-handling] Properly name new timezone selection function
Marked the old one as deprecated and made it using the new function.

PHPBB3-9558
2012-07-17 16:09:05 +02:00
Joas Schilling
217d9280dd [feature/new-tz-handling] Fix comment and validation in ACP board module
PHPBB3-9558
2012-06-19 19:21:59 +02:00
Joas Schilling
3c6272ff04 [feature/new-tz-handling] Remove appearances of board_dst and user_dst
PHPBB3-9558
2012-06-18 15:08:46 +02:00
Joas Schilling
09499fb128 [feature/new-tz-handling] Fix handling of timezone and dst in dateformat_select
PHPBB3-9558
2012-06-18 15:07:58 +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
Matt Friedman
4176ee1c95 [ticket/10779] Move jQuery CDN option to Load Settings
http://tracker.phpbb.com/browse/PHPBB3-10779

PHPBB3-10779
2012-04-10 15:19:26 -07:00
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
Andreas Fischer
69a725198b Merge remote-tracking branch 'unknownbliss/ticket/9916' into develop
* unknownbliss/ticket/9916:
  [ticket/9916] Updating header license and removing Version $Id$
2012-01-02 17:54:54 +01:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
Andreas Fischer
7e3724c3e1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9681] Add password length to security settings
2011-12-25 15:17:09 +01:00
Igor Wiedler
7779dae2cc [ticket/9681] Add password length to security settings
PHPBB3-9681
2011-12-23 00:42:13 -05:00
Andreas Fischer
79443eb1d4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10280] Change the display of user activation settings in the ACP.
2011-11-25 18:15:00 +01:00
RMcGirr83
3ce5b1d386 [ticket/10280] Change the display of user activation settings in the ACP.
Use a select box to be consistent with other settings.

PHPBB3-10280
2011-11-25 01:27:44 -05: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
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
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
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
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
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
Andreas Fischer
ad90f262ff Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10067] Add separator to h_radio to place options on individual lines

Conflicts:
	phpBB/adm/index.php
2011-06-06 11:06:01 +02:00
Nils Adermann
26e052bb26 [ticket/10067] Add separator to h_radio to place options on individual lines
The previous mechanism for account activation resulted in two h_radio calls
with identical id attributes for two elements.

PHPBB3/10067
2011-06-05 09:52:17 +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
mtrs
1d122f56bb [ticket/8641] Added/removed several commas for consistency in acp_board.php.
PHPBB3-8641
2011-02-26 08:37:01 -05: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
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