1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-23 19:45:10 +01:00

20889 Commits

Author SHA1 Message Date
Nils Adermann
f0be9549ac Merge remote-tracking branch 'github-nickvergessen/feature/sqlite3' into develop-ascraeus
* github-nickvergessen/feature/sqlite3:
  [feature/sqlite3] Add sqlite3 database to .gitignore
  [feature/sqlite3] Use SQLite3 by default
  [feature/sqlite3] Remove invalid comment
  [feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queries
  [feature/sqlite3] Correctly recreate indexes when recreating a table
  [feature/sqlite3] Fix sql_index_drop() for sqlite3
  [feature/sqlite3] Remove trailing comma from column list
  [feature/sqlite3] Update docblocks and function visibility
  [feature/sqlite3] Add support for SQLite 3
2014-05-02 17:57:22 +02:00
Nils Adermann
1dd02b0a91 Merge remote-tracking branch 'github-marc1706/ticket/12071' into develop-ascraeus
* github-marc1706/ticket/12071:
  [ticket/12071] Add test that covers not available fileinfo
  [ticket/12071] Get rid of unneeded cast to boolean in tests
  [ticket/12071] Skip tests that depend on fileinfo and fix expected results
2014-05-02 16:54:24 +02:00
Nils Adermann
e65c51e3cd Merge remote-tracking branch 'github-prototech/ticket/11508' into develop-ascraeus
* github-prototech/ticket/11508:
  [ticket/11508] Fix build_url test.
  [ticket/11508] Add functional test for jumpbox.
  [ticket/11508] Use $phpbb_path_helper.
  [ticket/11508] Allow equal sign in parameter value.
  [ticket/11508] Remove unnecessary implode.
  [ticket/11508] Remove unnecessary isset check.
  [ticket/11508] Fix build_url test.
  [ticket/11508] Curly brace should be on its own line...
  [ticket/11508] The question mark is expected even if there are no parameters.
  [ticket/11508] Add tests.
  [ticket/11508] Do not add the '?' unless there are parameters.
  [ticket/11508] Change separator parameter to a simple true|false $is_amp.
  [ticket/11508] Move helper functions to path_helper class.
  [ticket/11508] Move the stripping param code to separate function as well.
  [ticket/11508] Build the jumpbox hidden fields using the _form action_
  [ticket/11508] Split parts of build_url() into reusable functions.
2014-05-02 16:40:01 +02:00
Andreas Fischer
a9ae1f83c7 Merge remote-tracking branch 'naderman/ticket/12469' into develop-ascraeus
* naderman/ticket/12469:
  [ticket/12469] Remove user table columns from fixtures that were deleted
2014-05-02 16:33:27 +02:00
Nils Adermann
ebd56b6955 [ticket/12469] Remove user table columns from fixtures that were deleted
PHPBB3-12469
2014-05-02 16:22:52 +02:00
Nils Adermann
97e651a491 Merge remote-tracking branch 'github-exreaction/ticket/8323' into develop-ascraeus
* github-exreaction/ticket/8323:
  [ticket/8323] Cache auth request
  [ticket/8323] Combine into a single query
  [ticket/8323] Comments on phpbb_get_banned_user_ids input for test
  [ticket/8323] More readability in test case
  [ticket/8323] Comments
  [ticket/8323] dataProvider for the test; better test data
  [ticket/8323] Comments
  [ticket/8323] Unit test for phpbb_get_banned_user_ids
  [ticket/8323] Comments for inactive reasons in constants.php
  [ticket/8323] Only disable administrative deactivated accounts from receiving PMs
  [ticket/8323] Allow temporarily banned users to receive PMs, but not a notification
  [ticket/8323] Correct PM notification settings (only notify those who can receive them)
  [ticket/8323] Cleanup viewtopic code (not sure how this mess happened)
  [ticket/8323] Allow sending PMs to temporarily banned users
  [ticket/8323] Do not allow sending PMs to Inactive users
  [ticket/8323] Hide the Send PM link if users cannot receive the PM
  [ticket/8323] Correcting the comment
  [ticket/8323] Do not allow sending of Private Messages to users who are banned
  [ticket/8323] Remove code used for testing
  [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages

Conflicts:
	phpBB/language/en/ucp.php
2014-05-02 15:54:10 +02:00
Joas Schilling
5496dd41ed [feature/sqlite3] Add sqlite3 database to .gitignore
PHPBB3-9728
2014-05-02 15:45:25 +02:00
Joas Schilling
d419bd1899 [feature/sqlite3] Use SQLite3 by default
PHPBB3-9728
2014-05-02 15:45:24 +02:00
Joas Schilling
86c073ec3e [feature/sqlite3] Remove invalid comment
PHPBB3-9728
2014-05-02 15:45:24 +02:00
Joas Schilling
ae3586869a [feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queries
PHPBB3-9728
2014-05-02 15:45:23 +02:00
Joas Schilling
fd37f63614 [feature/sqlite3] Correctly recreate indexes when recreating a table
PHPBB3-9728
2014-05-02 15:45:22 +02:00
Joas Schilling
b5267d97f4 [feature/sqlite3] Fix sql_index_drop() for sqlite3
PHPBB3-9728
2014-05-02 15:45:22 +02:00
Joas Schilling
07042e484e [feature/sqlite3] Remove trailing comma from column list
PHPBB3-9728
2014-05-02 15:45:21 +02:00
Patrick Webster
8c2b80e3d2 [feature/sqlite3] Update docblocks and function visibility
Added missing docblock annotations and added visibility identifiers.

PHPBB3-9728
2014-05-02 15:45:21 +02:00
Patrick Webster
b39b0369aa [feature/sqlite3] Add support for SQLite 3
Minimum version requirement is 3.6.15 as that's what ships with PHP 5.3.0
when support for SQLite 3 was added.

PHPBB3-9728
2014-05-02 15:45:20 +02:00
Nils Adermann
d52c2d1b5c Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.
2014-05-02 15:39:52 +02:00
Nils Adermann
c7450592d8 Merge remote-tracking branch 'github-bantu/ticket/12468' into develop-olympus
* github-bantu/ticket/12468:
  [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore
2014-05-02 15:36:59 +02:00
Joas Schilling
fa1ac3c54d Merge pull request #2336 from Nicofuma/ticket/12413
[ticket/12413] Fatal Error log created for feed.php file
2014-05-02 15:08:15 +02:00
Nils Adermann
4f17d0653a Merge branch 'exreaction/ticket/11881' into develop-ascraeus
* exreaction/ticket/11881:
  [ticket/11881] Move convert_timezones_test to migrator
  [ticket/11881] Fix test filename
  [ticket/11881] Limit to 500
  [ticket/11881] Make sure user_timezone isn't converted twice
  [ticket/11881] Better split the timezone conversion into chunks; add test
  [ticket/11881] Timezone migration can take a long time
2014-05-02 14:46:25 +02:00
Nils Adermann
46c5ab64d4 [ticket/11881] Move convert_timezones_test to migrator
PHPBB3-11881
2014-05-02 14:45:53 +02:00
Andreas Fischer
370015c1a5 [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.
PHPBB3-12468
2014-05-02 14:41:08 +02:00
Andreas Fischer
5e95815503 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore
2014-05-02 14:22:02 +02:00
Andreas Fischer
43c6fd768f Merge pull request #2371 from nickvergessen/ticket/12467
[ticket/12467] Add config*.php and tests_config*.php to .gitignore

* nickvergessen/ticket/12467:
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore
2014-05-02 14:21:54 +02:00
Joas Schilling
535cd5670f [ticket/12467] Add config*.php and tests_config*.php to .gitignore
PHPBB3-12467
2014-05-02 13:47:30 +02:00
Nils Adermann
2a280513ca Merge remote-tracking branch 'github-rxu/ticket/12403' into develop-ascraeus
* github-rxu/ticket/12403:
  [ticket/12403] Add template events to acp_users_prefs.html
2014-05-02 13:35:01 +02:00
Nils Adermann
ef0600bfa2 Merge remote-tracking branch 'github-marc1706/ticket/8960' into develop-ascraeus
* github-marc1706/ticket/8960:
  [ticket/8960] Allow changing avatar path if it's not writable
2014-05-02 13:26:03 +02:00
Nicofuma
8812cfcfbf [ticket/12413] Update configuration's asserts
PHPBB3-12413
2014-05-02 13:25:55 +02:00
Nicofuma
2bc4c0e39f [ticket/12413] Update init
PHPBB3-12413
2014-05-02 13:25:54 +02:00
Nicofuma
87fe1e6136 [ticket/12413] Remove unnecessary casts
PHPBB3-12413
2014-05-02 13:25:52 +02:00
Nicofuma
dcadc04b18 [ticket/12413] Disabled unapproved and solftdeleted tests
PHPBB3-12413
2014-05-02 13:25:51 +02:00
Nicofuma
21e2f5c517 [ticket/12413] Move parent:open() call to the end of the function
PHPBB3-12413
2014-05-02 13:25:49 +02:00
Nicofuma
ff2d26e7e8 [ticket/12413] Coding style again
PHPBB3-12413
2014-05-02 13:25:47 +02:00
Nicofuma
80b4a7f337 [ticket/12413] Fix coding style
PHPBB3-12413
2014-05-02 13:25:46 +02:00
Nicofuma
7d8d8394fc [ticket/12413] Fix: coding style
PHPBB3-12413
2014-05-02 13:25:44 +02:00
Nicofuma
ac59b6a199 [ticket/12413] Fixing the failed test
The test was failing because travis is too fast: 2 posts had the same
timestamp.

PHPBB3-12413
2014-05-02 13:25:42 +02:00
Nicofuma
edf0fd0fbd [ticket/12413] Adding the missing visibilities
PHPBB3-12413
2014-05-02 13:25:40 +02:00
Tristan Darricau
6c58f8cdee [ticket/12413] Using static attribute instead of @depends
Using a static attribute to store the initial state of the feeds instead
of transmit it with the @depends annotation.

This attribute is also added to backupStaticAttributesBlackList

PHPBB3-12413
2014-05-02 13:25:38 +02:00
Tristan Darricau
13d939b7e1 [ticket/12413] Useing @depends to transmit the state of the board
the state of the board is calculate in the first test and transmit to the
others thanks to the @depends annotation.

PHPBB3-12413
2014-05-02 13:25:36 +02:00
Tristan Darricau
103befc3d6 [ticket/12413] Tests: Adding functional tests for the feeds
Some tests are disabled until PHPBB3-12418 (#2331) and PHPBB3-12421 (#2330) are
fixed and merged

PHPBB3-12413
2014-05-02 13:25:35 +02:00
Tristan Darricau
e7f970e26d [ticket/12413] Fatal Error for feed.php?mode=forums
https://tracker.phpbb.com/browse/PHPBB3-12413
http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=45475

PHPBB3-12413
2014-05-02 13:25:33 +02:00
Nils Adermann
fa230b48ec Merge remote-tracking branch 'github-marc1706/ticket/8960-olympus' into develop-olympus
* github-marc1706/ticket/8960-olympus:
  [ticket/8960] Allow changing avatar path if it's not writable
2014-05-02 13:25:29 +02:00
Nils Adermann
76574d4b5e [ticket/8558] htmlspecialchars_decode the contact name for emails
PHPBB3-8558
2014-05-02 13:03:14 +02:00
Nils Adermann
854854b60f Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into develop-ascraeus
* github-elsensee/ticket/stenudd/8558-2:
  [ticket/8558] Fix operator
  [ticket/8558] Fix field length in ACP
  [ticket/8558] Use only one variable and improve explain string
  [ticket/8558] Add config in migrations and schema_data
  [ticket/8558] Add display name in emails from board

Conflicts:
	phpBB/includes/functions_messenger.php
2014-05-02 12:49:07 +02:00
Nils Adermann
e511ea71c1 Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558' into develop-ascraeus
* github-elsensee/ticket/stenudd/8558:
  [ticket/8558] Do string concatenation only once and do htmlspecialchars
  [ticket/8558] Add display name in emails from board
2014-05-02 12:42:32 +02:00
Nils Adermann
0c02607aa8 Merge remote-tracking branch 'github-rxu/ticket/12409' into develop-ascraeus
* github-rxu/ticket/12409:
  [ticket/12409] Add acp_users.php core events to modify users preferences data
2014-05-02 12:29:18 +02:00
Nils Adermann
7c2239e75c Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into develop-ascraeus
* github-nickvergessen/ticket/12273: (55 commits)
  [ticket/12273] Move $extension to constructor so the path is always set
  [ticket/12273] Find events.md relative from the path not the phpbb root
  [ticket/12273] Do not look in extensions docs/ and tests/ directory
  [ticket/12273] Also check file for adm "Location:" events
  [ticket/12273] Do not allow template events in non-html files
  [ticket/12273] Fix return description
  [ticket/12273] Update exporter to allow specifying an extension
  [ticket/12273] Allow to filter events for extensions
  [ticket/12273] Remove old parameter from function call
  [ticket/12273] Fix table header for adm events
  [ticket/12273] Add root path to recursive_event_filter_iterator
  [ticket/12273] Fix missing classes in export_events_for_wiki.php
  [ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter
  [ticket/12273] Use RecursiveDirectoryIterator in md_exporter
  [ticket/12273] Fix doc blocks
  [ticket/12273] Do not allow 3.1-A1 for template events
  [ticket/12273] Sort arguments alphabetically before exporting
  [ticket/12273] Do not allow 3.1-A1 version
  [ticket/12273] Update since version to 3.1.0-a* style
  [ticket/12273] Update existing events
  ...
2014-05-02 12:22:05 +02:00
Nils Adermann
d36795b844 Merge remote-tracking branch 'github-nickvergessen/ticket/12371' into develop-ascraeus
* github-nickvergessen/ticket/12371:
  [ticket/12371] Fix language string
  [ticket/12371] Fix typos in comment
  [ticket/12371] Fix redirect link for approve_post and post_in_queue
  [ticket/12371] Delete the approve_post notification when editing a post
  [ticket/12371] Fix language in comment
  [ticket/12371] Reapprove the post and topic again in tests
  [ticket/12371] Correctly set is_starter when editing first post of the topic
  [ticket/12371] Add functional tests for reapproving
  [ticket/12371] Fix query in mcp_sorting()
  [ticket/12371] Rename disapprove and softdelete tests
  [ticket/12371] We do not group quote notifications anymore
  [ticket/12371] Fix SQL query
  [ticket/11772] Do not send out new topic/post notifications when reapproving
  [ticket/12052] Use different visibility when post was edited
  [ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method
  [ticket/12371] Do not add unlimited users as responders
  [ticket/12371] Do not update the notification entry unneccessarily
  [ticket/12371] Do not delete post related notifications when a post is deleted
  [ticket/12371] Allow notification types to redirect to a different url
  [ticket/12371] Do not group "quote" notifications
2014-05-02 12:11:09 +02:00
Joas Schilling
5c7199f3dd [ticket/12371] Fix language string
PHPBB3-12371
2014-05-02 11:51:40 +02:00
Joas Schilling
2bb12d0d6f [ticket/12371] Fix typos in comment
PHPBB3-12371
2014-05-02 11:51:20 +02:00
Nathaniel Guse
73b950d2f1 Merge remote-tracking branch 'remotes/Crizz0/ticket/12404' into develop-ascraeus
# By Crizzo
# Via Crizzo
* remotes/Crizz0/ticket/12404:
  [ticket/12404] Splits up the line 18 in subsilver2 into more lines
  [ticket/12404] Changes append/prepend to after/before
  [ticket/12404] Adds two new events and changes some places
  [ticket/12404] Adds a new event before and after the Timezone display
2014-05-01 22:24:31 -05:00