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
Joas Schilling
948bfcbe77
Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop
...
# By Oleg Pudeyev (45) and others
# Via Oleg Pudeyev (42) and others
* remotes/phpbb/develop: (289 commits)
[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.
[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
...
Conflicts:
phpBB/install/database_update.php
phpBB/install/schemas/mssql_schema.sql
phpBB/language/en/acp/permissions_phpbb.php
phpBB/styles/prosilver/template/posting_editor.html
2012-11-10 12:27:19 +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
Joas Schilling
6e93fee9d2
[feature/soft-delete] Link to delete_topics module when the topic is deleted
...
PHPBB3-9567
2012-11-10 11:55:06 +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
Igor Wiedler
195014867a
[ticket/11183] Remove $load_extensions and weird dl() calls
...
PHPBB3-11183
2012-11-10 11:25:22 +01:00
Joas Schilling
f77a6eaab5
[feature/soft-delete] Fix the rest of *_approved and the delete_post unit test
...
PHPBB3-9567
2012-11-10 11:24:52 +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
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
83179e07ff
[ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
...
PHPBB3-10780
2012-11-10 00:23:03 +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
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
Dhruv
a509a8ed2d
[ticket/11050] make all properties protected in all search backends
...
PHPBB-11050
2012-11-09 16:46:44 +01:00
Dhruv
c5c9bc5ada
[ticket/11050] get_common_words() returns empty array for sphinx
...
PHPBB-11050
2012-11-09 16:46:37 +01:00
Dhruv
72245e41d0
[ticket/11050] fix tidied search query docblock language
...
PHPBB3-11050
2012-11-09 15:54:41 +01:00
Dhruv
0556959a6a
[ticket/11050] fix min/max length docblock language
...
PHPBB3-11050
2012-11-09 15:54:40 +01:00
Dhruv
7c3cbc07cf
[ticket/11050] multi sentences separated by period in docblocks
...
Starting of each sentence should be capitalized.
PHPBB3-11050
2012-11-09 15:54:39 +01:00
Dhruv
5a2cbc2417
[ticket/11050] fix separated spelling in docblock
...
PHPBB3-11050
2012-11-09 15:54:38 +01:00
Dhruv
6ae64f1c1e
[ticket/11050] fix split words doc block language
...
PHPBB3-11050
2012-11-09 15:54:38 +01:00
Dhruv
b7dae379d5
[ticket/11050] remove class word from docblocks
...
PHPBB3-11050
2012-11-09 15:54:37 +01:00
Dhruv
1ded6d94ac
[ticket/11050] add missing @var in native search
...
PHPBB3-11050
2012-11-09 15:54:36 +01:00
Dhruv
8eed3591a9
[ticket/11050] replace user by phpbb_user
...
PHPBB3-11050
2012-11-09 15:54:35 +01:00
Dhruv
56395ea359
[ticket/11050] fix minor comment/docblocks issues
...
No comments should end with a period. All occurences like PostgreSQL
should have proper case.
PHPBB3-11050
2012-11-09 15:54:34 +01:00
Dhruv
5a7ed3c567
[ticket/11050] add access specifiers to native search properties
...
PHPBB3-11050
2012-11-09 15:54:33 +01:00
Dhruv
3dc42c67d3
[ticket/11050] fix docblocks with description before @var
...
PHPBB3-11050
2012-11-09 15:54:32 +01:00
Dhruv
4172a9d797
[ticket/11050] add missing @var
...
PHPBB3-11050
2012-11-09 15:54:31 +01:00
Dhruv
fd20e73b74
[ticket/11050] remove common_words property from sphinx
...
common_words property is never used in sphinx class hence removed.
PHPBB3-11050
2012-11-09 15:54:30 +01:00
Dhruv
505a713349
[ticket/11050] add access specifiers to sphinx search properties
...
PHPBB3-11050
2012-11-09 15:54:29 +01:00
Dhruv
db9351d0f6
[ticket/11050] add access specifiers to mysql search properties
...
PHPBB3-11050
2012-11-09 15:54:28 +01:00
Dhruv
26a9ccab59
[ticket/11050] add access specifiers to pgsql search properties
...
PHPBB3-11050
2012-11-09 15:54:27 +01:00
Nathaniel Guse
6c8c54d4d2
[ticket/11103] Inject table prefix to notifications system instead of constants
...
PHPBB3-11103
2012-11-09 08:48:41 -06:00
Nathaniel Guse
6a0f6833e6
[ticket/11103] Comment indentation
...
PHPBB3-11103
2012-11-09 07:48:18 -06:00
Nathaniel Guse
b8bdcc957b
[ticket/11103] count is reserved, do not use in a SQL query
...
PHPBB3-11103
2012-11-09 07:45:23 -06:00
Nathaniel Guse
f09ee16252
[ticket/11103] Use phpBB Container to load types/methods
...
PHPBB3-11103
2012-11-09 07:40:08 -06:00
Joas Schilling
9c2a58eff4
[feature/soft-delete] Append _approved to *_posts and *_topics column names
...
PHPBB3-9567
2012-11-09 13:37:53 +01:00