1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 04:36:32 +02:00
Commit Graph

318 Commits

Author SHA1 Message Date
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
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
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
3e64c1b5d7 [ticket/11010] Fixes for number input in acp
PHPBB3-11010
2013-05-20 18:42:11 +02:00
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
c50af28077 [ticket/11438] Add spaces after # comment start and before \ line breaks
PHPBB3-11438
2013-03-16 01:18:15 +01:00
2b2bbf787c [ticket/11438] Add helpful comments from sample config to ACP output
PHPBB3-11438
2013-03-15 08:23:39 +01:00
1ee4702ec5 [ticket/11179] remove extra & in function call
PHPBB3-11179
2013-02-19 00:52:56 +05:30
38bb7dca31 [ticket/11179] correct start parameter in sphinx search
PHPBB3-11179
2013-02-19 00:52:55 +05:30
2ff874fe93 [ticket/11179] correct start parameter in native author search
PHPBB3-11179
2013-02-19 00:52:54 +05:30
a0ae223ef4 [ticket/11179] correct start parameter in native keyword search
PHPBB3-11179
2013-02-19 00:52:53 +05:30
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
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
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
bc77ca4d4e [ticket/11179] pass start param by reference in postgres
PHPBB3-11179
2013-02-19 00:52:49 +05:30
ef88edbcf6 [ticket/11179] correct start param in author search of postgres
PHPBB3-11179
2013-02-19 00:52:48 +05:30
2cb48f0341 [ticket/11179] correct start parameter in psql keyword search
PHPBB3-11179
2013-02-19 00:52:47 +05:30
80f8e3abce [ticket/11179] pass start param by reference in author search
PHPBB3-11179
2013-02-19 00:52:46 +05:30
2601411a9c [ticket/11179] correct start parameter for author search
PHPBB3-11179
2013-02-19 00:52:45 +05:30
1c9c666ef1 [ticket/11179] use FOUND_ROWS query to re-search with changed start param
PHPBB3-11179
2013-02-19 00:52:44 +05:30
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
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
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
38360c71f2 [ticket/11359] html escape sphinx config data
PHPBB3-11359
2013-02-18 14:13:31 +05:30
3c6256b3e7 [ticket/11359] add id attribute to textarea
PHPBB3-11359
2013-02-18 14:05:25 +05:30
5b99f0c113 [ticket/11359] close span
PHPBB3-11359
2013-02-18 14:01:46 +05:30
3d27ed13f5 [ticket/11188] Reduce waste.
PHPBB3-11188
2012-12-30 18:50:09 -05:00
763f2929ba [ticket/11188] add result count query for author search
PHPBB3-11188
2012-12-30 18:50:09 -05:00
979edc4113 [ticket/11188] add count query to postgres search
PHPBB3-11188
2012-12-30 18:50:05 -05:00
0666499468 [ticket/11273] Add space before MiB to Sphinx "Indexer memory limit" input box.
PHPBB3-11273
2012-12-15 23:54:49 +01:00
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
3687febdac [ticket/11015] Change more docblocks.
PHPBB3-11015
2012-12-04 04:29:31 -05:00
c725b02df8 [ticket/11174] include utf_tools in postgres search backend
PHPBB3-11174
2012-11-27 08:49:06 -05:00
6e8f142d39 [ticket/11174] removes unnecessary space from word
PHPBB3-11174
2012-11-27 08:48:15 -05:00
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
f5b3adb296 [ticket/10780] Use L_COLON on search backend ACP pages.
PHPBB3-10780
2012-11-10 00:38:25 +01:00
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
a509a8ed2d [ticket/11050] make all properties protected in all search backends
PHPBB-11050
2012-11-09 16:46:44 +01:00
c5c9bc5ada [ticket/11050] get_common_words() returns empty array for sphinx
PHPBB-11050
2012-11-09 16:46:37 +01:00
72245e41d0 [ticket/11050] fix tidied search query docblock language
PHPBB3-11050
2012-11-09 15:54:41 +01:00
0556959a6a [ticket/11050] fix min/max length docblock language
PHPBB3-11050
2012-11-09 15:54:40 +01:00
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
5a2cbc2417 [ticket/11050] fix separated spelling in docblock
PHPBB3-11050
2012-11-09 15:54:38 +01:00
6ae64f1c1e [ticket/11050] fix split words doc block language
PHPBB3-11050
2012-11-09 15:54:38 +01:00
b7dae379d5 [ticket/11050] remove class word from docblocks
PHPBB3-11050
2012-11-09 15:54:37 +01:00
1ded6d94ac [ticket/11050] add missing @var in native search
PHPBB3-11050
2012-11-09 15:54:36 +01:00
8eed3591a9 [ticket/11050] replace user by phpbb_user
PHPBB3-11050
2012-11-09 15:54:35 +01:00
56395ea359 [ticket/11050] fix minor comment/docblocks issues
No comments should end with a period. All occurences like PostgreSQL
should have proper case.

PHPBB3-11050
2012-11-09 15:54:34 +01:00
5a7ed3c567 [ticket/11050] add access specifiers to native search properties
PHPBB3-11050
2012-11-09 15:54:33 +01:00
3dc42c67d3 [ticket/11050] fix docblocks with description before @var
PHPBB3-11050
2012-11-09 15:54:32 +01:00