Commit graph

8146 commits

Author SHA1 Message Date
David King
97957d6792 [feature/controller-new] Rename kernel compiler pass class
PHPBB3-10864
2012-11-16 16:25:14 -05:00
David King
5c86a1660d [feature/controller] Don't allow a kernel listener to be added with no method
PHPBB3-10864
2012-11-16 16:25:12 -05:00
David King
067a770730 [feature/controller] Transfer kernel-related stuff from container PR
PHPBB3-10864
2012-11-16 16:25:10 -05:00
David King
06158693c7 [feature/controller] Implement a front controller
PHPBB3-10864
2012-11-16 16:25:09 -05:00
David King
ca09eb94e3 [ticket/11211] Fix typo in phpbb_realpath() method name
PHPBB3-11211
2012-11-16 14:38:53 -05: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
Oleg Pudeyev
1a2dfa6d4c Merge PR #1074 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11192] Merge dataProvider arrays because the test is the same now.
  [ticket/11192] Update $value parameter description to support other types.
  [ticket/11192] Mark negative byte numbers as unsupported.
  [ticket/11192] Test strings not converted to int/float before.
  [ticket/11192] Also test strings, e.g. sums returned by the database.
  [ticket/11192] Also test powers of 10 / 1000.
  [ticket/11192] Add tests.
  [ticket/11192] Add Tebibyte to get_formatted_filesize().
2012-11-16 10:29:22 -05:00
Andreas Fischer
efd6f1df63 [ticket/11192] Update $value parameter description to support other types.
PHPBB3-11192
2012-11-16 14:56:15 +01:00
Andreas Fischer
7cbd440e7a [ticket/11192] Mark negative byte numbers as unsupported.
PHPBB3-11192
2012-11-16 14:56:15 +01:00
Marc Alexander
cc86bd9267 [feature/avatars] Shorten needed language variable for avatar title
PHPBB3-10018
2012-11-16 14:29:35 +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
Igor Wiedler
fc5385c2a5 [ticket/11015] Allow full dbms class name in config.php
PHPBB3-11015
2012-11-16 01:48:03 +01:00
Igor Wiedler
0d4a289778 [ticket/11015] Remove strange method_exists call
PHPBB3-11015
2012-11-16 01:26:36 +01:00
Igor Wiedler
423c79e106 Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (22 commits)
  [ticket/11206] Remove includes to non-existent files from download/file.php
  [ticket/11205] Fix merge conflict in readme.html.
  [ticket/11202] Check response success before content assertions.
  [ticket/11204] Reindent.
  [ticket/11198] Remove additional asterix as /** is doc-block only
  [ticket/11200] Add a reminder comment.
  [ticket/11202] Custom message does not make sense here, delete it.
  [ticket/11202] Check response success before content assertions.
  [ticket/11202] Add a heuristic function to check for response success.
  [ticket/11200] Make cache available during container construction
  [ticket/11199] Match cache purge container files against container_*
  [ticket/11199] Purge dumped container correctly on cache purge.
  [ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
  [ticket/11199] Cache purge does not remove dumped container
  [ticket/11198] Store the swapping partners in vars and simplify the logic
  [ticket/11198] Correctly set links after an item is moved up/down with AJAX
  [ticket/11197] Prefix the css classes for the small arrow with "arrow"
  [ticket/10879] Remove arrow icon from attachment link in editor
  [ticket/11195] Condense logic, remove improperly formatted if()
  [ticket/11190-develop] Functional tests purge cache before running.
  ...

Conflicts:
	tests/test_framework/phpbb_database_test_connection_manager.php
2012-11-16 01:23:24 +01:00
Joas Schilling
4db6ded8f0 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11198] Remove additional asterix as /** is doc-block only
  [ticket/11200] Add a reminder comment.
  [ticket/11200] Make cache available during container construction
  [ticket/11199] Match cache purge container files against container_*
  [ticket/11199] Purge dumped container correctly on cache purge.
  [ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
  [ticket/11199] Cache purge does not remove dumped container
  [ticket/11198] Store the swapping partners in vars and simplify the logic
  [ticket/11198] Correctly set links after an item is moved up/down with AJAX
  [ticket/11197] Prefix the css classes for the small arrow with "arrow"
  [ticket/10879] Remove arrow icon from attachment link in editor
  [ticket/11195] Condense logic, remove improperly formatted if()
  [ticket/11194] Service tag data is stored in an array so access it correctly
  [ticket/11193] Instantiate a single collection_pass for all collections
  [ticket/11190-develop] Functional tests purge cache before running.
  [ticket/11190] Functional tests purge cache before running.
2012-11-15 18:21:38 +01:00
Marc Alexander
60b4c907b2 [feature/avatars] Add service containers for avatars
PHPBB3-10018
2012-11-15 18:10:54 +01:00
Oleg Pudeyev
c30b38ba10 Merge PR #1088 branch 'igorw/ticket/11199' into develop
* igorw/ticket/11199:
  [ticket/11199] Match cache purge container files against container_*
  [ticket/11199] Purge dumped container correctly on cache purge.
2012-11-15 09:07:41 -05:00
Oleg Pudeyev
f2cffd6a6c [ticket/11200] Add a reminder comment.
PHPBB3-11200
2012-11-15 08:50:04 -05:00
Igor Wiedler
31843ecd8c [ticket/11200] Make cache available during container construction
Fixes fatal errors in the dbal.

PHPBB3-11200
2012-11-15 05:00:24 +01:00
Igor Wiedler
9cc7680965 [ticket/11015] Fix some more whitespace in the driver
PHPBB3-11015
2012-11-15 03:24:08 +01:00
Igor Wiedler
f8841b7f52 [ticket/11015] Fix line endings of phpbb_db_driver to LF
PHPBB3-11015
2012-11-15 03:09:57 +01:00
Igor Wiedler
a0cc2878a3 [ticket/11199] Match cache purge container files against container_*
Previously it was matching against only container*, checking for the
underscore is consistent with the other checks.

PHPBB3-11199
2012-11-15 02:30:43 +01:00
Igor Wiedler
73ce1a5a97 [ticket/11199] Purge dumped container correctly on cache purge.
This patch changes the dumped container suffix to a prefix instead which
makes the existing code for purging 'cache/container_*' files work
as intended.

PHPBB3-11199
2012-11-15 01:56:33 +01:00
Oleg Pudeyev
30e9d2d600 [ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
This reverts commit 303fc646ad, reversing
changes made to 9c28470ad7.

The correct fix should be to alter the container file name to start with
container_ prefix.

PHPBB3-11199
2012-11-14 19:07:28 -05:00
Marc Alexander
d982d432eb [ticket/11199] Cache purge does not remove dumped container
PHPBB3-11199
2012-11-14 23:34:28 +01:00
Marc Alexander
076785d76a [feature/avatars] Add support for custom avatar HTML code
PHPBB3-10018
2012-11-14 20:04:02 +01:00
Joas Schilling
60d831c392 [ticket/10411] Fix logic error when editing/creating a group
PHPBB3-10411
2012-11-14 19:06:42 +01:00
Joas Schilling
59bb498de7 [ticket/10411] Fix docs and remove empty sql array parts
PHPBB3-10411
2012-11-14 19:03:24 +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
Nathan Guse
d2187424da Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
	phpBB/common.php
	phpBB/config/services.yml
2012-11-14 11:33:24 -06: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
Igor Wiedler
831d5ad505 [ticket/10875] Add docblocks for phpbb_cache_driver_interface
PHPBB3-10875
2012-11-14 14:10:35 +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
Joas Schilling
53cb148d70 [ticket/10411] Fix comment in interface and some problems in teampage
Category names on the teampage can not be empty.
Also fixing a problem with the delta when moving a category.

PHPBB3-10411
2012-11-14 02:01:14 +01:00
Marc Alexander
b91702665a [feature/avatars] Add barebone gravatar driver
PHPBB3-10018
2012-11-13 23:22:56 +01:00
Joas Schilling
153b99e11c [ticket/10411] Add new classes for legend and teampage handling
PHPBB3-10411
2012-11-13 11:33:22 +01:00
Joas Schilling
df735f4603 [ticket/10411] Add new table for teampage
PHPBB3-10411
2012-11-13 11:29:25 +01:00
Joas Schilling
ff7465e75f [ticket/10411] New class interface and unit tests for legend and teampage
PHPBB3-10411
2012-11-13 11:22:30 +01:00
David King
d33aaac199 [ticket/11195] Condense logic, remove improperly formatted if()
PHPBB3-11195
2012-11-12 16:16:40 -05: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
Igor Wiedler
0fd3bb170b [ticket/11015] Fixup some things from the big merge
PHPBB3-11015
2012-11-12 11:16:39 +01:00
Igor Wiedler
bf641a7f31 Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (31 commits)
  [ticket/11194] Service tag data is stored in an array so access it correctly
  [ticket/11193] Instantiate a single collection_pass for all collections
  [ticket/11152] Basic tests for the container functions
  [ticket/11152] Compile the install container
  [ticket/11152] Throw error if services.yml is missing
  [ticket/11152] Remove old container processor calls
  [ticket/11152] Use realpath in container extensions consistently
  [ticket/11152] Rename collection to collection_pass
  [ticket/11152] Remove @api docblocks
  [ticket/11152] Create separate function for debug-dependent container
  [ticket/11152] Change phpbb_di_pass_cron to generic phpbb_di_pass_collection
  [ticket/11152] Convert cron_task_collection to generic di_service_collection
  [ticket/11152] Use relative root path in container, one dumped container per path
  [ticket/11152] Move container functions to a separate function file
  [feature/compiled-dic] Rename $phpEx to $php_ext in new code
  [feature/compiled-dic] Use an absolute path for core.root_path parameter
  [feature/compiled-dic] Update the composer.lock file
  [feature/compiled-dic] Purge cache to make ext services available right away
  [feature/compiled-dic] Fix root path when container is created after install
  [feature/compiled-dic] Remove old test
  ...
2012-11-12 10:46:21 +01:00
Igor Wiedler
9bc9ac281a [ticket/11015] Remove old dbal classes
PHPBB3-11015
2012-11-12 10:38:28 +01:00
Igor Wiedler
5e52216b5e Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (666 commits)
  [ticket/11077] Remove code from old global announcements system
  [ticket/11189] Replace DEBUG_EXTRA with DEBUG
  [ticket/11189] Always log critical errors when in cron or in image output
  [ticket/11187] Added a blank array to fix errors in functional tests
  [ticket/10780] Make L_COLON available in the installer.
  [ticket/11183] Remove $load_extensions and weird dl() calls
  [ticket/10970] Added extra documentation to parse_dynamic_path.
  [ticket/10939] Added documentation for phpbb_request::file
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10780] Use L_COLON on LDAP page.
  [ticket/10780] Use L_COLON on search backend ACP pages.
  [ticket/10780] Use L_COLON for "download all attachments".
  [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
  [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
  [ticket/10780] Replace colon usage in adm template output with {L_COLON}
  [ticket/10780] Replace colon usage in template output with {L_COLON}
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
  [ticket/10172] Show prosilver birthday list even if there are no birthdays.
  ...

Conflicts:
	phpBB/common.php
	phpBB/download/file.php
	phpBB/includes/db/dbal.php
	phpBB/includes/db/firebird.php
	phpBB/includes/db/mssql.php
	phpBB/includes/db/mssql_odbc.php
	phpBB/includes/db/mssqlnative.php
	phpBB/includes/db/mysql.php
	phpBB/includes/db/mysqli.php
	phpBB/includes/db/oracle.php
	phpBB/includes/db/postgres.php
	phpBB/includes/db/sqlite.php
	phpBB/includes/extension/manager.php
	phpBB/install/database_update.php
2012-11-12 10:33:40 +01: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
Nathaniel Guse
7948aaa78e [ticket/11103] Make jabber use short/ email template files
PHPBB3-11103
2012-11-11 11:41:18 -06:00