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
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
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 303fc646ad9c28470ad7
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
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
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
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
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
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
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
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
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
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
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
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
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
a6428c8dc3
[feature/compiled-dic] Fix cron tasks again
...
PHPBB3-11152
2012-11-10 12:02:39 +01:00
David King
cb2725dd5a
[feature/compiled-dic] Fix cron task loading
...
We cannot use container tags at run time if we are using a cached, compiled
container object (i.e. phpbb_cache_container) so we have to load them
beforehand.
PHPBB3-11152
2012-11-10 11:40:49 +01:00
David King
b20d852b7f
[feature/compiled-dic] Remove HttpKernel-related stuff
...
These things should be added in the Controller PR instead.
PHPBB3-11152
2012-11-10 11:40:10 +01:00
David King
6d40b81dda
[feature/compiled-dic] Remove unused function parameter
...
PHPBB3-11152
2012-11-10 11:40:10 +01:00
David King
d88e11413a
[feature/compiled-dic] Remove unused service definition
...
PHPBB3-11152
2012-11-10 11:40:10 +01:00
David King
44ba840877
[feature/compiled-dic] Split if() over multiple lines for improved readability
...
PHPBB3-11152
2012-11-10 11:40:09 +01:00
David King
f48709f5bb
[feature/compiled-dic] Compile the DI Container into a cached class
...
PHPBB3-11152
2012-11-10 11:40:09 +01:00
