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

398 Commits

Author SHA1 Message Date
Andreas Fischer
d5958875c5 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12818] Use assertGreaterThanOrEqual in the tests
  [ticket/12818] Don't use the id for i=
  [ticket/12818] Add tests
  [ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logs
2014-07-11 11:53:38 +02:00
Tristan Darricau
8de8cbab5e [ticket/12818] Use assertGreaterThanOrEqual in the tests
PHPBB3-12818
2014-07-09 00:12:57 +02:00
Tristan Darricau
de1da3170c [ticket/12818] Don't use the id for i=
PHPBB3-12818
2014-07-07 22:13:42 +02:00
Tristan Darricau
14e9c7695d [ticket/12818] Add tests
PHPBB3-12818
2014-07-07 21:49:48 +02:00
Joas Schilling
4558262e2a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12013] Fix functional tests and sniffer issue.
  [ticket/12013] Clear the jumpbox.
  [ticket/12013] Add moderator tools icon.
  [ticket/12013] Remove obsolete jumpbox and quickmod CSS.
  [ticket/12013] Prevent the dropdown scrollbar from overlapping the content.
  [ticket/12013] Update to use the new .button class.
  [ticket/12013] Add missing class to place the buttons on the rightside.
  [ticket/12013] Use the correct variable for the forum id.
  [ticket/12013] Use DEFINE instead of Twig's set.
  [ticket/12013] Use path helper.
  [ticket/12013] Use new dropdown for quickmod tools and jumpbox.
2014-07-04 13:32:10 +02:00
Cesar G
d95c97c3b4 [ticket/12013] Fix functional tests and sniffer issue.
PHPBB3-12013
2014-07-04 01:22:32 -07:00
Tristan Darricau
05bd866cb3 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12783] Move phpbb requirement to extra->soft-require
  [ticket/12783] Correctly use dataProviders and mark tests as incomplete
  [ticket/12783] Move phpbb/phpbb require version to extra
2014-07-03 14:24:47 +02:00
Joas Schilling
3f0dec4ce6 [ticket/12783] Move phpbb requirement to extra->soft-require
PHPBB3-12783
2014-07-02 16:23:20 +02:00
Joas Schilling
2d116ffede [ticket/12783] Move phpbb/phpbb require version to extra
PHPBB3-12783
2014-06-28 13:06:46 +02:00
Andreas Fischer
c0699c88f8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11528] Change click_submit() to accept id as param
  [ticket/11528] Handle case when config file cant be written by installer
  [ticket/11528] Change NULL to null
  [ticket/11528] Fix spaces and slashes as per guidelines
  [ticket/11528] Add asserts in installation steps
  [ticket/11528] Use 'use' keyword to import classes to current scope
  [ticket/11528] Move parent::tearDown() to end of tearDown()
  [ticket/11528] Call parent::tearDown in overrided tearDown method
  [ticket/11528] Instantiate $client, $driver from functional test case
  [ticket/11528] Refactor install_board() code into a new class
  [ticket/11528] Add behat/mink and mink-goutte-driver as dependency
2014-06-23 20:38:12 +02:00
Andreas Fischer
8332671813 Merge pull request #2587 from dhruvgoel92/ticket/11528
[ticket/11528] Refactor install_board( ) into a new mink class

* dhruvgoel92/ticket/11528:
  [ticket/11528] Change click_submit() to accept id as param
  [ticket/11528] Handle case when config file cant be written by installer
  [ticket/11528] Change NULL to null
  [ticket/11528] Fix spaces and slashes as per guidelines
  [ticket/11528] Add asserts in installation steps
  [ticket/11528] Use 'use' keyword to import classes to current scope
  [ticket/11528] Move parent::tearDown() to end of tearDown()
  [ticket/11528] Call parent::tearDown in overrided tearDown method
  [ticket/11528] Instantiate $client, $driver from functional test case
  [ticket/11528] Refactor install_board() code into a new class
  [ticket/11528] Add behat/mink and mink-goutte-driver as dependency
2014-06-23 20:38:11 +02:00
Dhruv
c26fa6a15b [ticket/11528] Move parent::tearDown() to end of tearDown()
PHPBB3-11528
2014-06-23 01:26:17 +05:30
Dhruv
019b345171 [ticket/11528] Call parent::tearDown in overrided tearDown method
PHPBB3-11528
2014-06-23 01:26:16 +05:30
Joas Schilling
25fd6a0d15 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12730] Update Google+ button class to use proper identification
  [ticket/12730] Update maxlen for type_googleplus to 255
  [ticket/12730] Fix type_googleplus_test to use same validation rule as the field
  [ticket/12730] Update field_length to be 20 by default for Google+
  [ticket/12730] Google+ field_order should be 13
  [ticket/12730] Switch service name to googleplus for type_googleplus
  [ticket/12730] Restore field_length to 10 for type_googleplus
  [ticket/12730] Add functional test for Google+ field
  [ticket/12730] Value shouldn't be escaped for schema_data.sql
  [ticket/12730] Missing newline at type_googleplus_test.php
  [ticket/12730] Set field_active to 1 for Google+ field
  [ticket/12730] Add unit test for type_googleplus
  [ticket/12730] Add missing brackets to type_googleplus.php
  [ticket/12730] Update field_order for Google+ CPF
  [ticket/12730] Use string template for Google+ CPF instead of a new one
  [ticket/12730] Minor formatting fixes
  [ticket/12730] Incorrect indentation for type_googleplus
  [ticket/12730] Spaces in block header
  [ticket/12730] Add a Google+ field by default
  [ticket/12730] Add Google+ profile field type
2014-06-22 19:56:49 +02:00
Shitiz Garg
ea0e073c12 [ticket/12730] Add functional test for Google+ field
PHPBB3-12730
2014-06-21 03:35:19 +05:30
Joas Schilling
9ac237a899 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (30 commits)
  [ticket/12732] Update schema.json for Skype
  [ticket/12729] Add functional test for Facebook field
  [ticket/12731] Add functional test for youtube field
  [ticket/12732] Add functional test for Skype profile field
  [ticket/12733] Add functional test for twitter profile field
  [ticket/12730] Values needn't be escaped for schema_data.sql
  [ticket/12733] Values needn't be escaped for schema_data.sql
  [ticket/12732] Values shouldn't be escaped for schema_data.sql
  [ticket/12731] Set field_active to 1 for YouTube field
  [ticket/12731] Add YouTube custom profile field
  [ticket/12733] Set field_active to 1 for Twitter
  [ticket/12733] Convert spaces to tabs
  [ticket/12733] Fix spacing for block header in profilefield_twitter.php
  [ticket/12733] Update schema.json
  [ticket/12733] Add Twitter custom profile field
  [ticket/12732] Set field_active to 1 for Skype's field
  [ticket/12729] Set field_active as 1 for Facebook profile field
  [ticket/12729] Add unit test for ALPHA_DOTS validation
  [ticket/12729] Move ALPHA_DOTS to above ALPHA_SPACERS
  [ticket/12729] Convert spaces to tabs
  ...
2014-06-20 23:43:31 +02:00
Joas Schilling
18bf45ab1b Merge pull request #2628 from Dragooon/ticket/12731
[ticket/12731] Add YouTube custom profile field

* Dragooon/ticket/12731:
  [ticket/12731] Add functional test for youtube field
  [ticket/12731] Set field_active to 1 for YouTube field
  [ticket/12731] Add YouTube custom profile field

Conflicts:
	phpBB/install/schemas/schema.json
	phpBB/install/schemas/schema_data.sql
	phpBB/language/en/memberlist.php
	tests/functional/ucp_profile_test.php
2014-06-20 23:42:54 +02:00
Joas Schilling
3c38fcce40 Merge pull request #2621 from Dragooon/ticket/12732
[ticket/12732] Add Skype custom profile field

* Dragooon/ticket/12732:
  [ticket/12732] Update schema.json for Skype
  [ticket/12732] Add functional test for Skype profile field
  [ticket/12732] Values shouldn't be escaped for schema_data.sql
  [ticket/12732] Set field_active to 1 for Skype's field
  [ticket/12732] Add unit tests for ALPHA_PUNCTUATION
  [ticket/12732] Missing comma after validation definition
  [ticket/12732] Improve ALPHA_PUNCTUATION description
  [ticket/12732] Use user info instead of chat as default Skype action
  [ticket/12732] Add Skype custom profile field

Conflicts:
	phpBB/install/schemas/schema.json
	phpBB/install/schemas/schema_data.sql
	phpBB/language/en/memberlist.php
	tests/functional/ucp_profile_test.php
	tests/profilefields/type_string_test.php
2014-06-20 23:39:54 +02:00
Joas Schilling
b9890c6a4c Merge pull request #2612 from Dragooon/ticket/12733
[ticket/12733] Add Twitter custom profile field

* Dragooon/ticket/12733:
  [ticket/12733] Add functional test for twitter profile field
  [ticket/12733] Values needn't be escaped for schema_data.sql
  [ticket/12733] Set field_active to 1 for Twitter
  [ticket/12733] Convert spaces to tabs
  [ticket/12733] Fix spacing for block header in profilefield_twitter.php
  [ticket/12733] Update schema.json
  [ticket/12733] Add Twitter custom profile field

Conflicts:
	phpBB/install/schemas/schema.json
	phpBB/install/schemas/schema_data.sql
	phpBB/language/en/memberlist.php
	tests/functional/ucp_profile_test.php
2014-06-20 23:37:51 +02:00
Shitiz Garg
aeeaf2f6ef [ticket/12729] Add functional test for Facebook field
PHPBB3-12729
2014-06-20 21:20:04 +05:30
Shitiz Garg
51b4dc7077 [ticket/12731] Add functional test for youtube field
PHPBB3-12731
2014-06-20 21:17:23 +05:30
Shitiz Garg
10b466848a [ticket/12732] Add functional test for Skype profile field
PHPBB3-12732
2014-06-20 21:13:29 +05:30
Shitiz Garg
cdfcbfc6d0 [ticket/12733] Add functional test for twitter profile field
PHPBB3-12733
2014-06-20 21:12:02 +05:30
Joas Schilling
7bc2d1f2df Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11711] Improve coding and comments of character check
  [ticket/11711] Reduce size of tests and also test topic titles
  [ticket/11711] Improve checks for unsupported characters and check subject
  [ticket/11711] Inform user of unsupported characters while posting
2014-06-20 10:53:31 +02:00
Joas Schilling
b855f5fc6a Merge pull request #2566 from marc1706/ticket/11711
[ticket/11711] Inform user of unsupported characters while posting

* marc1706/ticket/11711:
  [ticket/11711] Improve coding and comments of character check
  [ticket/11711] Reduce size of tests and also test topic titles
  [ticket/11711] Improve checks for unsupported characters and check subject
  [ticket/11711] Inform user of unsupported characters while posting
2014-06-20 10:51:58 +02:00
Cesar G
b0ab83886e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (25 commits)
  [ticket/12613] Add distinction between top/bottom action-bar
  [ticket/12613] Replaced topic-actions with action-bar
  [ticket/12613] Remove responsive linklist from memberlist
  [ticket/12613] Remove unnecessary checks and clean up CSS
  [ticket/12613] role="navigation" not allowed on <ul>
  [ticket/12613] Improved screen reader functionality
  [ticket/12613] Removed unnecessary checks
  [ticket/12613] Set fixed font-size
  [ticket/12613] Slightly better icons
  [ticket/12613] Typo and L_COLON
  [ticket/12613] Small inconsistency fixes
  [ticket/12613] Don't display page-jump if all pages are visible (6)
  [ticket/12613] Fixes from comments (single quotes and typos)
  [ticket/12613] Minor $bull; and <hr> fix
  [ticket/12613] Pagination should never be in responsive linklist
  [ticket/12613] Minor CSS fixes
  [ticket/12613] Dropdown-visible page-jump icon, fix focus() timing
  [ticket/12613] Renamed jump-to to page-jump to prevent confusion
  [ticket/12613] Removed form in order to prevent nested forms
  [ticket/12613] Fix functional test and post sorting bug
  ...
2014-06-14 16:31:20 -07:00
Cesar G
24bbd06d49 Merge remote-tracking branch 'PayBas/ticket/12613' into develop-ascraeus
* PayBas/ticket/12613: (25 commits)
  [ticket/12613] Add distinction between top/bottom action-bar
  [ticket/12613] Replaced topic-actions with action-bar
  [ticket/12613] Remove responsive linklist from memberlist
  [ticket/12613] Remove unnecessary checks and clean up CSS
  [ticket/12613] role="navigation" not allowed on <ul>
  [ticket/12613] Improved screen reader functionality
  [ticket/12613] Removed unnecessary checks
  [ticket/12613] Set fixed font-size
  [ticket/12613] Slightly better icons
  [ticket/12613] Typo and L_COLON
  [ticket/12613] Small inconsistency fixes
  [ticket/12613] Don't display page-jump if all pages are visible (6)
  [ticket/12613] Fixes from comments (single quotes and typos)
  [ticket/12613] Minor $bull; and <hr> fix
  [ticket/12613] Pagination should never be in responsive linklist
  [ticket/12613] Minor CSS fixes
  [ticket/12613] Dropdown-visible page-jump icon, fix focus() timing
  [ticket/12613] Renamed jump-to to page-jump to prevent confusion
  [ticket/12613] Removed form in order to prevent nested forms
  [ticket/12613] Fix functional test and post sorting bug
  ...
2014-06-14 16:30:41 -07:00
Marc Alexander
5ee7f20f4e [ticket/11711] Improve coding and comments of character check
PHPBB3-11711
2014-06-10 15:51:25 +02:00
Joas Schilling
592624379f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/8610] Use css selector instead of xPath
  [ticket/8610] Add functional test when two topics are merged
  [ticket/8610] Throw an error when the dest topic isn't set
  [ticket/8610] Fix bookmarks when merging all the posts of a topic
  [ticket/8610] Merging topics does not handle bookmarks correctly
2014-06-09 22:57:33 +02:00
Joas Schilling
771cbb2b3a Merge pull request #2434 from Nicofuma/ticket/8610
[ticket/8610] Merging topics does not handle bookmarks correctly

* Nicofuma/ticket/8610:
  [ticket/8610] Use css selector instead of xPath
  [ticket/8610] Add functional test when two topics are merged
  [ticket/8610] Throw an error when the dest topic isn't set
  [ticket/8610] Fix bookmarks when merging all the posts of a topic
  [ticket/8610] Merging topics does not handle bookmarks correctly
2014-06-09 22:57:27 +02:00
Marc Alexander
65884bf2bd [ticket/11711] Reduce size of tests and also test topic titles
PHPBB3-11711
2014-06-09 18:57:05 +02:00
Marc Alexander
89f7067377 [ticket/11711] Inform user of unsupported characters while posting
PHPBB3-11711
2014-06-09 17:48:06 +02:00
PayBas
f2c7890c64 [ticket/12613] Fix functional test and post sorting bug
PHPBB3-12613
2014-06-05 09:59:34 +02:00
Tristan Darricau
7c4bd8cc76 [ticket/8610] Use css selector instead of xPath
PHPBB3-8610
2014-05-31 00:29:42 +02:00
Joas Schilling
e8af120037 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11467] Add user object to extension manager for tests
  [ticket/11467] Add language variables to tests
  [ticket/11467] Add language variables for extension exception messages
2014-05-30 23:01:57 +02:00
Tristan Darricau
63c62f86ee [ticket/8610] Add functional test when two topics are merged
PHPBB3-8610
2014-05-29 11:48:48 +02:00
n-aleha
56959a2f83 [ticket/11467] Add language variables to tests
Convert the hardcoded strings to language variables.

PHPBB3-11467
2014-05-29 01:07:44 +03:00
Andreas Fischer
3ab06314f1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12594] Replace phpBB Group with phpBB Limited
  [ticket/12594] Update footer credit lines
  [ticket/12594] Remove @package tags and update file headers
2014-05-28 18:19:20 +02:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
Joas Schilling
0a01b6a4cb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12270] Fixed topic counting bug and tests
  [ticket/12270] Fixed tests not working
  [ticket/12270] No quote notif and double poster notification fix
  [ticket/12270] Fixed tests
  [ticket/12270] Fixed rebase conflicts
  [ticket/12270] Correct confirm approval message for topics
  [ticket/12270] Correcting to follow phpBB coding standards
  [ticket/12270] Better structured code and no debug error message
  [ticket/12270] Correct notifications for posts/topics now working
  [ticket/12270] Reverted templates
  [ticket/12270] Correct post&topic approval msg, no template changes
  [ticket/12270] Corrent post and topic approval notification message
2014-05-26 18:18:37 +02:00
Joas Schilling
172b7cfe35 Merge pull request #2134 from marcosbc/ticket/12270
[ticket/12270] Current post and topic approval notification message

* marcosbc/ticket/12270:
  [ticket/12270] Fixed topic counting bug and tests
  [ticket/12270] Fixed tests not working
  [ticket/12270] No quote notif and double poster notification fix
  [ticket/12270] Fixed tests
  [ticket/12270] Fixed rebase conflicts
  [ticket/12270] Correct confirm approval message for topics
  [ticket/12270] Correcting to follow phpBB coding standards
  [ticket/12270] Better structured code and no debug error message
  [ticket/12270] Correct notifications for posts/topics now working
  [ticket/12270] Reverted templates
  [ticket/12270] Correct post&topic approval msg, no template changes
  [ticket/12270] Corrent post and topic approval notification message
2014-05-26 18:09:54 +02:00
Matt Friedman
a18c293739 [ticket/12564] Remove version definitions from modules in tests
PHPBB3-12564
2014-05-20 11:37:42 -07:00
Joas Schilling
b3eb38ecaf [ticket/12534] Fix filter for functional tests
PHPBB3-12534
2014-05-12 11:38:14 +02:00
marcosbc
867dc84c33 [ticket/12270] Fixed tests
PHPBB3-12270
2014-05-09 01:22:20 +02:00
Joas Schilling
48a170549c Merge pull request #2421 from n-aleha/ticket/12493
[ticket/12493] Fix sql query for selection of users that have disabled PM

* n-aleha/ticket/12493:
  [ticket/12493] Add functional test
  [ticket/12493] Fix sql query for selection of users that have disabled PM
2014-05-08 12:22:49 +02:00
n-aleha
83a905de4b [ticket/12493] Add functional test
Added a functional test.

PHPBB3-12493
2014-05-07 23:00:50 +03:00
Tristan Darricau
62b4e7b9d2 [ticket/12421] Rebase and enable tests
PHPBB3-12421
2014-05-06 14:54:22 +02:00
Tristan Darricau
717f8a6671 [ticket/12459] Change language strings
PHPBB3-12459
2014-05-05 18:58:15 +02:00
Nicofuma
f90e6649f7 [ticket/12459] Enable related tests
PHPBB3-12459
2014-05-04 15:44:15 +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