Commit graph

16058 commits

Author SHA1 Message Date
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
Matt Friedman
e3b11c4ecf [ticket/11103-VSE] Updated notification AJAX styling
PHPBB3-11103
2012-12-25 09:49:05 -08: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
Marc Alexander
c9338b38b3 Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatars 2012-12-24 14:34:10 +01:00
Marc Alexander
46b3c3ecc4 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into develop 2012-12-24 14:33:05 +01: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
David King
a89ed49cbf [ticket/11287] Add template event naming to docs/coding-guidelines.html
PHPBB3-11287
2012-12-20 16:40:53 -05:00
Andreas Fischer
d118295676 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11285] Use more granularity in dependency checks in compress test
2012-12-20 21:56:10 +01:00
Andreas Fischer
e53f4e5eac Merge remote-tracking branch 'p/ticket/11285' into develop-olympus
* p/ticket/11285:
  [ticket/11285] Use more granularity in dependency checks in compress test
2012-12-20 21:51:18 +01:00
Oleg Pudeyev
31b5f91ea1 Merge PR #1148 branch 'imkingdavid/feature/events' into develop
* imkingdavid/feature/events: (65 commits)
  [feature/events] Fix improperly named event in documentation
  [feature/events] Fix alphabetization of events
  [feature/events] Put events in alphabetical order
  [feature/events] Make EVENTS.md lowercase
  [feature/events] Use ` to escape HTML tags in markdown
  [feature/events] Remove HTML tags from markdown so they don't get parsed
  [feature/events] Remove extraneous space
  [feature/events] Add markdown template event documentation file
  [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)
  [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)
  [feature/events] Fix typo in event name
  [feature/events] Fix more subsilver2 events
  [feature/events] Fix some subsilver2 events
  [feature/events] Append "_append" to viewtopic_print_head
  [feature/events] ucp_pm_viewmessage_print_head_append
  [feature/events] simple_footer_end -> simple_footer_after
  [feature/events] Append "_prepend" to posting_editor_options
  [feature/events] Fix events in prosilver overall_header.html
  [feature/events] Fix events in prosilver overall_footer.html
  [feature/events] Rename index_body_info_blocks: index_body_stat_blocks_before
  ...
2012-12-20 15:10:46 -05:00
David King
00c61f9060 [feature/events] Fix improperly named event in documentation
PHPBB3-9550
2012-12-20 15:03:45 -05:00
David King
c7618ff669 [feature/events] Fix alphabetization of events
PHPBB3-9550
2012-12-20 14:46:00 -05:00
David King
3504e761a3 [feature/events] Put events in alphabetical order
PHPBB3-9550
2012-12-20 14:41:55 -05:00
David King
7fa3405cd1 [feature/events] Make EVENTS.md lowercase
PHPBB3-9550
2012-12-20 14:39:07 -05:00
Oleg Pudeyev
00d8f944da [ticket/11285] Use more granularity in dependency checks in compress test
Some of the tests can be run without zlib or bz2 extensions present.

PHPBB3-11285
2012-12-20 13:20:05 -05:00
Andreas Fischer
3fefa5bb13 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10880] The m_approve permisson no longer implies f_noapprove.

Conflicts:
	phpBB/posting.php
2012-12-20 14:28:01 +01:00
Andreas Fischer
dabe88bb3a Merge remote-tracking branch 'p/ticket/10880' into develop-olympus
* p/ticket/10880:
  [ticket/10880] The m_approve permisson no longer implies f_noapprove.
2012-12-20 14:26:46 +01:00
Oleg Pudeyev
5c81728983 [ticket/10758] Add deprecated tags.
PHPBB3-10758
2012-12-20 05:10:57 -05:00
Oleg Pudeyev
e50f69187f [ticket/11037] Eliminate global $db usage in cache drivers.
The only time $db is needed in cache drivers is to navigate the
result set in sql_save. Pass it as a parameter in that function.

PHPBB3-11037
2012-12-20 04:35:30 -05:00
Oleg Pudeyev
69e373c1af [ticket/10758] Add compat functions.
PHPBB3-10758
2012-12-20 00:00:15 -05:00
Andreas Fischer
917a2fa9a6 [ticket/10880] The m_approve permisson no longer implies f_noapprove.
PHPBB3-10880
2012-12-19 22:02:39 -05:00
Oleg Pudeyev
f9cee47003 [ticket/10758] Admin is not working yet.
PHPBB3-10758
2012-12-19 21:50:35 -05:00
Oleg Pudeyev
3327a4676c [ticket/10758] Test moderator and admin permissions.
PHPBB3-10758
2012-12-19 21:50:35 -05:00
Oleg Pudeyev
ac3e69cb08 [ticket/10758] Check that acl was changed in the test.
PHPBB3-10758
2012-12-19 21:50:35 -05:00