Commit graph

8119 commits

Author SHA1 Message Date
Andreas Fischer
5d78346453 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11227] @return void -> @return null in develop-olympus.
2012-11-29 23:17:58 +01:00
Marc Alexander
81a1a21185 [feature/avatars] Properly implement custom HTML in the interface
Previously the driver class added a variable that defined wether an avatar
driver would return custom HTML. The existence of this variable was
implied in the interface. It's also not needed which is why it has been
removed.

PHPBB3-10018
2012-11-29 23:08:29 +01:00
Oleg Pudeyev
65253a3023 [ticket/11227] @return void -> @return null in develop-olympus.
PHPBB3-11227
2012-11-29 15:37:12 -05:00
Oleg Pudeyev
11ca272692 [ticket/11095] Restore brace on previous line.
PHPBB3-11095
2012-11-29 14:42:56 -05:00
Oleg Pudeyev
3e907265d5 [ticket/11095] Docs and tests for phpbb_build_hidden_fields_for_query_params.
PHPBB3-11095
2012-11-29 14:42:06 -05:00
Oleg Pudeyev
2a39df1a53 [ticket/11095] Forward GET parameters into hidden fields for jumpbox.
PHPBB3-11095
2012-11-29 13:36:00 -05:00
Oleg Pudeyev
9c0a03f1d5 [ticket/11095] Python quoteattr port.
PHPBB3-11095
2012-11-29 12:05:52 -05:00
Bruno Ais
1d98915881 [ticket/10601] Comment to help understanding the code
PHPBB3-10601
2012-11-28 19:37:16 +00:00
Dhruv
c725b02df8 [ticket/11174] include utf_tools in postgres search backend
PHPBB3-11174
2012-11-27 08:49:06 -05:00
Dhruv
6e8f142d39 [ticket/11174] removes unnecessary space from word
PHPBB3-11174
2012-11-27 08:48:15 -05:00
Dhruv
764da97772 [ticket/11174] include utf_tools in mysql backend
when running tests include utf_tools file in the mysql search backend

PHPBB3-11174
2012-11-27 08:48:06 -05:00
Marc Alexander
cb1d98ab7f [feature/avatars] Check for existing functions rather than using _once
PHPBB3-10018
2012-11-26 23:06:38 +01:00
Bruno Ais
24939c8225 [ticket/10601]Move Inbox the default in private messages module
Did exactly as the answer here asked:
http://area51.phpbb.com/phpBB/viewtopic.php?p=234111

PHPBB3-10601
2012-11-26 17:44:41 +00:00
Marc Alexander
f851d763f9 [feature/avatars] Even more fixes to docblocks
PHPBB3-10018
2012-11-25 21:14:05 +01:00
Marc Alexander
6522190ff1 [feature/avatars] Docblock fixes and small change for php_ext
PHPBB3-10018
2012-11-25 20:50:31 +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
211abe2ac9 [feature/avatars] Remove obsolete functions from functions_user.php
The removed functions are no longer needed due to the new avatar system.

PHPBB3-10018
2012-11-22 00:39:02 +01:00
Marc Alexander
5289dc52a3 [feature/avatars] Add support for modularized avatars to ucp groups
This seems to be the last component where the new avatars system was still
missing.

PHPBB3-10018
2012-11-22 00:00:45 +01:00
Nathan Guse
c911a34b5b [ticket/11103] Do not prepend notification.(type|method) unless necessary
PHPBB3-11103
2012-11-21 16:04:01 -06:00
Marc Alexander
8a01bc1718 [feature/avatars] Use RecursiveDirectoryIterator for gallery avatar
RecursiveDirectoryIterator is now used for populating the avatar list
array of the gallery avatar.

PHPBB3-10018
2012-11-21 21:42:42 +01:00
Marc Alexander
24ac039336 [feature/avatars] Get rid of array_keys() in gallery avatar
PHPBB3-10018
2012-11-21 20:01:50 +01:00
Marc Alexander
01b313ea26 [feature/avatars] Use isset() instead of in_array()
PHPBB3-10018
2012-11-21 19:20:39 +01:00
Marc Alexander
8c782122c1 [feature/avatars] Use in_array() and fix tabbing
PHPBB3-10018
2012-11-21 17:24:02 +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
9b61204a17 [feature/avatars] Check if gravatar is within min/max width/height
PHPBB3-10018
2012-11-21 16:27:20 +01:00
Marc Alexander
b7b14f9a05 [feature/avatars] Use constant for URL and fix usage of getimagesize
We now use a constant for the gravatar URL. Additionally the usage of
getimagesize() was reduced. It should only be run if the user didn't
specify both the width and height of the avatar.

PHPBB3-10018
2012-11-21 16:20:14 +01:00
Nathan Guse
61aa53f91a Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
	phpBB/config/services.yml
	phpBB/index.php
2012-11-20 23:19:51 -06:00
Nathan Guse
570c5ad3c0 [ticket/11103] Some comments
PHPBB3-11103
2012-11-20 23:12:37 -06:00
Nathan Guse
2afb8b9df8 [ticket/11103] Create user loader class, update for DIC
Create a very basic user loader class to handle querying/storing
user data in a centralized location.

Use DIC collection service for notification types/methods.

Cleanup unused dependencies.

Fix some other issues.

PHPBB3-11103
2012-11-20 22:54:16 -06:00
Marc Alexander
858c59279c [feature/avatars] Use protected instead of private
PHPBB3-10018
2012-11-19 23:50:34 +01:00
Igor Wiedler
b453f359ff Merge remote-tracking branch 'imkingdavid/feature/controller-new' into develop
* imkingdavid/feature/controller-new: (67 commits)
  [feature/controller] Fix misnamed route for functional test
  [feature/controller] Fix comments, check against more general HttpException
  [feature/controller] Check for proper status codes from controllers
  [feature/controller] Correctly create Symfony object from globals
  [feature/controller] Add documentation about input being HTML-escaped
  [feature/controller] Create Symfony Request in new function
  [feature/controller] Remove unused language strings
  [feature/controller] Don't use $user->lang() before container compilation
  [feature/controller] Update routing documentation for using query string
  [feature/controller] Remove now-unused code
  [feature/controller] Remove url rewriting until we use pathinfo in controllers
  [feature/controller] Fix functional tests to use query string for controllers
  [feature/controller] Allow injecting Symfony Request into controllers
  [feature/controller] Use query string, not path info, for controller access
  [feature/controller] Fix line endings and permissions, and check responses
  [feature/controller] Remove URL rewriting by default
  [feature/controller] Add controller functional test with template
  [feature/controller] Use warning instead of echo for copy() and unlink()
  [feature/controller] Flip method parameters, require $message
  [feature/controller] Rename $root_path class property to $phpbb_root_path
  ...
2012-11-19 22:28:12 +01:00
David King
01ec608593 [feature/controller] Fix comments, check against more general HttpException
PHPBB3-10864
2012-11-19 12:55:15 -05:00
David King
f8614bfc84 [feature/controller] Check for proper status codes from controllers
PHPBB3-10864
2012-11-19 12:37:20 -05:00
David King
3004350281 [feature/controller] Correctly create Symfony object from globals
PHPBB3-10864
2012-11-19 11:47:42 -05:00
Marc Alexander
8d0c667dce [feature/avatars] Fix the docs and small naming fixes
PHPBB3-10018
2012-11-19 00:30:18 +01:00
Marc Alexander
bea6e845d3 [feature/avatars] Use https for gravatar
PHPBB3-10018
2012-11-19 00:27:22 +01:00
Marc Alexander
c2ba24558f [feature/avatars] Fix local and upload avatar in the ACP
PHPBB3-10018
2012-11-18 23:11:40 +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
David King
e2bf66d065 [feature/controller] Add documentation about input being HTML-escaped
PHPBB3-10864
2012-11-18 15:58:47 -05:00
David King
0f4f81b096 [feature/controller] Create Symfony Request in new function
PHPBB3-10864
2012-11-18 15:52:35 -05:00
David King
60c0a1dd2a [feature/controller] Don't use $user->lang() before container compilation
PHPBB3-10864
2012-11-18 15:51:05 -05:00
Marc Alexander
1c3b3621db [feature/avatars] Add missing assign_block_vars() for avatar options
This is needed for selecting the gallery avatar while using subsilver2.

PHPBB3-10018
2012-11-18 20:45:51 +01:00
David King
53caf83233 [feature/controller] Remove now-unused code
PHPBB3-10864
2012-11-18 13:35:04 -05:00
David King
4d6f6351dd [feature/controller] Allow injecting Symfony Request into controllers
PHPBB3-10864
2012-11-17 18:05:32 -05:00