1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00

15292 Commits

Author SHA1 Message Date
Andreas Fischer
cbe91e5b50 Merge remote-tracking branch 'p/ticket/11293' into develop-olympus
* p/ticket/11293:
  [ticket/11293] Add a note that mysqli should be in front of mysql.
2012-12-31 00:53:50 +01:00
Oleg Pudeyev
3d27ed13f5 [ticket/11188] Reduce waste.
PHPBB3-11188
2012-12-30 18:50:09 -05:00
Dhruv
763f2929ba [ticket/11188] add result count query for author search
PHPBB3-11188
2012-12-30 18:50:09 -05:00
Dhruv
979edc4113 [ticket/11188] add count query to postgres search
PHPBB3-11188
2012-12-30 18:50:05 -05:00
Oleg Pudeyev
9c7772040c [ticket/11037] Fix unit tests.
PHPBB3-11037
2012-12-29 14:23:14 -05:00
Oleg Pudeyev
4dcc8cabae Merge PR #1130 branch 'EXreaction/ticket/11259' into develop
* EXreaction/ticket/11259:
  [ticket/11259] htmlspecialchars($phpbb_admin_path)
  [ticket/11259] adm_relative_path -> phpbb_adm_relative_path
  [ticket/11259] Also make adm_relative_path available in the container
  [ticket/11259] Make phpbb_admin_path available everywhere

Conflicts:
	phpBB/install/index.php
	phpBB/install/install_update.php
2012-12-29 13:45:40 -05:00
Oleg Pudeyev
f9354b98d8 Merge PR #1162 branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
  [ticket/11291] phing: Also add checkreturn="true" to composer execution.
  [ticket/11291] phing: Add checkreturn="true" to all new commands.
  [ticket/11291] phing: Exclude vendor folder from diffs.
  [ticket/11291] phing packaging: Export composer.phar and install dependencies.
  [ticket/11291] phing: Remove no longer needed create-package target.
  [ticket/11291] phing: The package target does not depend on composer.
  [ticket/11291] phing: Adjust directory format of composer exec.
  [ticket/11291] phing: Add description for composer target.
  [ticket/11291] phing: Add --dev to composer install.
  [ticket/11291] phing: Correct dependencies of composer target.
  [ticket/11291] phing: Make sure composer is available before calling it.
2012-12-29 07:47:23 -05:00
Oleg Pudeyev
51138d3f3a Merge PR #1162 branch 'bantu/ticket/11291' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11291:
  [ticket/11291] phing: Also add checkreturn="true" to composer execution.
  [ticket/11291] phing: Add checkreturn="true" to all new commands.
  [ticket/11291] phing: Exclude vendor folder from diffs.
  [ticket/11291] phing packaging: Export composer.phar and install dependencies.
  [ticket/11291] phing: Remove no longer needed create-package target.
  [ticket/11291] phing: The package target does not depend on composer.
  [ticket/11291] phing: Adjust directory format of composer exec.
  [ticket/11291] phing: Add description for composer target.
  [ticket/11291] phing: Add --dev to composer install.
  [ticket/11291] phing: Correct dependencies of composer target.
  [ticket/11291] phing: Make sure composer is available before calling it.
2012-12-29 07:47:10 -05:00
Andreas Fischer
6951356a87 [ticket/11291] phing: Also add checkreturn="true" to composer execution.
PHPBB3-11291
2012-12-29 13:38:40 +01:00
Andreas Fischer
b36050983d [ticket/11291] phing: Add checkreturn="true" to all new commands.
PHPBB3-11291
2012-12-29 13:30:25 +01:00
Andreas Fischer
1fc103e3f3 [ticket/11291] phing: Exclude vendor folder from diffs.
Otherwise we end up with very huge diffs and the build process is severely
slowed down.

PHPBB3-11291
2012-12-29 04:56:55 +01:00
Andreas Fischer
46a752ee62 [ticket/11291] phing packaging: Export composer.phar and install dependencies.
PHPBB3-11291
2012-12-29 04:44:45 +01:00
Andreas Fischer
370e3c31e8 [ticket/11291] phing: Remove no longer needed create-package target.
PHPBB3-11291
2012-12-29 03:59:55 +01:00
Andreas Fischer
316bfc20c0 [ticket/11291] phing: The package target does not depend on composer.
The packaging process does not require running composer in the phpBB tree.
It does however require running composer on the git exports, but this is not
what the composer target does.

PHPBB3-11291
2012-12-29 03:55:20 +01:00
Andreas Fischer
357feeac2e [ticket/11291] phing: Adjust directory format of composer exec.
Adjust the directory format to what all the other exec calls are using.

PHPBB3-11291
2012-12-29 03:51:41 +01:00
Andreas Fischer
e775e7fc91 [ticket/11291] phing: Add description for composer target.
PHPBB3-11291
2012-12-29 03:50:18 +01:00
Andreas Fischer
c9cc5a00dc [ticket/11291] phing: Add --dev to composer install.
The composer target runs composer in the phpBB tree in order to load
dependencies for testing. The testing framework may have additional
development dependencies (e.g. goutte). We also have to load those.

PHPBB3-11291
2012-12-29 03:43:04 +01:00
Andreas Fischer
f6315dafb7 [ticket/11291] phing: Correct dependencies of composer target.
This command runs composer in the phpBB tree and does not write to the build
folders. Thus, it does not have to depend on prepare and clean targets.

PHPBB3-11291
2012-12-29 03:41:01 +01:00
Andreas Fischer
453ec25e20 Merge remote-tracking branch 'p/ticket/11294-develop' into develop
* p/ticket/11294-develop:
  [ticket/11294] Update required/optional extension list for develop.
2012-12-27 13:35:06 +01:00
Oleg Pudeyev
ca7327ba26 [ticket/11294] Update required/optional extension list for develop.
PHPBB3-11294
2012-12-27 01:10:58 -05:00
Oleg Pudeyev
58aa593e39 [ticket/11037] Update services.yml.
PHPBB3-11037
2012-12-26 17:57:05 -05:00
Oleg Pudeyev
bad7661ee9 [ticket/11037] Add/update docblocks.
PHPBB3-11037
2012-12-26 10:47:03 -05:00
Andreas Fischer
3f03dd7ecd Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11294] Capitalize phpunit.
  [ticket/11294] Update required/optional extension list for olympus.
2012-12-26 16:45:21 +01:00
Andreas Fischer
cd890132bb Merge remote-tracking branch 'p/ticket/11294' into develop-olympus
* p/ticket/11294:
  [ticket/11294] Capitalize phpunit.
  [ticket/11294] Update required/optional extension list for olympus.
2012-12-26 16:45:01 +01:00
Oleg Pudeyev
bc797c7da2 [ticket/11294] Capitalize phpunit.
PHPBB3-11294
2012-12-26 10:41:13 -05:00
Oleg Pudeyev
02a1777fcb [ticket/11295] Drop tables rather than database for postgres in test suite.
Doing so allows:

1. User running the tests no longer needs create database privilege.
2. Test database may be located in a non-default tablespace and generally
have site-specific options applied to it.

PHPBB3-11295
2012-12-26 00:31:43 -05:00
Andreas Fischer
cb7f6deb07 Merge remote-tracking branch 'p/ticket/10758' into develop
* p/ticket/10758:
  [ticket/10758] Add return to the other compat function.
  [ticket/10758] Add periods.
  [ticket/10758] Yes, only one empty line.
  [ticket/10758] Add deprecated tags.
  [ticket/10758] Add compat functions.
  [ticket/10758] Admin is not working yet.
  [ticket/10758] Test moderator and admin permissions.
  [ticket/10758] Check that acl was changed in the test.
  [ticket/10758] Extract obtain_user_data for the benefit of tests.
  [ticket/10758] Functional test for changing a user's permission.
  [ticket/10758] Spelling fix.
  [ticket/10758] Add a test for acp login.
  [ticket/10758] Dependency inject parameters into update_foes.
  [ticket/10758] Dependency inject parameters into cache_moderators.
2012-12-25 15:18:47 +01:00
Oleg Pudeyev
c0b3151f0d [ticket/11294] Update required/optional extension list for olympus.
PHPBB3-11294
2012-12-25 07:23:46 -05:00
Oleg Pudeyev
989c4c3e64 [ticket/11293] Add a note that mysqli should be in front of mysql.
php 5.5 alpha 2 deprecated mysql extension, prefer mysqli if
both are available.

PHPBB3-11293
2012-12-25 00:11:34 -05:00
Oleg Pudeyev
0b47a7823a [ticket/11037] Eliminate globals from cache service.
PHPBB3-11037
2012-12-24 15:36:43 -05:00
Oleg Pudeyev
8707a34135 [ticket/10758] Add return to the other compat function.
PHPBB3-10758
2012-12-24 15:12:57 -05:00
Martin Beckmann
5056f16235 [ticket/11292] Fix: Newlines removed in display of PM reports
Report text is run through make_clickable and bbcode_nl2br for PMs
just as it is for posts.

PHPBB3-11292
2012-12-24 04:16:08 +01:00
Andreas Fischer
21b9ac6c88 [develop] Set build version (and thus package name) to 3.1.0-dev. 2012-12-23 22:17:28 +01:00
Andreas Fischer
4ff855eba1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [develop-olympus] Set build version (and thus package name) to 3.0.12-dev.
2012-12-23 22:16:12 +01:00
Andreas Fischer
c701de695f [develop-olympus] Set build version (and thus package name) to 3.0.12-dev.
This is so generated packages are not confused with the already-released
3.0.11 version.
2012-12-23 22:14:18 +01:00
Andreas Fischer
68710bb55a [ticket/11291] phing: Make sure composer is available before calling it.
Older versions of the tree didn't use it.

PHPBB3-11291
2012-12-23 19:57:30 +01:00
Erik Frèrejean
cac3936066 [ticket/11283] Extension manager follow symlinks.
All extensions are located in the `phpBB/ext` directory,
however the `phpbb_extension_manager::all_available()`
method only looks into actual directories and ignores symlinks.

Add the `RecursiveDirectoryIterator::FOLLOW_SYMLINKS` flag to
the `new RecursiveDirectoryIterator` call so that you can store
extensions in a different location and use symlinks so that
phpBB can recognise them.

PHPBB3-11283
2012-12-23 16:20:37 +01:00
Oleg Pudeyev
4f477791ec Merge PR #1152 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11278] Comment out the code for dropping the Q&A tables
  [ticket/11278] Fix not running queries from db tools in database update

Conflicts:
	phpBB/install/database_update.php
2012-12-22 18:06:42 -05:00
Oleg Pudeyev
86f0c0a6d5 Merge PR #1152 branch 'nickvergessen/ticket/11278' into develop-olympus
* nickvergessen/ticket/11278:
  [ticket/11278] Comment out the code for dropping the Q&A tables
  [ticket/11278] Fix not running queries from db tools in database update
2012-12-22 18:01:53 -05:00
Oleg Pudeyev
496529fa71 [ticket/10758] Add periods.
PHPBB3-10758
2012-12-22 17:54:54 -05:00
Oleg Pudeyev
aaaf8a5332 [ticket/10758] Yes, only one empty line.
PHPBB3-10758
2012-12-22 17:40:25 -05:00
Andreas Fischer
7829d2a8c8 Merge remote-tracking branch 'p/ticket/10758-upload' into develop
* p/ticket/10758-upload:
  [ticket/10758-upload] Mark tests that don't work incomplete.
  [ticket/10758-upload] Convert error to a failure.
2012-12-22 23:38:05 +01:00
Andreas Fischer
7f0fa6477f Merge remote-tracking branch 'p/ticket/11248' into develop
* p/ticket/11248:
  [ticket/11248] Convert line endings to LF - develop edition.
2012-12-22 23:25:54 +01:00
Andreas Fischer
4b808e2671 Merge remote-tracking branch 'p/ticket/11037' into develop
* p/ticket/11037:
  [ticket/11037] Eliminate global $db usage in cache drivers.
2012-12-22 23:21:19 +01:00
Joas Schilling
68ffb106fb [ticket/11278] Comment out the code for dropping the Q&A tables
Due to a bug, vanilla phpbb could not create captcha tables in 3.0.8 on
firebird. It was possible for board administrators to adjust the code to
work. If code was manually adjusted by board administrators, index names
would not be the same as what 3.0.9 and newer expect. This code fragment
drops captcha tables, destroying all entered Q&A captcha configuration,
such that when Q&A is configured next the respective tables will be
created with corrent index names.

If you wish to preserve your Q&A captcha configuration, you can manually
rename indexes to the currently expected name:
 phpbb_captcha_questions_lang_iso  => phpbb_captcha_question_lang
 phpbb_captcha_answers_question_id => phpbb_captcha_answers_qid

Again, this needs to be done only if a board was manually modified to fix
broken captcha code.

PHPBB3-11278
2012-12-21 16:05:05 +01:00
Andreas Fischer
9365d71b6b Merge remote-tracking branch 'nickvergessen/ticket/11277' into develop
* nickvergessen/ticket/11277:
  [ticket/11277] Correctly remove user_dst column on database update
2012-12-21 15:47:35 +01:00
Joas Schilling
5f56804a96 [ticket/11277] Correctly remove user_dst column on database update
The db_tools is running in "return statement" mode, so the queries to
modify the data are not executed, but just returned.

PHPBB3-11277
2012-12-21 15:29:54 +01:00
Oleg Pudeyev
cc0f6d471f [ticket/10758-upload] Mark tests that don't work incomplete.
PHPBB3-10758
2012-12-21 01:45:24 -05:00
Oleg Pudeyev
0939892994 Merge PR #1160 branch 'imkingdavid/ticket/11287' into develop
* imkingdavid/ticket/11287:
  [ticket/11287] Add template event naming to docs/coding-guidelines.html
2012-12-21 01:28:07 -05:00
Oleg Pudeyev
b6f40f7c33 [ticket/10758-upload] Convert error to a failure.
PHPBB3-10758
2012-12-20 20:42:06 -05:00