makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-23 11:48:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
14554 commits 18 branches 192 tags 207 MiB
Commit graph

13412 commits

Author SHA1 Message Date
Igor Wiedler
d061a5abf8 [ticket/11206] Remove includes to non-existent files from download/file.php 
This makes avatars work again.

PHPBB3-11206
 2012-11-16 00:34:08 +01:00
Oleg Pudeyev
5d0796624f [ticket/11205] Fix merge conflict in readme.html. 
PHPBB3-11205
 2012-11-15 17:45:00 -05:00
Oleg Pudeyev
ceae276cd6 Merge PR #1085 branch 'nickvergessen/ticket/11198' into develop 
* nickvergessen/ticket/11198:
  [ticket/11198] Remove additional asterix as /** is doc-block only
  [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
 2012-11-15 11:20:27 -05:00
Joas Schilling
132163d4ec [ticket/11198] Remove additional asterix as /** is doc-block only 
PHPBB3-11198
 2012-11-15 16:26:36 +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 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
Joas Schilling
e39947e57e [ticket/11198] Store the swapping partners in vars and simplify the logic 
PHPBB3-11198
 2012-11-14 23:30:29 +01:00
Joas Schilling
857298e748 [ticket/11198] Correctly set links after an item is moved up/down with AJAX 
PHPBB3-11198
 2012-11-14 16:31:46 +01:00
Marc Alexander
5f15c98c1d [ticket/11197] Prefix the css classes for the small arrow with "arrow" 
It does not make sense to have classes named "right" and "left" produce a
small arrow next to text. It should be made clear that an arrow will
appear.

PHPBB3-11197
 2012-11-13 20:57:34 +01:00
Andreas Fischer
607865d97a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10879] Remove arrow icon from attachment link in editor
 2012-11-13 20:36:18 +01:00
Marc Alexander
170967c48a [ticket/10879] Remove arrow icon from attachment link in editor 
If you upload a file with a long filename the filename will partially
cover the arrow icon background image. Remove the icon as it's not needed
anyways.

PHPBB3-10879
 2012-11-13 20:26:49 +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
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
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
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
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
ad3edf505a [feature/compiled-dic] Add HttpKernel; the Extension class is loaded from it 
The phpbb_di_extension_* classes extend the Extension class that is included
in the HttpKernel component. If I don't include HttpKernel I have to implement
the ExtensionInterface from the DependencyInjection component and have to
define all of the methods; this way, I can just overwrite what I need.

PHPBB3-10864
 2012-11-10 11:40:10 +01:00
David King
f9f03435f0 [feature/compiled-dic] Move this to the other PR 
PHPBB3-11152
 2012-11-10 11:40:10 +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