makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
26105 commits 18 branches 192 tags 207 MiB
Commit graph

26105 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
1f4976f590 Merge pull request #3696 from marc1706/ticket/13930-master 
[ticket/13930] Check for correct spacing between keyword & parenthesis

* marc1706/ticket/13930-master:
  [ticket/13930] Add missing space to mssql_extractor
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset
  [ticket/13930] Remove not needed return statements
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Check for correct spacing between keyword & parenthesis
 2015-06-09 21:27:23 +02:00
Joas Schilling
00c15c76c3 Merge branch '3.1.x' 2015-06-09 20:23:29 +02:00
Joas Schilling
832c9f64e0 Merge pull request #3551 from rxu/ticket/13779 
[ticket/13779] Set new auth options to the role only if matching the role type
 2015-06-09 20:23:08 +02:00
Marc Alexander
47ef99f6ef Merge branch '3.1.x' 2015-06-09 17:22:02 +02:00
Marc Alexander
405681f138 Merge pull request #3486 from brunoais/ticket/13693 
[ticket/13693] Allow modifying the MySQL author search query
 2015-06-09 17:21:54 +02:00
Marc Alexander
6d3c4d3879 Merge branch '3.1.x' 2015-06-09 17:19:49 +02:00
Marc Alexander
b7db12a593 Merge pull request #3485 from brunoais/ticket/13694 
[ticket/13694] Allow modifying the Postgres native author search query for results
 2015-06-09 17:19:42 +02:00
Marc Alexander
39c273e346 Merge branch '3.1.x' 2015-06-09 17:18:12 +02:00
Marc Alexander
4143f65b46 Merge pull request #3484 from brunoais/ticket/13691 
[ticket/13691] Allow modifying the fulltext native search query for total results for author
 2015-06-09 17:18:04 +02:00
Marc Alexander
35f3c5c4b0 Merge branch '3.1.x' 2015-06-09 17:14:58 +02:00
Marc Alexander
5f7fa4c89c Merge pull request #3483 from brunoais/ticket/13686 
[ticket/13686] Allow modify query used for counting in fulltext_native
 2015-06-09 17:14:23 +02:00
Marc Alexander
a21650e689 Merge branch '3.1.x' 2015-06-09 17:11:20 +02:00
Marc Alexander
83d8ea013b Merge pull request #3481 from brunoais/ticket/13689 
[ticket/13689] Allow modifying the query for postgres native fulltext search

Conflicts:
	phpBB/develop/search_fill.php
	phpBB/includes/acp/acp_main.php
	phpBB/includes/acp/acp_search.php
	phpBB/includes/functions_admin.php
	phpBB/includes/functions_posting.php
	phpBB/includes/mcp/mcp_main.php
	phpBB/includes/mcp/mcp_post.php
	phpBB/install/install_convert.php
	phpBB/install/install_install.php
	phpBB/phpbb/search/fulltext_mysql.php
	phpBB/phpbb/search/fulltext_native.php
	phpBB/phpbb/search/fulltext_postgres.php
	phpBB/phpbb/search/fulltext_sphinx.php
	phpBB/search.php
	tests/search/mysql_test.php
	tests/search/native_test.php
	tests/search/postgres_test.php
 2015-06-09 17:10:44 +02:00
Marc Alexander
b2ada8ba09 Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/mcp/mcp_main.php
 2015-06-09 15:24:08 +02:00
Marc Alexander
072f4c9260 Merge pull request #3479 from brunoais/ticket/13685 
[ticket/13685] Allow modifying the query for mysql native fulltext search
 2015-06-09 14:27:13 +02:00
brunoais
3ac95f48f8 [ticket/13685] phpBB, not PhpBB 
PHPBB3-13685
 2015-06-09 12:55:27 +01:00
brunoais
6e8da5a424 [ticket/13685] This should take care of the rest 
PHPBB3-13685
 2015-06-08 18:09:48 +01:00
Marc Alexander
d3e55a8290 Merge branch '3.1.x' 
Conflicts:
	phpBB/posting.php
 2015-06-08 17:59:49 +02:00
Marc Alexander
1214210864 Merge branch '3.0.x' into 3.1.x 2015-06-08 17:58:09 +02:00
Marc Alexander
abce057467 Merge pull request #3663 from Elsensee/ticket/13833 
[ticket/13833] Prevent flooding if type="submit" doesn't exist
 2015-06-08 17:58:08 +02:00
Marc Alexander
88d16b47a4 Merge pull request #3697 from Elsensee/ticket/13833-30x 
[ticket/13833] Prevent flooding if type=submit doesn't exist
 2015-06-08 17:52:31 +02:00
Oliver Schramm
c2d254ea41 Merge branch 'ticket/13833-30x' into ticket/13833 
Conflicts:
        phpBB/posting.php

PHPBB3-13833
 2015-06-08 17:19:11 +02:00
Oliver Schramm
2c6369c5d9 [ticket/13833] Prevent flooding if type=submit doesn't exist 
PHPBB3-13833
 2015-06-08 17:01:52 +02:00
Marc Alexander
1fae4152ef [ticket/13930] Add missing space to mssql_extractor 
PHPBB3-13930
 2015-06-08 15:55:03 +02:00
Marc Alexander
2e31cae7bf Merge branch 'ticket/13930' into ticket/13930-master 
Conflicts:
	phpBB/includes/acp/acp_database.php
 2015-06-08 15:39:47 +02:00
Andreas Fischer
04c9520c73 Merge pull request #3690 from s9e/ticket/13902 
[ticket/13902] Increased CSS margin around quotes

* s9e/ticket/13902:
  [ticket/13902] Increased CSS margin around quotes
 2015-06-08 15:13:42 +02:00
Marc Alexander
f9389995e7 [ticket/13930] Add missing spaces to code 
PHPBB3-13930
 2015-06-08 13:54:50 +02:00
Marc Alexander
d4e0c08915 [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset 
PHPBB3-13930
 2015-06-08 13:40:33 +02:00
Marc Alexander
d70ad1230b [ticket/13930] Remove not needed return statements 
PHPBB3-13930
 2015-06-08 10:07:12 +02:00
Andreas Fischer
03bfcba582 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13888] Fix sql_freeresult() error on author searches
 2015-06-08 01:59:09 +02:00
Andreas Fischer
f94bbcb4fe Merge pull request #3691 from CHItA/ticket/13888 
[ticket/13888] Fix sql_freeresult() error on author searches

* CHItA/ticket/13888:
  [ticket/13888] Fix sql_freeresult() error on author searches
 2015-06-08 01:59:08 +02:00
Marc Alexander
9203bf3141 [ticket/13930] Add missing spaces to code 
PHPBB3-13930
 2015-06-07 22:53:41 +02:00
Marc Alexander
6687b7e9ab [ticket/13930] Check for correct spacing between keyword & parenthesis 
The codesniffer should check for a correct spacing between keywords like
if or foreach and its opening parenthesis.

PHPBB3-13930
 2015-06-07 22:51:33 +02:00
brunoais
823783773c [ticket/13685] BUMP version to 3.1.5-dev 
PHPBB3-13685
 2015-06-07 18:40:50 +01:00
brunoais
94aff53e3f [ticket/13685] Allow modifying the query for mysql native fulltext search 
PHPBB3-13685
 2015-06-07 18:40:49 +01:00
brunoais
3cb86cb6f1 [ticket/13685] Fix tests for fulltext search 
PHPBB3-13685
 2015-06-07 18:40:49 +01:00
brunoais
1e45a05000 [ticket/13685] Add phpbb_dispatcher to fulltext search constructors 
PHPBB3-13685
 2015-06-07 18:40:44 +01:00
Tristan Darricau
9777abaed4 Merge branch '3.1.x' 2015-06-07 18:02:47 +02:00
Tristan Darricau
25c4c481d7 Merge pull request #3693 from nickvergessen/ticket/13823 
[ticket/13823] Remove the unnecessary brackets
 2015-06-07 18:02:31 +02:00
Joas Schilling
17b94b8f9c [ticket/13823] Remove the unnecessary brackets 
This changes the line with non-whitespace changes, so the packaging script
should correctly detect them as changed and put the file into the update.

PHPBB3-13823
 2015-06-07 17:54:38 +02:00
CHItA
29cda5f2ad [ticket/13888] Fix sql_freeresult() error on author searches 
PHPBB3-13888
 2015-06-07 17:41:17 +02:00
Joas Schilling
6817418b06 Merge branch '3.1.x' 2015-06-07 17:11:10 +02:00
Joas Schilling
91212d5453 Merge pull request #3692 from CHItA/ticket/sec-184 
[ticket/sec-184] Fix tests
 2015-06-07 17:10:49 +02:00
CHItA
32a2546c5d [ticket/sec-184] Fix tests 
SECURITY-184
 2015-06-07 16:43:27 +02:00
Marc Alexander
77bc8ee68b Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/acp/acp_board.php
	phpBB/includes/acp/acp_jabber.php
 2015-06-07 14:59:33 +02:00
Marc Alexander
bac02a348e Merge pull request #22 from phpbb/ticket/sec-184 
[ticket/sec-184] Do not output passwords to HTML
 2015-06-07 14:57:06 +02:00
JoshyPHP
3c0cbda289 [ticket/13902] Increased CSS margin around quotes 
PHPBB3-13902
 2015-06-07 06:57:59 +02:00
Tristan Darricau
1f772234f7 Merge branch '3.1.x' 2015-06-06 18:12:54 +02:00
Tristan Darricau
99d3995548 Merge pull request #23 from phpbb/ticket/13913 
[ticket/13913] Correctly check the forum_password and read permissions
 2015-06-06 18:12:36 +02:00
Tristan Darricau
e60b7f6cf2 Merge branch '3.1.x' 2015-06-06 12:02:15 +02:00