1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

1424 Commits

Author SHA1 Message Date
Marc Alexander
8aaa3e055f [feature/avatars] Use seperate function for retrieving the config name
PHPBB3-10018
2012-12-04 15:11:14 +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
b42ca792fd [feature/avatars] Minor variable naming fixes
PHPBB3-10018
2012-12-04 00:49: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
d5cbedaaa2 [feature/avatars] Let avatar manager handle $ignore_config
The avatar manager already handles if avatars are enabled. It should also
handle ignoring the config settings.

PHPBB3-10018
2012-11-30 15:12:34 +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
a77fcdb5f9 [feature/avatars] Implement better treatment of avatar errors
PHPBB3-10018
2012-11-25 17:01:21 +01:00
Marc Alexander
f8256ed00f [feature/avatars] Small cosmetic changes
PHPBB3-10018
2012-11-25 16:18:51 +01:00
Marc Alexander
06639729ea [feature/avatars] Add static methods for handling driver names
PHPBB3-10018
2012-11-25 16:05:57 +01:00
Marc Alexander
6d061304af [feature/avatars] Small fixes
PHPBB3-10018
2012-11-25 15:03:35 +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
ce5e2f1677 [feature/avatars] Miscellaneous fixes
PHPBB3-10018
2012-11-25 01:18:27 +01:00
Marc Alexander
ce44e3908e [feature/avatars] Remove unnecessary abbreviations
PHPBB3-10018
2012-11-25 00:54:34 +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
959bc183bf [feature/avatars] Handle deletion of avatars
Previously this wasn't handled correctly if at all.

PHPBB3-10018
2012-11-18 23:09:09 +01:00
Marc Alexander
c70cbfac43 [feature/avatars] Fix acp front-end of user and group avatars
Due to the changes to the avatar manager etc. these had to be updated.

PHPBB3-10018
2012-11-17 00:50:23 +01:00
Marc Alexander
ca30135391 [feature/avatars] Add gravatar to avatar settings
PHPBB3-10018
2012-11-16 22:59:29 +01:00
Joas Schilling
98092add9e [ticket/10411] Move globals to the top and use array for cache destroy
PHPBB3-10411
2012-11-16 11:48:41 +01:00
Joas Schilling
e417882af1 [ticket/10411] Use the objects instead of the deprecated wrappers
PHPBB3-10411
2012-11-14 19:01:52 +01:00
Joas Schilling
a9ed479e14 [ticket/10411] Use AJAX to move items up/down and delete them
PHPBB3-10411
2012-11-14 15:55:51 +01:00
Joas Schilling
79eea0ccac [ticket/10411] Use DIC to get the groupposition classes
PHPBB3-10411
2012-11-14 15:31:16 +01:00
Joas Schilling
6e286218ec [ticket/10411] Fix create_group and delete_group functions
PHPBB3-10411
2012-11-14 02:01:15 +01:00
Joas Schilling
6a27a95f30 [ticket/10411] Use new teampage and legend class in ACP and memberlist
PHPBB3-10411
2012-11-14 02:01:15 +01:00
Marc Alexander
940d768592 [feature/avatars] Fix coding guidelines infractions 2012-11-12 16:27:45 +01:00
Marc Alexander
2265811cd1 Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars
Conflicts:
	phpBB/adm/style/acp_groups.html
	phpBB/adm/style/acp_users_avatar.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_display.php
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/styles/prosilver/template/ucp_avatar_options.html
2012-11-12 14:57:28 +01:00
Nathaniel Guse
84ba10ec8c Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 2012-11-11 04:42:06 -06:00
Andreas Fischer
e86ecc0f3b Merge remote-tracking branch 'Fyorl/ticket/10939' into develop
* Fyorl/ticket/10939:
  [ticket/10939] Added documentation for phpbb_request::file
  [ticket/10939] Added tests for phpbb_request::file
  [ticket/10939] Modified the default return for $request->file
  [ticket/10939] Modified fileupload tests to deal with new behaviour
  [ticket/10939] Modified mock request class to handle deactivated $_FILES
  [ticket/10939] Modified acp_groups.php to not use $_FILES
  [ticket/10939] Modified ucp_groups.php to not use $_FILES
  [ticket/10939] Modified functions_user.php to not use $_FILES
  [ticket/10939] Modified message_parser.php to not use $_FILES
  [ticket/10939] Modified functions_upload to not use $_FILES
  [ticket/10939] Modified request test slightly to include $_FILES
  [ticket/10939] Added $_FILES handling to phpbb_request
2012-11-10 23:49:29 +01:00
Nathaniel Guse
68363e362d Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Conflicts:
	phpBB/install/schemas/mssql_schema.sql
	phpBB/report.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
2012-11-10 10:58:44 -06:00
Nils Adermann
55e8decb3a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
2012-11-09 23:47:07 +01:00
Igor Wiedler
923137cf31 [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
PHPBB3-11181
2012-11-09 23:22:02 +01:00
Oleg Pudeyev
87ea50948e Merge remote-tracking branch 'upstream/develop' into feature/prune-users
* upstream/develop: (2171 commits)
  [ticket/11164] Update composer.phar
  [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks.
  [ticket/10933] Dependency inject template context.
  [ticket/10933] Expanded prose documentation for phpbb_extension_provider.
  [ticket/10933] Specify empty template path for absolute includephp test.
  [ticket/10933] Useful documentation for template locate function
  [ticket/10933] Typo fixes
  [ticket/10933] Initialize template context when template is constructed.
  [ticket/11099] Mark acp_ban::display_ban_options() as static.
  [ticket/11158] Require acl_u_sig for ucp signature module.
  [ticket/11158] Revert old fix in PHPBB3-10186.
  [ticket/11159] static public is the currently approved order.
  [ticket/11157] static public is the currently approved order.
  [ticket/11157] Fix remaining captcha spam.
  [ticket/11157] get_captcha_types is an instance method.
  [ticket/11156] Delete "Misc" tab of forum based permissions + move items
  [ticket/10848] Move include up.
  [ticket/11014] Fix old pagination assignment
  [ticket/11018] Fix several paginations in ACP
  [ticket/11014] Fix IF statements for new template pagination
  ...

Conflicts:
	phpBB/includes/functions_user.php
2012-11-06 11:11:27 -05:00
Andreas Fischer
a1524a69d6 [ticket/11099] Mark acp_ban::display_ban_options() as static.
It is called statically from mcp_ban.

PHPBB3-11099
2012-10-30 18:43:00 -04:00
Oleg Pudeyev
60d9538b14 [ticket/11157] get_captcha_types is an instance method.
It is specific to a particular captcha factory implementation,
instantiate a captcha factory to invoke it.

PHPBB3-11157
2012-10-29 14:48:42 -04:00
Joas Schilling
ceb5a40eec [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968
PHPBB3-11023
2012-10-17 23:34:37 +02:00
Nathan Guse
94a3dc5ff7 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-10-12 17:09:12 -05:00
Oleg Pudeyev
cc5923ea43 Merge PR #993 branch 'bantu/ticket/8713' into develop
* bantu/ticket/8713:
  [ticket/8713] Update untrimmed_variable() doc block.
  [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.
  [ticket/8713] Trim password in auth_db to keep compatibility.
  [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.
  [ticket/8713] Rename untrimed_variable() to untrimmed_variable().
  [ticket/8713] DRY: variable() and untrimed_variable() into a protected method.
  [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc.
  [ticket/8713] Always trim array keys.
  [ticket/8713] Add simple (non-nested) test case for untrimmed set_var().
  [ticket/8713] Use \t in double quotes instead of tabs.
  [ticket/8713] Use correct parameter for nested data.
  [ticket/8713] Adjust test method name to other recursive_set_var() tests.
  [ticket/8713] Do not trim login inputs
2012-10-10 00:03:13 -04: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
Andreas Fischer
5dc7aba18f Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
* EXreaction/ticket/11021:
  [ticket/11021] Remove unnecessary line spacing in functions.php
  [ticket/11021] Use L_SITE_HOME instead of L_HOME
  [ticket/11021] Better language strings for site home url/text
  [ticket/11021] subsilver2 support
  [ticket/11021] Add the option to specify a Site home URL and text
2012-09-15 17:48:51 +02:00
Andreas Fischer
73a75fc3d3 [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.
Currently only auth_db is supported there and the password needs to be trimmed
for compatibility because user_password stores

  phpbb_hash(htmlspecialchars(trim($password)))

Setting passwords for other auth modules is currently not supported.

Once setting/changing passwords is supported by auth plugins, the
untrimmed_variable() should be used here and the result should be passed
to the auth plugin.

PHPBB3-8713
2012-09-09 21:10:29 +02:00
Andreas Fischer
cc0c378caf [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.
PHPBB3-8713
2012-09-08 14:42:38 +02:00
Andreas Fischer
f2607fc9e8 [ticket/8713] Rename untrimed_variable() to untrimmed_variable().
PHPBB3-8713
2012-09-08 14:15:56 +02:00
Nathaniel Guse
b3cd5a649b [ticket/8713] Do not trim login inputs
Create a function to request variables which are not trimmed.

All requests for passwords (except forum passwords) now use the
untrimmed request function.

PHPBB3-8713
2012-09-03 13:32:33 -05:00
Michael C.
0c35ee2769 [ticket/10631] Fix a spelling typo
PHPBB3-10631
2012-09-01 17:32:59 +02:00
Unknown Bliss
323bbf9b52 [ticket/10631] Adjust prefixes to be easier to understand
PHPBB3-10631
2012-09-01 15:05:57 +01:00
Nathan Guse
7b643fe8a5 [ticket/10631] Make failure to meet ext enable requirements clearer
Turn the blocks red on the details page if requirement is not met.

Also changing a how the errors come up when trying to enable/disable
an extension when they cannot be.

PHPBB3-10631
2012-09-01 15:05:56 +01:00
Nathan Guse
dce04b2d03 [ticket/10631] Various front-end fixes (extensions manager)
Add Back button from details

Add cancel button from actions

Correct language strings

PHPBB3-10631
2012-09-01 15:05:54 +01:00
Nathan Guse
36465c9a20 [ticket/10631] Functional acp_extensions test, cleanup
PHPBB3-10631
2012-09-01 15:05:49 +01:00
Nathan Guse
747c16240f [ticket/10631] get_extension_metadata_manager -> create_extension_metadata_manager
PHPBB3-10631
2012-09-01 15:05:40 +01:00
Nathan Guse
2a7e129291 [ticket/10631] Simplify exceptions
PHPBB-10631
2012-09-01 15:05:36 +01:00