Commit graph

1830 commits

Author SHA1 Message Date
Nils Adermann
e97fab49e2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
2014-07-04 21:08:36 +02:00
Nils Adermann
53ff23671c Merge remote-tracking branch 'github-nicofuma/ticket/12446' into develop-ascraeus
* github-nicofuma/ticket/12446:
  [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
2014-07-04 21:08:20 +02:00
Joas Schilling
7ad88ba32b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12777] Add tests for unavailable extension
  [ticket/12777] Add tests
  [ticket/12777] Add is_purged()
  [ticket/12777] Update doc block of is_configured()
  [ticket/12777] Rename extension status functions and add is_configured()
2014-06-29 23:41:28 +02:00
Joas Schilling
5652f33ccc Merge pull request #2669 from Nicofuma/ticket/12777
[ticket/12777] Rename extension status functions and add is_configured()

* Nicofuma/ticket/12777:
  [ticket/12777] Add tests for unavailable extension
  [ticket/12777] Add tests
  [ticket/12777] Add is_purged()
  [ticket/12777] Update doc block of is_configured()
  [ticket/12777] Rename extension status functions and add is_configured()
2014-06-29 23:33:47 +02:00
Tristan Darricau
d13e02c7b1 [ticket/12777] Rename extension status functions and add is_configured()
PHPBB3-12777
2014-06-27 10:49:13 +02:00
Andreas Fischer
eef50ae41b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12196] Fix typo in "referrer"
2014-06-26 23:46:40 +02:00
Joas Schilling
7e769083bf [ticket/12196] Fix typo in "referrer"
Referer is a typo in the HTTP RFC and should not be used in the UI

PHPBB3-12196
2014-06-26 23:44:21 +02:00
Andreas Fischer
dd835790c6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12196] Revert Fix typo "referer" in acp/attachments
2014-06-26 23:33:47 +02:00
Andreas Fischer
ffa1f9baf5 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12196] Revert Fix typo "referer" in acp/attachments
2014-06-26 23:33:47 +02:00
Tristan Darricau
ff6e026a40 [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
PHPBB3-12446
2014-06-26 21:09:19 +02:00
Dhruv
a730c0291f [ticket/12196] Revert Fix typo "referer" in acp/attachments
This reverts commit 9bc1f7924d.
https://tracker.phpbb.com/browse/PHPBB3-12196

PHPBB3-12196
2014-06-27 00:07:15 +05:30
Dhruv
cb6c0db51b Merge branch 'develop-ascraeus' into develop
# By Joas Schilling
# Via Dhruv (2) and Joas Schilling (1)
* develop-ascraeus:
  [ticket/12196] Fix typo "referer" in acp/attachments
2014-06-26 23:30:33 +05:30
Dhruv
eb3e1b35d6 Merge branch 'develop-olympus' into develop-ascraeus
# By Joas Schilling
# Via Dhruv (1) and Joas Schilling (1)
* develop-olympus:
  [ticket/12196] Fix typo "referer" in acp/attachments
2014-06-26 23:30:06 +05:30
Joas Schilling
9bc1f7924d [ticket/12196] Fix typo "referer" in acp/attachments
PHPBB3-12196
2014-06-25 23:17:02 +02:00
Dhruv
6be8c98296 Merge branch 'develop-ascraeus' into develop
# By Crizzo
# Via Crizzo (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12563] Adds « and » to the links in acp_styles.php
  [ticket/12563] Removes ending . from <a>
  [ticket/12563] Removes strintf in acp_styles.php and shorts up <a>
  [ticket/12563] Changes 2 language variables to better understandable names
2014-06-23 22:07:15 +05:30
Dhruv Goel
dfbe072d51 Merge pull request #2571 from Crizz0/ticket/12563
[ticket/12563] Changes 2 style specific language variables for better understanding
2014-06-23 22:04:20 +05:30
Andreas Fischer
80e0851189 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12747] Remove some methods which are not used anymore
  [ticket/12747] Drop support for Firebird
2014-06-22 23:41:26 +02:00
Andreas Fischer
4f2acbaed2 Merge pull request #2629 from nickvergessen/ticket/12747
[ticket/12747] Drop support for Firebird

* nickvergessen/ticket/12747:
  [ticket/12747] Remove some methods which are not used anymore
  [ticket/12747] Drop support for Firebird

Conflicts:
	phpBB/phpbb/db/driver/firebird.php
2014-06-22 23:41:14 +02:00
Crizzo
c4e48ed0b9 [ticket/12563] Adds &laquo; and &raquo; to the links in acp_styles.php
PHPBB3-12563
2014-06-22 22:02:46 +02:00
Andreas Fischer
0b52d60e28 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12723] Do not mention too many details on documentation.
  [ticket/12723] Do not reference the coding guidelines section.
  [ticket/12757] Add a Code Sniffer ruleset for PHP files of phpBB extensions
  [ticket/12723] Properly describe new Code Sniffer rulsets.
  [ticket/12723] Use core suffix in filename instead of phpbb in the middle.
  [ticket/12723] Add Sniff ensuring PHP files use the correct file header
2014-06-22 11:35:13 +02:00
Tristan Darricau
32a2c95f90 [ticket/12723] Add Sniff ensuring PHP files use the correct file header
PHPBB3-12723
2014-06-22 00:45:34 +02:00
Joas Schilling
04164affe6 [ticket/12747] Drop support for Firebird
PHPBB3-12747
2014-06-20 12:35:42 +02:00
Andreas Fischer
c9da435d3c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12721] Update rules descriptions
  [ticket/12721] Add Generic.NamingConventions.ConstructorName in strict
  [ticket/12721] Add Squiz.Functions.LowercaseFunctionKeywords in legacy
  [ticket/12721] Add Squiz.ControlStructures.ForLoopDeclaration in legacy
  [ticket/12721] Add Squiz.ControlStructures.ForEachLoopDeclaration
  [ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacy
  [ticket/12721] Add Generic.Functions.OpeningFunctionBraceBsdAllman
  [ticket/12721] Add Squiz.Arrays.ArrayBracketSpacing in the legacy ruleset
  [ticket/12721] Add Generic.Files.LowercasedFilename in the legacy ruleset
2014-06-17 00:42:40 +02:00
Tristan Darricau
34a4ba36cd [ticket/12721] Add Squiz.Arrays.ArrayBracketSpacing in the legacy ruleset
PHPBB3-12721
2014-06-16 22:35:12 +02:00
Andreas Fischer
7f5aeeef01 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset
2014-06-16 22:24:59 +02:00
Tristan Darricau
ca3cdadd08 [ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset
PHPBB3-12722
2014-06-16 19:05:09 +02:00
Dhruv
aaa9a4b0e6 Merge branch 'develop-ascraeus' into develop
# By Tristan Darricau
# Via Dhruv Goel (1) and Tristan Darricau (1)
* develop-ascraeus:
  [ticket/12109] Fix coding style
  [ticket/12109] Bug when setting permissions with "Select all users"
2014-06-15 13:05:53 +05:30
Dhruv Goel
587759bd6a Merge pull request #2431 from Nicofuma/ticket/12109
[ticket/12109] Bug when setting permissions with "Select all users"
2014-06-15 13:04:35 +05:30
Crizzo
453cb70963 [ticket/12563] Removes strintf in acp_styles.php and shorts up <a>
PHPBB3-12563
2014-06-12 19:19:46 +02:00
Dhruv
464a1190ea Merge branch 'develop-ascraeus' into develop
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12694] Remove whitespace at end of line from acp_groups
2014-06-11 22:44:35 +05:30
Marc Alexander
afbf4ba296 [ticket/12694] Remove whitespace at end of line from acp_groups
PHPBB3-12694
2014-06-11 19:03:36 +02:00
Nils Adermann
86b5a815ab Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (33 commits)
  [ticket/12352] Do not check hashes that don't have the necessary length
  [ticket/12352] Update file headers to fit new format
  [ticket/12352] Use custom provider collection for auth providers
  [ticket/12352] Add checks for existing user_pass_convert to migrations
  [ticket/12352] Remove usages of user_pass_convert column
  [ticket/12352] Update schema json file
  [ticket/12352] Remove user_pass_convert column from database
  [ticket/12352] Check each newly added passwords driver in manager_test
  [ticket/12352] Add get_settings_only method to passwords driver base
  [ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords
  [ticket/12352] Add tests for wcf1 and wcf2 drivers
  [ticket/12352] Add driver for woltlab community framework 1 passwords
  [ticket/12352] Add driver for woltlab community framework 2 passwords
  [ticket/12352] Add missing $ to md5_mybb and md5_vb driver
  [ticket/12352] Fix spacing in passwords tests
  [ticket/12352] Add passwords driver for vB passwords
  [ticket/12352] Use correct hashing method in md5_mybb driver
  [ticket/12352] Add driver for myBB md5 passwords
  [ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers
  [ticket/12352] Add passwords driver for sha1 password hashes
  ...
2014-06-11 14:28:06 +02:00
Nils Adermann
694f8391c9 Merge remote-tracking branch 'github-marc1706/ticket/12352' into develop-ascraeus
* github-marc1706/ticket/12352: (33 commits)
  [ticket/12352] Do not check hashes that don't have the necessary length
  [ticket/12352] Update file headers to fit new format
  [ticket/12352] Use custom provider collection for auth providers
  [ticket/12352] Add checks for existing user_pass_convert to migrations
  [ticket/12352] Remove usages of user_pass_convert column
  [ticket/12352] Update schema json file
  [ticket/12352] Remove user_pass_convert column from database
  [ticket/12352] Check each newly added passwords driver in manager_test
  [ticket/12352] Add get_settings_only method to passwords driver base
  [ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords
  [ticket/12352] Add tests for wcf1 and wcf2 drivers
  [ticket/12352] Add driver for woltlab community framework 1 passwords
  [ticket/12352] Add driver for woltlab community framework 2 passwords
  [ticket/12352] Add missing $ to md5_mybb and md5_vb driver
  [ticket/12352] Fix spacing in passwords tests
  [ticket/12352] Add passwords driver for vB passwords
  [ticket/12352] Use correct hashing method in md5_mybb driver
  [ticket/12352] Add driver for myBB md5 passwords
  [ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers
  [ticket/12352] Add passwords driver for sha1 password hashes
  ...
2014-06-11 14:27:57 +02:00
Crizzo
3a48f76558 [ticket/12563] Changes 2 language variables to better understandable names
PHPBB3-12563
2014-06-10 20:29:30 +02:00
Nils Adermann
618b73a3d3 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12508] Ignore extensions in migration_tips dev tool
  [ticket/12508] Fix doc block
  [ticket/12508] Add new line to separate the if and foreach better
  [ticket/12508] Add a unit test for set_extensions()
  [ticket/12508] Only take a list of names for set_extensions()
  [ticket/12508] Fix class doc block
  [ticket/12508] Move \phpbb\extension\finder to \phpbb\finder
  [ticket/12508] Fix usages of the finder
  [ticket/12508] Remove extension manager from finder
2014-06-10 18:40:18 +02:00
Joas Schilling
d45c681b40 [ticket/12508] Fix usages of the finder
PHPBB3-12508
2014-06-10 11:47:39 +02:00
Joas Schilling
01a79fe1dc Merge pull request #2557 from Elsensee/ticket/12516
[ticket/12516] Always preview signature in UCP/ACP module

* Elsensee/ticket/12516:
  [ticket/12516] Always preview signature in UCP/ACP module
2014-06-10 00:27:18 +02:00
Joas Schilling
4916c8c24c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12606] Add ACP group core events
2014-06-10 00:13:20 +02:00
Joas Schilling
456ff2559a Merge pull request #2518 from Pico88/ticket/12606
[ticket/12606] Add ACP group core events

* Pico88/ticket/12606:
  [ticket/12606] Add ACP group core events
2014-06-10 00:13:11 +02:00
Pico88
74842b2354 [ticket/12606] Add ACP group core events
PHPBB3-12606
2014-06-09 18:56:04 +02:00
Nils Adermann
7a55594e93 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (36 commits)
  [ticket/10073] Fix button descriptions
  [ticket/10073] Do not check disable boxes by default
  [ticket/10073] Store values with config_text in the ACP
  [ticket/10073] Move config values to config_text
  [ticket/10073] Fix request usage
  [ticket/10073] Deduplicate template variable names
  [ticket/10073] Get service from container
  [ticket/10073] Fix more "Contact Us" strings
  [ticket/10073] Move template code into the template
  [ticket/10073] Make contact page available when board is disabled
  [ticket/10073] Change name of the ACP module
  [ticket/10073] Deduplicate posting buttons code in ACP
  [ticket/10073] Use phpbb_validate_email to verify email address
  [ticket/10073] Add tests for new validate_email()
  [ticket/10073] Split email validation from email ban and taken checks
  [ticket/10073] Deduplicate the if statement
  [ticket/10073] Fallback to board_contact when contact page is disabled
  [ticket/10073] Remove language string from rebase conflict
  [ticket/10073] Add ACP module to add bbcode text for contact admin info
  [ticket/10073] Add new configs to the schema
  ...
2014-06-09 17:55:59 +02:00
Nils Adermann
b6232aa9b2 Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into develop-ascraeus
* github-nickvergessen/ticket/10073: (36 commits)
  [ticket/10073] Fix button descriptions
  [ticket/10073] Do not check disable boxes by default
  [ticket/10073] Store values with config_text in the ACP
  [ticket/10073] Move config values to config_text
  [ticket/10073] Fix request usage
  [ticket/10073] Deduplicate template variable names
  [ticket/10073] Get service from container
  [ticket/10073] Fix more "Contact Us" strings
  [ticket/10073] Move template code into the template
  [ticket/10073] Make contact page available when board is disabled
  [ticket/10073] Change name of the ACP module
  [ticket/10073] Deduplicate posting buttons code in ACP
  [ticket/10073] Use phpbb_validate_email to verify email address
  [ticket/10073] Add tests for new validate_email()
  [ticket/10073] Split email validation from email ban and taken checks
  [ticket/10073] Deduplicate the if statement
  [ticket/10073] Fallback to board_contact when contact page is disabled
  [ticket/10073] Remove language string from rebase conflict
  [ticket/10073] Add ACP module to add bbcode text for contact admin info
  [ticket/10073] Add new configs to the schema
  ...
2014-06-09 17:55:25 +02:00
Dhruv
d1055bdd9e Merge branch 'develop-ascraeus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and others
* develop-ascraeus:
  [ticket/12660] Improve check for when phpinfo() is disabled.
2014-06-09 13:25:24 +05:30
Dhruv
5e9cb35457 Merge branch 'develop-olympus' into develop-ascraeus
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-olympus:
  [ticket/12660] Improve check for when phpinfo() is disabled.
2014-06-09 13:23:49 +05:30
Andreas Fischer
a0c442d16e [ticket/12660] Improve check for when phpinfo() is disabled.
PHPBB3-12660
2014-06-09 03:28:57 +02:00
Joas Schilling
e3c3a5d2a7 [ticket/10073] Do not check disable boxes by default
PHPBB3-10073
2014-06-09 01:36:19 +02:00
Oliver Schramm
084875f343 [ticket/12516] Always preview signature in UCP/ACP module
PHPBB3-12516
2014-06-07 18:24:13 +02:00
Andreas Fischer
f1314741fb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12639] Add a space in the code generated by generate_sql_keyword()
  [ticket/12639] Handle $conditions['keywords'] outside of the loop
  [ticket/12639] Don't make a copy of $marked when deleting logs in acp_logs
  [ticket/12639] Send a correct IN entry when deleting marked logs
  [ticket/12639] Use assertSame
  [ticket/12639] Remove old commented tests
  [ticket/12639] Order the results correctly in the test
  [ticket/12639] Fix tests on postgres
  [ticket/12639] Update tests to use a dataProvider
  [ticket/12639] Add a test case with an empty keywords list
  [ticket/12639] Delete entry in admin-log leads to mysql-error
2014-06-04 23:59:21 +02:00
Tristan Darricau
3e31764007 [ticket/12639] Don't make a copy of $marked when deleting logs in acp_logs
PHPBB3-12639
2014-06-02 23:22:36 +02:00
Tristan Darricau
5b5f3a5d0c [ticket/12639] Send a correct IN entry when deleting marked logs
PHPBB3-12639
2014-06-02 23:15:25 +02:00