mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-01 03:54:56 +02:00
Code Issues Releases Wiki Activity
26,122 Commits 18 Branches 192 Tags
Commit Graph

26122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
a3883a6f23 Merge branch '3.1.x' 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2015-06-11 21:00:04 +02:00
Joas Schilling
4276962e78 [3.1.x] Increase dev version to 3.1.6-dev 2015-06-11 20:57:26 +02:00
Joas Schilling
69eb563e18 Merge branch 'prep-release-3.1.5' into 3.1.x 2015-06-11 20:57:00 +02:00
Joas Schilling
2c65b9b133 Merge pull request #3699 from nickvergessen/ticket/13823 
[ticket/13823] Move the part of the query, so the update will get it …
release-3.1.5-RC1 		2015-06-10 22:26:16 +02:00
Joas Schilling
dfb7bb1de1 Merge branch '3.0.x' into prep-release-3.1.5 2015-06-10 22:23:34 +02:00
Joas Schilling
0d349a82ca Merge pull request #3700 from Nicofuma/ticket/13823 
[ticket/13823] Change diff options while packaging to not ignore all whitespaces
 2015-06-10 22:22:52 +02:00
Tristan Darricau
cdf580ee37 [ticket/13823] Change diff options while packaging to not ignore all whitespaces 
Removed:
    -w, --ignore-all-space       Ignore white space when comparing lines.

Added:
    -Z, --ignore-trailing-space  Ignore white space at line end.
    -b, --ignore-space-change    Ignore changes in the amount of white space.

PHPBB3-13823
 2015-06-10 14:15:10 +02:00
Joas Schilling
3d18d6dc77 [ticket/13823] Move the part of the query, so the update will get it correctly 
PHPBB3-13823
 2015-06-09 23:11:26 +02:00
Andreas Fischer
9713f52fc6 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13923] CS
  [ticket/13923] Update startup.php
 2015-06-09 21:27:56 +02:00
Andreas Fischer
d8343f2108 Merge pull request #3685 from Nicofuma/ticket/13923 
[ticket/13923] Update startup.php

* Nicofuma/ticket/13923:
  [ticket/13923] CS
  [ticket/13923] Update startup.php
 2015-06-09 21:27:49 +02:00
Andreas Fischer
37c197404e Merge branch '3.1.x' 
* 3.1.x:
 2015-06-09 21:27:26 +02:00
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
Andreas Fischer
c952622fa0 Merge pull request #3694 from marc1706/ticket/13930 
[ticket/13930] Check for correct spacing between keyword & parenthesis

* marc1706/ticket/13930:
  [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:07 +02:00
Tristan Darricau
b5573bb92d [ticket/13923] CS 
PHPBB3-13923
 2015-06-09 21:22:52 +02:00
Joas Schilling
790f7ded5b [prep-release-3.1.5] Add changelog for 3.1.5-RC1 2015-06-09 20:45:37 +02:00
Joas Schilling
23a45fcace [prep-release-3.1.5] Add migration for 3.1.5-RC1 2015-06-09 20:32:15 +02:00
Joas Schilling
d2a2c183ed [prep-release-3.1.5] Update version to 3.1.5-RC1 2015-06-09 20:30:40 +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