Commit graph

329 commits

Author SHA1 Message Date
Joas Schilling
bdb7ec0ceb Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission
* phpbb/develop: (704 commits)
  [ticket/11630] Improvements to the PHP lint pre-commit hook
  [feature/auth-refactor] Move auth providers to separate directory
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/11585] Make $auth_admin class property
  [feature/auth-refactor] A possible fix for the functional test failures
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  ...

Conflicts:
	phpBB/docs/sphinx.sample.conf
	phpBB/feed.php
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
2013-07-11 11:41:48 +02:00
Dhruv
ffed3d109e [ticket/11437] avoid $start becoming negative when no search results are found
When search returns no results there is no need to go inside the if
statement. Since $result_count becomes zero, $start becomes negative
which leads to failed assertion.

PHPBB3-11437
2013-06-19 02:14:04 +05:30
Dhruv
3931f7f3b9 Merge branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv (1)
* develop-olympus:
  [ticket/11583] Use a new lang key instead of giving the old one a new meaning.
  [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.

Conflicts:
	phpBB/includes/search/fulltext_mysql.php
	phpBB/language/en/acp/search.php
2013-06-05 01:55:49 +05:30
Andreas Fischer
d925c8d0da [ticket/11583] Use a new lang key instead of giving the old one a new meaning.
PHPBB3-11583
2013-06-03 15:16:57 +02:00
Andreas Fischer
d0e45e17dd [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
PHPBB3-11583
2013-06-01 04:09:33 +02:00
Vjacheslav Trushkin
3e64c1b5d7 [ticket/11010] Fixes for number input in acp
PHPBB3-11010
2013-05-20 18:42:11 +02:00
Dhruv
bfdc6e1930 [ticket/11288] fix regex in postgres
Postgres search backend now uses updated regex being used by
mysql search backend.

PHPBB3-11288
2013-05-04 20:11:12 +05:30
Joas Schilling
c50af28077 [ticket/11438] Add spaces after # comment start and before \ line breaks
PHPBB3-11438
2013-03-16 01:18:15 +01:00
Joas Schilling
2b2bbf787c [ticket/11438] Add helpful comments from sample config to ACP output
PHPBB3-11438
2013-03-15 08:23:39 +01:00
Joas Schilling
d41cf293e1 [ticket/9657] Check for post visibility when searching with Sphinx
This update will require admins to manually update their Sphinx config
file aswell as to delete the index and rebuild it from scratch. Before
this is done the search will not be usable anymore.

PHPBB3-9657
2013-03-14 12:10:07 +01:00
Joas Schilling
6c6912f9e6 [ticket/9657] FIx merge conflict from merging develop
PHPBB3-9657
2013-03-05 18:23:13 +01:00
Joas Schilling
42c062cedf Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3: (480 commits)
  [ticket/6723] Show info that message has been deleted before delivery
  [ticket/11385] Fix issue with migration module tool not getting extension module info
  [ticket/11386] Fix failing tests from constructor changes
  [ticket/11386] Fix circular reference error & serialize error
  [ticket/11386] Remove tests that check if finder cache is working
  [ticket/11386] Forgot to get the migration classes
  [ticket/11386] Update tests with new constructors for ext.manager/migrator
  [ticket/11386] Use finder to find migration files
  [ticket/11363] Fix to make get_module_infos get from all extensions
  [ticket/11381] Make finder able to search in all available extensions
  [ticket/11103] Revert whitespace changes
  [ticket/11103] Few more minor language things
  [ticket/11103] Don't call generate_board_url many times
  [ticket/11103] Case time in queries as an int
  [ticket/11103] Fix effectively installed check
  [ticket/11103] Remove padding from notifications for now.
  [ticket/11363] Fix a couple bugs and throw errors if the file not found
  [ticket/11372] Migrator should only check if effectively installed if not
  [ticket/11363] Load module info files for extensions too
  [ticket/11103] Notifications Migration file
  ...

Conflicts:
	phpBB/includes/functions_posting.php
	phpBB/includes/mcp/mcp_queue.php
	phpBB/includes/search/fulltext_mysql.php
	phpBB/includes/search/fulltext_native.php
	phpBB/includes/search/fulltext_postgres.php
	phpBB/includes/search/fulltext_sphinx.php
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ajax.js
2013-03-03 20:06:52 +01:00
Dhruv
1ee4702ec5 [ticket/11179] remove extra & in function call
PHPBB3-11179
2013-02-19 00:52:56 +05:30
Dhruv
38bb7dca31 [ticket/11179] correct start parameter in sphinx search
PHPBB3-11179
2013-02-19 00:52:55 +05:30
Dhruv
2ff874fe93 [ticket/11179] correct start parameter in native author search
PHPBB3-11179
2013-02-19 00:52:54 +05:30
Dhruv
a0ae223ef4 [ticket/11179] correct start parameter in native keyword search
PHPBB3-11179
2013-02-19 00:52:53 +05:30
Dhruv
8b7f306897 [ticket/11179] fix success query path for postgres
Additional query to check start parameter executed only incase of no
results.

PHPBB3-11179
2013-02-19 00:52:52 +05:30
Dhruv
f0d63594e6 [ticket/11179] fix success query path for mysql
Additional query to check start parameter executed only incase of no
results.

PHPBB3-11179
2013-02-19 00:52:51 +05:30
Dhruv
16bbdf4a52 [ticket/11179] minor fixes
Amends comments to start with capitals. Reinsert blank lines which were
not supposed to be removed

PHPBB3-11179
2013-02-19 00:52:50 +05:30
Dhruv
bc77ca4d4e [ticket/11179] pass start param by reference in postgres
PHPBB3-11179
2013-02-19 00:52:49 +05:30
Dhruv
ef88edbcf6 [ticket/11179] correct start param in author search of postgres
PHPBB3-11179
2013-02-19 00:52:48 +05:30
Dhruv
2cb48f0341 [ticket/11179] correct start parameter in psql keyword search
PHPBB3-11179
2013-02-19 00:52:47 +05:30
Dhruv
80f8e3abce [ticket/11179] pass start param by reference in author search
PHPBB3-11179
2013-02-19 00:52:46 +05:30
Dhruv
2601411a9c [ticket/11179] correct start parameter for author search
PHPBB3-11179
2013-02-19 00:52:45 +05:30
Dhruv
1c9c666ef1 [ticket/11179] use FOUND_ROWS query to re-search with changed start param
PHPBB3-11179
2013-02-19 00:52:44 +05:30
Dhruv
3e5ef8ab2c [ticket/11179] pass start parameter by reference
start parameter is passed by reference so that in case it is not in bounds
the changes made to it are reflected back to the phpBB/search.php file

PHPBB3-11179
2013-02-19 00:52:43 +05:30
Dhruv
00d34617cc [ticket/11179] correct the start parameter while retrieving from cache
Start parameter if not between 0 and the total result count of the cached
search results is changed accordingly

PHPBB3-11179
2013-02-19 00:52:42 +05:30
Dhruv
737b99966d [ticket/11179] add search query in case initial one fails
changes the start parameter according to the total search results and
executes the search query again to get the results.

PHPBB3-11179
2013-02-19 00:52:41 +05:30
Dhruv
38360c71f2 [ticket/11359] html escape sphinx config data
PHPBB3-11359
2013-02-18 14:13:31 +05:30
Dhruv
3c6256b3e7 [ticket/11359] add id attribute to textarea
PHPBB3-11359
2013-02-18 14:05:25 +05:30
Dhruv
5b99f0c113 [ticket/11359] close span
PHPBB3-11359
2013-02-18 14:01:46 +05:30
Oleg Pudeyev
3d27ed13f5 [ticket/11188] Reduce waste.
PHPBB3-11188
2012-12-30 18:50:09 -05:00
Dhruv
763f2929ba [ticket/11188] add result count query for author search
PHPBB3-11188
2012-12-30 18:50:09 -05:00
Dhruv
979edc4113 [ticket/11188] add count query to postgres search
PHPBB3-11188
2012-12-30 18:50:05 -05:00
Joas Schilling
e34b8ed094 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase
* 'develop' of https://github.com/phpbb/phpbb3: (544 commits)
  [feature/events] Fix improperly named event in documentation
  [feature/events] Fix alphabetization of events
  [feature/events] Put events in alphabetical order
  [feature/events] Make EVENTS.md lowercase
  [ticket/11285] Use more granularity in dependency checks in compress test
  [ticket/10880] The m_approve permisson no longer implies f_noapprove.
  [ticket/10803] Show failure message until user dismisses it
  [ticket/10954] Add missing semi-colon
  [ticket/10954] Make sure to mark subforums unread and add small fixes
  [feature/events] Use ` to escape HTML tags in markdown
  [feature/events] Remove HTML tags from markdown so they don't get parsed
  [ticket/10954] Miscellaneous coding fixes
  [feature/events] Remove extraneous space
  [feature/events] Add markdown template event documentation file
  [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)
  [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)
  [feature/events] Fix typo in event name
  [ticket/10763] Use self when calling get_extension() in filespec class
  [feature/events] Fix more subsilver2 events
  [feature/events] Fix some subsilver2 events
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/posting.php
2012-12-20 22:51:38 +01:00
Andreas Fischer
0666499468 [ticket/11273] Add space before MiB to Sphinx "Indexer memory limit" input box.
PHPBB3-11273
2012-12-15 23:54:49 +01:00
Oleg Pudeyev
26fd70d9cd Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (196 commits)
  [ticket/11219] Coding guidelines and naming consistency changes
  [ticket/10841] Revert more whitespace changes.
  [ticket/10841] Revert whitespace changes.
  [ticket/10841] adding space after if
  [ticket/10841] removing unnecessary spacing
  [ticket/10841] changing affectedrows check to COUNT in sql
  [ticket/10841] Modifying style and language selectors in UCP
  [ticket/11247] Fix wrong property reference in flock class.
  [ticket/10602] Avoid a race condition.
  [ticket/10602] Use last_queue_run for its intended purpose.
  [ticket/10716] Collect standard error from executed php process.
  [ticket/10716] Skip test if php is not in PATH.
  [ticket/10716] Exclude our dependencies from linting.
  [ticket/10103] New and improved wording.
  [ticket/10716] Only lint on php 5.3+.
  [ticket/10103] Assert with messages.
  [ticket/10103] assertLessThan/assertGreaterThan.
  [ticket/10103] Inline assignment is bad?
  [ticket/10103] $rv had too few characters.
  [ticket/10103] Correct flock class documentation.
  ...

Conflicts:
	phpBB/includes/functions.php
	tests/cache/cache_test.php
2012-12-06 21:49:24 -05:00
Oleg Pudeyev
3687febdac [ticket/11015] Change more docblocks.
PHPBB3-11015
2012-12-04 04:29:31 -05:00
Dhruv
c725b02df8 [ticket/11174] include utf_tools in postgres search backend
PHPBB3-11174
2012-11-27 08:49:06 -05:00
Dhruv
6e8f142d39 [ticket/11174] removes unnecessary space from word
PHPBB3-11174
2012-11-27 08:48:15 -05:00
Dhruv
764da97772 [ticket/11174] include utf_tools in mysql backend
when running tests include utf_tools file in the mysql search backend

PHPBB3-11174
2012-11-27 08:48:06 -05:00
Joas Schilling
948bfcbe77 Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop
# By Oleg Pudeyev (45) and others
# Via Oleg Pudeyev (42) and others
* remotes/phpbb/develop: (289 commits)
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10780] Use L_COLON on LDAP page.
  [ticket/10780] Use L_COLON on search backend ACP pages.
  [ticket/10780] Use L_COLON for "download all attachments".
  [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
  [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
  [ticket/10780] Replace colon usage in adm template output with {L_COLON}
  [ticket/10780] Replace colon usage in template output with {L_COLON}
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
  [ticket/10172] Show prosilver birthday list even if there are no birthdays.
  [ticket/11050] make all properties protected in all search backends
  [ticket/11050] get_common_words() returns empty array for sphinx
  [ticket/11050] fix tidied search query docblock language
  [ticket/11050] fix min/max length docblock language
  [ticket/11050] multi sentences separated by period in docblocks
  [ticket/11050] fix separated spelling in docblock
  [ticket/11050] fix split words doc block language
  [ticket/11050] remove class word from docblocks
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/language/en/acp/permissions_phpbb.php
	phpBB/styles/prosilver/template/posting_editor.html
2012-11-10 12:27:19 +01:00
Andreas Fischer
f5b3adb296 [ticket/10780] Use L_COLON on search backend ACP pages.
PHPBB3-10780
2012-11-10 00:38:25 +01:00
Oleg Pudeyev
36da105a33 Merge PR #1043 branch 'dhruvgoel92/ticket/11177' into develop
* dhruvgoel92/ticket/11177:
  [ticket/11177] return no results when query has only negation
2012-11-09 14:23:25 -05:00
Dhruv
a509a8ed2d [ticket/11050] make all properties protected in all search backends
PHPBB-11050
2012-11-09 16:46:44 +01:00
Dhruv
c5c9bc5ada [ticket/11050] get_common_words() returns empty array for sphinx
PHPBB-11050
2012-11-09 16:46:37 +01:00
Dhruv
72245e41d0 [ticket/11050] fix tidied search query docblock language
PHPBB3-11050
2012-11-09 15:54:41 +01:00
Dhruv
0556959a6a [ticket/11050] fix min/max length docblock language
PHPBB3-11050
2012-11-09 15:54:40 +01:00
Dhruv
7c3cbc07cf [ticket/11050] multi sentences separated by period in docblocks
Starting of each sentence should be capitalized.

PHPBB3-11050
2012-11-09 15:54:39 +01:00
Dhruv
5a2cbc2417 [ticket/11050] fix separated spelling in docblock
PHPBB3-11050
2012-11-09 15:54:38 +01:00