Marc Alexander
5d0a20bbb6
[feature/avatars] Add missing language variables for avatars
...
PHPBB3-10018
2012-11-16 23:07:51 +01:00
Marc Alexander
ac7c3d2b8d
[feature/avatars] Check for gravatar when checking the avatar module_auth
...
PHPBB3-10018
2012-11-16 23:04:09 +01:00
Marc Alexander
ca30135391
[feature/avatars] Add gravatar to avatar settings
...
PHPBB3-10018
2012-11-16 22:59:29 +01:00
Marc Alexander
517d3f56ac
[feature/avatars] Use correct names of input fields
...
The name of the avatar input fields seem to have been copied from the local
avatar (gallery avatar). Since the input fields have different names in
the template files of the remote and gravatar avatars this will not
properly default to the entered values.
Additionally, the focused driver wasn't correctly filtered causing use to
always default to no avatar.
PHPBB3-10018
2012-11-16 17:39:32 +01:00
Marc Alexander
0a5d54cc9b
[feature/avatars] Shorten avatar driver's class name
...
The addition of "core_" that was used until now would require additional
avatar drivers (e.g. in extensions) to also include that in their class
name which would be incorrect.
PHPBB3-10018
2012-11-16 17:19:04 +01:00
Marc Alexander
cc86bd9267
[feature/avatars] Shorten needed language variable for avatar title
...
PHPBB3-10018
2012-11-16 14:29:35 +01:00
Marc Alexander
60b4c907b2
[feature/avatars] Add service containers for avatars
...
PHPBB3-10018
2012-11-15 18:10:54 +01:00
Marc Alexander
076785d76a
[feature/avatars] Add support for custom avatar HTML code
...
PHPBB3-10018
2012-11-14 20:04:02 +01:00
Marc Alexander
b91702665a
[feature/avatars] Add barebone gravatar driver
...
PHPBB3-10018
2012-11-13 23:22:56 +01:00
Marc Alexander
075e7755c3
[feature/avatars] fix 'user_avatar_type' in database updater
...
PHPBB3-10018
2012-11-13 20:04:33 +01:00
Marc Alexander
940d768592
[feature/avatars] Fix coding guidelines infractions
2012-11-12 16:27:45 +01:00
Marc Alexander
4c4b82416b
[feature/avatars] Replace colon usage with {L_COLON}
...
PHPBB3-10018
2012-11-12 15:08:46 +01:00
Marc Alexander
4c9820d1ca
[feature/avatars] add missing html closing tags and fix tabbing
...
PHPBB3-10018
2012-11-12 15:08:36 +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
David King
5a5e507a14
Merge remote-tracking branch 'naderman/ticket/11194' into develop
...
# By Nils Adermann
# Via Nils Adermann
* naderman/ticket/11194:
[ticket/11194] Service tag data is stored in an array so access it correctly
2012-11-11 19:25:05 -05:00
Nils Adermann
09ec65cb9b
[ticket/11194] Service tag data is stored in an array so access it correctly
...
PHPBB3-11194
2012-11-12 01:01:02 +01:00
Igor Wiedler
05380c8d0e
Merge pull request #1076 from naderman/ticket/11193
...
[ticket/11193] Instantiate a single collection_pass for all collections
2012-11-11 10:05:06 -08:00
Nils Adermann
d2a051cdd4
[ticket/11193] Instantiate a single collection_pass for all collections
...
PHPBB3-11193
2012-11-11 18:39:24 +01:00
Nils Adermann
69845585a2
Merge pull request #1056 from igorw/feature/compiled-dic
...
[feature/compiled-dic] Compile the DI Container into a cached class
2012-11-11 09:05:15 -08:00
Igor Wiedler
1bf7f0bde7
[ticket/11152] Basic tests for the container functions
...
PHPBB3-11152
2012-11-11 17:56:09 +01:00
Igor Wiedler
00417fc723
[ticket/11152] Compile the install container
...
PHPBB3-11152
2012-11-11 17:54:54 +01:00
Igor Wiedler
5616972195
[ticket/11152] Throw error if services.yml is missing
...
PHPBB3-11152
2012-11-11 17:53:24 +01:00
Igor Wiedler
844770d223
[ticket/11152] Remove old container processor calls
...
PHPBB3-11152
2012-11-11 17:43:12 +01:00
Igor Wiedler
09781a96bc
[ticket/11152] Use realpath in container extensions consistently
...
PHPBB-11152
2012-11-11 16:34:41 +01:00
Igor Wiedler
3e4d3761fd
[ticket/11152] Rename collection to collection_pass
...
PHPBB3-11152
2012-11-11 14:18:11 +01:00
Andreas Fischer
504158ceab
Merge remote-tracking branch 'nickvergessen/ticket/11077' into develop
...
* nickvergessen/ticket/11077:
[ticket/11077] Remove code from old global announcements system
2012-11-11 13:59:11 +01:00
Joas Schilling
f2cb4e1911
[ticket/11077] Remove code from old global announcements system
...
PHPBB3-11077
2012-11-11 13:04:14 +01: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
Andreas Fischer
847feb07e7
Merge remote-tracking branch 'EXreaction/ticket/11189' into develop
...
* EXreaction/ticket/11189:
[ticket/11189] Replace DEBUG_EXTRA with DEBUG
[ticket/11189] Always log critical errors when in cron or in image output
2012-11-10 23:39:00 +01:00
Igor Wiedler
bdbf7d5de6
[ticket/11152] Remove @api docblocks
...
PHPBB3-11152
2012-11-10 23:36:13 +01:00
Igor Wiedler
8851b797fb
[ticket/11152] Create separate function for debug-dependent container
...
PHPBB3-11152
2012-11-10 23:35:52 +01:00
Igor Wiedler
231d743ba9
[ticket/11152] Change phpbb_di_pass_cron to generic phpbb_di_pass_collection
...
PHPBB3-11152
2012-11-10 23:34:27 +01:00
Nathaniel Guse
bd37f7f6c0
[ticket/11189] Replace DEBUG_EXTRA with DEBUG
...
PHPBB3-11189
2012-11-10 10:45:02 -06:00
Nathaniel Guse
7085a6c74d
[ticket/11189] Always log critical errors when in cron or in image output
...
PHPBB3-11189
2012-11-10 10:12:25 -06:00
Nils Adermann
f0cfae1f01
Merge pull request #881 from Fyorl/ticket/10970
...
Allow INCLUDE template macros to accept paths of the form {FOO}/a/{BAR}/c
2012-11-10 07:46:50 -08:00
Igor Wiedler
798c006e7f
[ticket/11152] Convert cron_task_collection to generic di_service_collection
...
PHPBB3-11152
2012-11-10 16:38:19 +01:00
Andreas Fischer
3f933c6870
Merge remote-tracking branch 'Fyorl/ticket/11187' into develop
...
* Fyorl/ticket/11187:
[ticket/11187] Added a blank array to fix errors in functional tests
2012-11-10 14:58:03 +01:00
Fyorl
c73293d826
[ticket/11187] Added a blank array to fix errors in functional tests
...
PHPBB3-11187
2012-11-10 13:46:40 +00:00
Andreas Fischer
f5ed04f8ff
Merge remote-tracking branch 'bantu/ticket/10780' into develop
...
* bantu/ticket/10780:
[ticket/10780] Make L_COLON available in the installer.
2012-11-10 14:07:03 +01:00
Andreas Fischer
40f3ae1d8f
Merge remote-tracking branch 'igorw/ticket/11183' into develop
...
* igorw/ticket/11183:
[ticket/11183] Remove $load_extensions and weird dl() calls
2012-11-10 14:02:45 +01:00
Andreas Fischer
3ea5b0abbd
[ticket/10780] Make L_COLON available in the installer.
...
PHPBB3-10780
2012-11-10 12:53:45 +01:00
Igor Wiedler
38e1c4ec5d
[ticket/11152] Use relative root path in container, one dumped container per path
...
PHPBB3-11152
2012-11-10 12:02:56 +01:00
Igor Wiedler
897e8f2e83
[ticket/11152] Move container functions to a separate function file
...
PHPBB3-11152
2012-11-10 12:02:56 +01:00
David King
3f2cbaac34
[feature/compiled-dic] Rename $phpEx to $php_ext in new code
...
PHPBB3-11152
2012-11-10 12:02:56 +01:00
David King
2de8827b1e
[feature/compiled-dic] Use an absolute path for core.root_path parameter
...
PHPBB3-11152
2012-11-10 12:02:56 +01:00
David King
e6a6e85d7e
[feature/compiled-dic] Update the composer.lock file
...
PHPBB3-11152
2012-11-10 12:02:56 +01:00
David King
c16bb2b2c6
[feature/compiled-dic] Purge cache to make ext services available right away
...
PHPBB3-11152
2012-11-10 12:02:55 +01:00
David King
af3f07d8c9
[feature/compiled-dic] Fix root path when container is created after install
...
PHPBB3-11152
2012-11-10 12:02:55 +01:00
David King
1e3a5dde7d
[feature/compiled-dic] Remove old test
...
PHPBB3-11152
2012-11-10 12:02:55 +01:00
David King
a6428c8dc3
[feature/compiled-dic] Fix cron tasks again
...
PHPBB3-11152
2012-11-10 12:02:39 +01:00