Commit graph

20568 commits

Author SHA1 Message Date
Dhruv
5825bf7d33 [ticket/11608] Use assertContainsLang to compare language strings
PHPBB3-11608
2013-10-05 21:15:30 +05:30
Dhruv
36da38f062 [ticket/11608] split search tests into separate files
Tests for each search backend are into their own separate files.
These separate classes inherit from a common search test case class.

PHPBB3-11608
2013-10-05 21:15:29 +05:30
Dhruv
9c082999bb [ticket/11608] Check for word highlights in search results
Search tests check for highlighted words in search results

PHPBB3-11608
2013-10-05 21:15:27 +05:30
Dhruv
115599e78d [ticket/11608] Mark sphinx test as incomplete
Sphinx search for the test board cannot be tested

PHPBB3-11608
2013-10-05 21:15:26 +05:30
Dhruv
ec30fcf819 [ticket/11608] Logout before searching
Keyword search in search functional tests should be
performed as guests rather than logged in as admin.

PHPBB3-11608
2013-10-05 21:15:25 +05:30
Dhruv
f4ca9a30a5 [ticket/11608] Add more assetions in tests
PHPBB3-11608
2013-10-05 21:15:24 +05:30
Dhruv
92698c95dc [ticket/11608] Use assertions in test
PHPBB3-11608
2013-10-05 21:15:23 +05:30
Dhruv
81acd8ef10 [ticket/11608] complete search tests functionalities
PHPBB3-11608
2013-10-05 21:15:21 +05:30
Dhruv
c33c89a790 [ticket/11608] Skip tests for unsupported search backends
PHPBB3-11608
2013-10-05 21:15:20 +05:30
Dhruv
ea75b67f5e [ticket/11608] add basic search functional test structure
PHPBB3-11608
2013-10-05 21:15:19 +05:30
Dhruv
2b959e3331 [ticket/11288] Handle +,- without preceeding whitespace characters
PHPBB3-11288
2013-10-05 21:09:52 +05:30
Dhruv
7a971f896d Merge branch 'ticket/11271' into ticket/11271-develop
# By erangamapa (7) and Dhruv (2)
* ticket/11271:
  [ticket/11271] Typecast forum and topic id to integer
  [ticket/11271] Use absolute path for displaying inline attachments in feeds
  [ticket/11271] Changed executable bit.
  [ticket/11271] Formatting code and removing null assignment.
  [ticket/11271] Removing unnecessary database object
  [ticket/11271] Separated attachment fetching query
  [ticket/11271] Fetched feed attachments before loop.
  [ticket/11271] Removed in-line attachment comments properly.
  [ticket/11271] Displaying in-line attached images in ATOM feed.

Conflicts:
	phpBB/feed.php
2013-10-05 16:54:09 +05:30
David King
c10f11f10b Merge pull request #1750 from EXreaction/ticket/11885
[ticket/11885] Fix migrations error
2013-10-05 04:07:33 -07:00
Nathan Guse
874fcc940f [ticket/11885] Fix migrations error
PHPBB3-11885
2013-10-04 23:07:48 -05:00
Nathan Guse
b43dc72f19 Merge pull request #1749 from imkingdavid/ticket/11885
[ticket/11885] Add migration files for 3.0.12-RC2 and RC3 and 3.0.12
2013-10-04 16:28:01 -07:00
David King
3f7f2548cc [ticket/11885] Use conditional in update_data()
PHPBB3-11885
2013-10-04 16:17:03 -07:00
David King
b79d811b3a [ticket/11885] Fix migration files for 3.0.12
PHPBB3-11885
2013-10-04 16:08:38 -07:00
David King
62ad0984c7 [ticket/11885] Add migration files for 3.0.12-RC2 and RC3 and 3.0.12
PHPBB3-11885
2013-10-04 15:57:42 -07:00
David King
82b9df543b Merge pull request #1742 from EXreaction/ticket/11840
Ticket/11840 Refactor the extension metadata class
2013-10-04 15:40:20 -07:00
Dhruv
c73801242d [ticket/11271] Typecast forum and topic id to integer
PHPBB3-11271
2013-10-04 20:51:17 +05:30
Dhruv
e8c7f8134d Merge remote-tracking branch 'EXreaction/ticket/11883' into develop
# By Nathan (1) and Nathan Guse (1)
# Via Nathan Guse
* EXreaction/ticket/11883:
  [ticket/11883] Only output the migration time, not total
  [ticket/11883] Report completed data step in migration as "Installing Data"
2013-10-04 20:40:30 +05:30
Nathan Guse
3259bd1196 [ticket/11883] Only output the migration time, not total
PHPBB3-11883
2013-10-04 09:23:54 -05:00
Nathan Guse
fdae60c146 Merge pull request #1739 from nickvergessen/ticket/11871
[ticket/11871] Allow backslash in classnames for Modules
2013-10-03 20:31:16 -07:00
Nathan Guse
b54d0f2da6 Merge pull request #1704 from dhruvgoel92/ticket/11344
[ticket/11344] Add migration to remove acp_style_components module in 3.1
2013-10-03 20:30:11 -07:00
Nathan Guse
818296cfc9 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11877] Create package links and checksums for announcement via script.
2013-10-03 22:26:37 -05:00
Nathan Guse
9e51b43829 Merge remote-tracking branch 'remotes/bantu/ticket/11877' into develop-olympus
* remotes/bantu/ticket/11877:
  [ticket/11877] Create package links and checksums for announcement via script.
2013-10-03 22:26:14 -05:00
Nathan Guse
31aebb355c Merge pull request #1654 from rechosen/ticket/11786
[ticket/11786] Fix various defects in PHPDoc in-code documentation
2013-10-03 20:22:41 -07:00
David King
80b21e8049 Merge pull request #1746 from EXreaction/ticket/11882
[ticket/11882] Incorrect dependency in signature module auth migration
2013-10-03 09:34:12 -07:00
David King
2683188206 Merge pull request #1726 from EXreaction/ticket/11850
Fix $user->page on pages through the controller
2013-10-03 09:25:11 -07:00
Dhruv
16d6dc2e71 [ticket/11344] Upgrade migration to namespaces
PHPBB3-11344
2013-10-03 21:09:02 +05:30
Dhruv
34040771be [ticket/11344] Fix url of license
PHPBB3-11344
2013-10-03 21:02:36 +05:30
Dhruv
b4682f3a72 [ticket/11344] Add migration to remove acp_style_components module in 3.1
PHPBB3-11344
2013-10-03 21:02:34 +05:30
Nathan Guse
f2de39f0b4 Merge pull request #1736 from bantu/ticket/11870
[ticket/11870] No longer exclude search/fulltext_*.php from code coverag...
2013-10-03 07:52:24 -07:00
Marc Alexander
035db5e08b [feature/passwords] Fix hash_test for use of passwords manager
PHPBB3-11610
2013-10-03 10:23:17 +02:00
Marc Alexander
7006db7a2d Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
Conflicts:
	phpBB/includes/functions.php
2013-10-03 10:04:59 +02:00
Marc Alexander
93531e7fb0 [feature/passwords] Add prepending backslash to class namespaces
PHPBB3-11610
2013-10-02 23:45:32 +02:00
Joas Schilling
2ab3ee7d67 [ticket/11871] Fallback to int ID of the module, when creating links
Firefox is currently unable to correctly copy a urlencoded \ so users will be
unable to post links to modules. However we can still fallback to the id
instead of the name, so we do that in this case.

PHPBB3-11871
2013-10-02 22:37:16 +02:00
Nathan
621e6c93ed [ticket/11883] Report completed data step in migration as "Installing Data"
PHPBB3-11883
2013-10-02 14:27:46 -05:00
Nathan
5bd7f1bd36 [ticket/11882] If dependency is incorrect/unfulfillable, throw an error
PHPBB3-11882
2013-10-02 14:21:50 -05:00
Nathan
cab84dd9c5 [ticket/11882] Incorrect dependency in signature module auth migration
PHPBB3-11882
2013-10-02 14:18:32 -05:00
Marc Alexander
e7e11112b1 [feature/passwords] Fix tests after changes to phpBB hashing functions
PHPBB3-11610
2013-10-02 17:24:11 +02:00
Dhruv
49ce2c13b2 Merge remote-tracking branch 'nickvergessen/ticket/11691' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11691:
  [ticket/11691] Fix conversion test
  [ticket/11691] Fix table names and arguments/docs
  [ticket/11691] Move purge code into new function
  [ticket/11691] Fix typo in comment
  [ticket/11691] Add order by to the query
  [ticket/11691] Fix some minor comments
  [ticket/11691] Fix some more problems with softdelete update
  [ticket/11691] Change detection of effectively_installed()
  [ticket/11691] Stagger user notification reconversion even more
  [ticket/11691] Stagger the convertion of soft delete updates
2013-10-02 20:46:11 +05:30
Marc Alexander
3aba3235d5 [feature/passwords] Use passwords manager in phpBB hash functions
PHPBB3-11610
2013-10-02 15:43:10 +02:00
Andreas Fischer
f5676fab3c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11879] Replace .live() with .on()

Conflicts:
	phpBB/styles/prosilver/template/forum_fn.js
2013-10-02 15:01:13 +02:00
Andreas Fischer
8f2cebc0bb Merge remote-tracking branch 'cyberalien/ticket/11879' into develop-olympus
* cyberalien/ticket/11879:
  [ticket/11879] Replace .live() with .on()
2013-10-02 15:00:26 +02:00
Marc Alexander
afb7d2e616 [feature/passwords] Rename manager methods to check() and hash()
These method names are more straightforward than the previous ones.

PHPBB3-11610
2013-10-02 13:30:36 +02:00
Marc Alexander
356f3eef07 [feature/passwords] Inject passwords manager into auth providers
The passwords manager will replace the old method of using the functions
phpbb_hash() and phpbb_check_hash().

PHPBB3-11610
2013-10-02 13:28:38 +02:00
Vjacheslav Trushkin
a79d0e6758 [ticket/11879] Replace .live() with .on()
PHPBB3-11879
2013-10-02 11:12:41 +03:00
Joas Schilling
d7b8c15c86 Merge pull request #1744 from EXreaction/ticket/11878
[ticket/11878] Missing leading \ in dependencies in soft_delete_mcp_modules
2013-10-01 23:58:14 -07:00
Nathan Guse
9503b4d529 [ticket/11878] Missing leading \ in dependencies in soft_delete_mcp_modules
PHPBB3-11878
2013-10-02 00:12:29 -05:00