Commit graph

14815 commits

Author SHA1 Message Date
Fyorl
91050356d3 [ticket/10992] Modified upload tests to work with new version
PHPBB3-10992
2012-07-16 18:24:16 +02:00
Joas Schilling
d9a32ce614 [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
PHPBB3-10950
2012-07-16 17:22:10 +02:00
Joas Schilling
1b826842aa [ticket/10942] Avoid possible conflicts with magic words in unit tests
PHPBB3-10942
2012-07-16 16:59:40 +02:00
Nathan
97350944e3 [ticket/7598] Use $user->lang['COMMA_SEPARATOR']
PHPBB3-7598
2012-07-14 17:40:37 -05:00
Nathan
f3e6547acf [ticket/7598] Inactive users action notification (ACP)
When performing an action on users in the ACP Inactive Users, such as activating, deleting, or reminding, trigger_error is now called to give a notification that the action was performed

PHPBB3-7598
2012-07-13 22:18:28 -05:00
David King
d908d93273 [ticket/10444] Do not default to the previous post edit reason.
PHPBB3-10444
2012-07-12 16:02:58 -04:00
Andreas Fischer
b45bc27339 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
2012-07-12 18:19:58 +02:00
Andreas Fischer
8f5182bf84 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
2012-07-12 18:19:40 +02:00
Andreas Fischer
35e18a49a9 Merge remote-tracking branch 'Noxwizard/ticket/10978' into prep-release-3.0.11
* Noxwizard/ticket/10978:
  [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
2012-07-12 18:19:19 +02:00
Dhruv Goel
d2e42d7d61 [feature/sphinx-fulltext-search] remove unnecessary code
Some extra conditions and variables used in autoconf are removed.

PHPBB3-10946
2012-07-12 17:32:09 +05:30
Dhruv Goel
569db1471b [feature/sphinx-fulltext-search] fix stopwords option
Stopwords option can be configured in ACP to generate correct sphinx
config file.

PHPBB3-10946
2012-07-12 17:32:08 +05:30
Dhruv Goel
88089194e5 [feature/sphinx-fulltext-search] prefix sphinx with constant names
All constant names are prefixed with SPHINX_

PHPBB3-10946
2012-07-12 17:32:07 +05:30
Dhruv Goel
e486f4389c [feature/sphinx-fulltext-search] remove autoconf
Remove all code related to sphinx automatic configuration and all exec
calls.

PHPBB3-10946
2012-07-12 17:32:06 +05:30
Dhruv Goel
8dcdf8a973 [feature/sphinx-fulltext-search] add docblock and access modifiers
PHPBB3-10946

Conflicts:

	phpBB/includes/search/fulltext_sphinx.php
2012-07-12 17:32:05 +05:30
Dhruv Goel
2503581cd5 [feature/sphinx-fulltext-search] add class properties indexes & sphinx
PHPBB3-10946
2012-07-12 17:32:04 +05:30
Dhruv Goel
0e9174d168 [feature/sphinx-fulltext-search] use keywords_search instead of get_name
using keyword_search method instead of get_name to distinguish between the
search backend classes present in includes/search and other helper classes.

PHPBB3-10946
2012-07-12 17:32:03 +05:30
Dhruv Goel
06eeed058d [feature/sphinx-fulltext-search] remove unused arrays
PHPBB3-10946
2012-07-12 17:32:02 +05:30
Dhruv Goel
4a11a7b970 [feature/sphinx-fulltext-search] add sphinx_table constant to constants.php
PHPBB3-10946
2012-07-12 17:32:01 +05:30
Dhruv Goel
97fda78e7d [feature/sphinx-fulltext-search] Make different files for different classes
Break the classes in functions-sphinx.php into different files
with proper class names according to phpbb class auto loader conventions.

PHPBB3-10946

Conflicts:

	phpBB/includes/search/sphinx/config.php
2012-07-12 17:32:00 +05:30
Dhruv Goel
10b706674e [feature/sphinx-fulltext-search] add binlog_path to config
binlog files are now added to the data folder.

PHPBB3-10946
2012-07-12 17:31:58 +05:30
Dhruv Goel
39f8a5fa9f [feature/sphinx-fulltext-search] use sql_build_query for query
Uses sql_build_query for JOIN query. Remove casting to int and space for
phpbb conventions to be followed

PHPBB3-10946

Conflicts:

	phpBB/includes/search/fulltext_sphinx.php
2012-07-12 17:31:57 +05:30
Dhruv Goel
bfd01f0187 [feature/sphinx-fulltext-search] remove all reference returns
PHPBB3-10946
2012-07-12 17:31:56 +05:30
Dhruv Goel
f609555b1a [feature/sphinx-fulltext-search] integrate sphinx language keys with core
Language keys removed from mods folder and added to
language/en/acp/search.php

PHPBB3-10946
2012-07-12 17:31:49 +05:30
Dhruv Goel
74a7407927 [feature/sphinx-fulltext-search] improve classes in functions-sphinx.php
PHPBB3-10946
2012-07-12 17:27:29 +05:30
Dhruv Goel
02588069f0 [feature/sphinx-fulltext-search] fix config variables
config variables now use class property for unique id

PHPBB3-10946

Conflicts:

	phpBB/includes/search/fulltext_sphinx.php
2012-07-12 17:27:28 +05:30
Dhruv Goel
455a35d836 [feature/sphinx-fulltext-search] temporary commit to pull out sphinx-api
also need to add the latest sphinx api instead of this.

PHPBB3-10946
2012-07-12 17:27:27 +05:30
Dhruv Goel
a3b2caf841 [feature/sphinx-fulltext-search] include sample sphinx.conf in docs
PHPBB3-10946
2012-07-12 17:27:26 +05:30
Dhruv Goel
8d76bc45ee [feature/sphinx-fulltext-search] minor fixes in formatting
Add a newline at the end of files. Update License information in package
docbloc.

PHPBB3-10946
2012-07-12 17:27:25 +05:30
Dhruv Goel
99d4660df6 [feature/sphinx-fulltext-search] update config file
Sphinx config file updated according to new documentation.

PHPBB3-10946
2012-07-12 17:27:24 +05:30
Dhruv Goel
fcf0d04b20 [feature/sphinx-fulltext-search] minor changes
some minor code changes to make it working against current develop
and comply with other search backend coding convetions.

PHPBB3-10946
2012-07-12 17:27:23 +05:30
Dhruv Goel
a50b0faf4a [feature/sphinx-fulltext-search] MOD by naderman installed in phpbb
PHPBB3-10946
2012-07-12 17:27:22 +05:30
Joas Schilling
c4c95fddaa [ticket/10982] Correctly check, whether data-overlay is set
PHPBB3-10982
2012-07-11 15:06:44 +02:00
Joas Schilling
4aabe0cd4d [ticket/10982] Remove overlay on first up/down move of forums in ACP
PHPBB3-10982
2012-07-11 14:54:31 +02:00
Joas Schilling
95298de5ae [ticket/10982] Allow setting dimming control overlay also as data-overlay
PHPBB3-10982
2012-07-11 14:53:50 +02:00
Joas Schilling
d883535b10 [ticket/10950] Remove deleted entries in tests instead of commenting them out
PHPBB3-10950
2012-07-11 13:05:36 +02:00
Joas Schilling
e68c1fb9e4 [ticket/10950] Use database count() and group by instead of doing that in php
PHPBB3-10950
2012-07-11 12:58:57 +02:00
Patrick Webster
dd6955f833 [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
PHPBB3-10978
2012-07-09 19:29:17 -05:00
Andreas Fischer
348d9b8829 Merge remote-tracking branch 'Fyorl/ticket/10941' into develop
* Fyorl/ticket/10941: (30 commits)
  [ticket/10941] Removed superfluous array
  [ticket/10941] File 'txt' now too big so changed tests to reflect that
  [ticket/10941] Added a comment to ensure tags stay uppercase
  [ticket/10941] Modified tearDown to use DirectoryIterator instead of glob
  [ticket/10941] Added tests/upload/fixture/copies to tracking
  [ticket/10941] Fixed form test test_too_large
  [ticket/10941] Replaced use of English with language system
  [ticket/10941] Renamed classes and filenames so that tests run
  [ticket/10941] Moved comment into markTestIncomplete parameter
  [ticket/10941] Removed manual includes of mock classes
  [ticket/10941] Added subdirectory for file operations
  [ticket/10941] Added some comments for clarification
  [ticket/10941] Fixed a failing test
  [ticket/10941] Rearranged tests into their own classes or methods
  [ticket/10941] Removed the incomplete mark as is_image is fixed
  [ticket/10941] Refactored tearDown to stop iterating over the directory.
  [ticket/10941] Refactored init_filespec to return new object.
  [ticket/10941] Minor typo fixes
  [ticket/10941] Changed assertTrue to assertEquals
  [ticket/10941] Now actually checks for the value of errors.
  ...
2012-07-09 15:10:36 +02:00
Fyorl
65d7aae2f3 [ticket/10941] Removed superfluous array
PHPBB3-10941
2012-07-09 14:08:21 +01:00
Fyorl
d046b25124 [ticket/10941] File 'txt' now too big so changed tests to reflect that
PHPBB3-10941
2012-07-09 14:08:21 +01:00
Fyorl
1b3589aae8 [ticket/10941] Added a comment to ensure tags stay uppercase
PHPBB3-10941
2012-07-09 14:08:21 +01:00
Fyorl
f470eee8ab [ticket/10941] Modified tearDown to use DirectoryIterator instead of glob
PHPBB3-10941
2012-07-09 14:08:21 +01:00
Fyorl
ae9b642b81 [ticket/10941] Added tests/upload/fixture/copies to tracking
PHPBB3-10941
2012-07-09 14:08:21 +01:00
Fyorl
c8059cf7e7 [ticket/10941] Fixed form test test_too_large
PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
8d43a6e851 [ticket/10941] Replaced use of English with language system
PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
e0b63df6a4 [ticket/10941] Renamed classes and filenames so that tests run
Also fixed some minor issues that weren't flagged before because
the tests were being ignored.

PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
6a1c686025 [ticket/10941] Moved comment into markTestIncomplete parameter
PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
9f3a02d475 [ticket/10941] Removed manual includes of mock classes
Also marked a test as incomplete even though this appears to be
ignored when actually running the tests.

PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
580cec619b [ticket/10941] Added subdirectory for file operations
Also removed common.php as it was unnecessary.

PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
d89af53f63 [ticket/10941] Added some comments for clarification
PHPBB3-10941
2012-07-09 14:08:20 +01:00