Commit graph

16058 commits

Author SHA1 Message Date
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
Joas Schilling
f7f21fa692 [ticket/11186] Database unit tests fail on windows using sqlite2
The problem is, that we try to recreate the db and reconnect to it, while the
old connection is still hold. To resolve this, we just drop all tables and
recreate the tables instead of the hole db.

PHPBB3-11186
2012-11-10 14:34:52 +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
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
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
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
996f63fb34 [feature/compiled-dic] Remove re-creation of class loader in install
PHPBB3-11152
2012-11-10 11:40:09 +01:00
David King
2f692ef3b9 [feature/compiled-dic] Remove redundant method call
PHPBB3-11152
2012-11-10 11:40:09 +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
Igor Wiedler
195014867a [ticket/11183] Remove $load_extensions and weird dl() calls
PHPBB3-11183
2012-11-10 11:25:22 +01:00
Fyorl
a05f354fdf [ticket/10970] Added extra documentation to parse_dynamic_path.
PHPBB3-10970
2012-11-10 09:36:02 +00:00
Fyorl
1f9bff2126 [ticket/10939] Added documentation for phpbb_request::file
PHPBB3-10939
2012-11-10 08:51:12 +00:00
Oleg Pudeyev
29fdad396d Merge PR #1045 branch 'bantu/ticket/10780' into develop
* bantu/ticket/10780:
  [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}
2012-11-09 20:50:20 -05:00
Oleg Pudeyev
7987e0e681 Merge PR #1052 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10865] Add .css, .js, and .htaccess to the list of ASCII mode files
  [ticket/10865] Phrase change for visiting with browser
  [ticket/10865] Grammar corrections for the entire document
  [ticket/10865] Typo and phrasing change
  [ticket/10865] Updates and additions to /docs/INSTALL.html

Conflicts:
	phpBB/docs/INSTALL.html
2012-11-09 20:20:37 -05:00
Oleg Pudeyev
3ebabc8da2 Merge PR #1052 branch 'p/ticket/10865' into develop-olympus
* p/ticket/10865:
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10865] Add .css, .js, and .htaccess to the list of ASCII mode files
  [ticket/10865] Phrase change for visiting with browser
  [ticket/10865] Grammar corrections for the entire document
  [ticket/10865] Typo and phrasing change
  [ticket/10865] Updates and additions to /docs/INSTALL.html
2012-11-09 20:14:52 -05:00
Oleg Pudeyev
7c4318c033 [ticket/10865] Use code tags for install/database_update.php.
PHPBB3-10865
2012-11-09 20:13:06 -05:00
Oleg Pudeyev
6e6cc28b76 [ticket/10865] Should have been a slash.
PHPBB3-10865
2012-11-09 20:10:43 -05:00
Andreas Fischer
e48f5aa29c [ticket/10780] Use L_COLON on LDAP page.
PHPBB3-10780
2012-11-10 00:38:25 +01:00
Andreas Fischer
f5b3adb296 [ticket/10780] Use L_COLON on search backend ACP pages.
PHPBB3-10780
2012-11-10 00:38:25 +01:00
Andreas Fischer
d87904ae76 [ticket/10780] Use L_COLON for "download all attachments".
PHPBB3-10780
2012-11-10 00:27:37 +01:00
Andreas Fischer
83179e07ff [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
PHPBB3-10780
2012-11-10 00:23:03 +01:00
Andreas Fischer
b4f7f97a2c [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
PHPBB3-10780
2012-11-10 00:23:03 +01:00
Nathan Guse
d124cd2d59 [ticket/10780] Replace colon usage in adm template output with {L_COLON}
Same as 46a7940a97, but for ACP templates

PHPBB3-10780
2012-11-10 00:23:03 +01:00
Nathan Guse
6e7e70a18a [ticket/10780] Replace colon usage in template output with {L_COLON}
Replace all the instances (I could find) where the colon is displayed
to the user with {L_COLON} so it can be localised.

PHPBB3-10780
2012-11-10 00:23:03 +01:00
Nils Adermann
b81a9a7fcb Merge remote-tracking branch 'github-igorw/ticket/11181' into develop
* github-igorw/ticket/11181:
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
2012-11-09 23:47:54 +01:00
Nils Adermann
55e8decb3a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
2012-11-09 23:47:07 +01:00
Nils Adermann
0209431e4f Merge remote-tracking branch 'github-igorw/ticket/11181-olympus' into develop-olympus
* github-igorw/ticket/11181-olympus:
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
2012-11-09 23:46:51 +01:00
Igor Wiedler
923137cf31 [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
PHPBB3-11181
2012-11-09 23:22:02 +01:00
Igor Wiedler
7d7dc98b10 [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
PHPBB3-11181
2012-11-09 23:16:42 +01:00
Oleg Pudeyev
36da105a33 Merge PR #1043 branch 'dhruvgoel92/ticket/11177' into develop
* dhruvgoel92/ticket/11177:
  [ticket/11177] return no results when query has only negation
2012-11-09 14:23:25 -05:00
Oleg Pudeyev
d99a0fe6b1 Merge PR #949 branch 'dhruvgoel92/ticket/11050' into develop
* dhruvgoel92/ticket/11050:
  [ticket/11050] make all properties protected in all search backends
  [ticket/11050] get_common_words() returns empty array for sphinx
  [ticket/11050] fix tidied search query docblock language
  [ticket/11050] fix min/max length docblock language
  [ticket/11050] multi sentences separated by period in docblocks
  [ticket/11050] fix separated spelling in docblock
  [ticket/11050] fix split words doc block language
  [ticket/11050] remove class word from docblocks
  [ticket/11050] add missing @var in native search
  [ticket/11050] replace user by phpbb_user
  [ticket/11050] fix minor comment/docblocks issues
  [ticket/11050] add access specifiers to native search properties
  [ticket/11050] fix docblocks with description before @var
  [ticket/11050] add missing @var
  [ticket/11050] remove common_words property from sphinx
  [ticket/11050] add access specifiers to sphinx search properties
  [ticket/11050] add access specifiers to mysql search properties
  [ticket/11050] add access specifiers to pgsql search properties
2012-11-09 14:01:20 -05:00
Oleg Pudeyev
5382c838ba Merge PR #1047 branch 'bantu/ticket/10172' into develop
* bantu/ticket/10172:
  [ticket/10172] Show prosilver birthday list even if there are no birthdays.
2012-11-09 13:49:33 -05:00