Andreas Fischer
d7741cea60
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12933] Add test cases for * wildcard searches
[ticket/12933] Handle case when * is last character of word
2015-01-29 00:02:42 +01:00
Andreas Fischer
f0f88c287c
Merge pull request #3338 from dhruvgoel92/ticket/12933
...
[ticket/12933] Handle *wildcard character in native search
* dhruvgoel92/ticket/12933:
[ticket/12933] Add test cases for * wildcard searches
[ticket/12933] Handle case when * is last character of word
2015-01-29 00:02:41 +01:00
Andreas Fischer
91ff42d501
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13414] Set Content-Length header only if status is not 304
2015-01-28 19:57:29 +01:00
Andreas Fischer
e3e427fa24
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[ticket/13414] Set Content-Length header only if status is not 304
Conflicts:
phpBB/download/file.php
2015-01-28 19:56:47 +01:00
Andreas Fischer
9d72463824
Merge pull request #3343 from marc1706/ticket/13414
...
[ticket/13414] Set Content-Length header only if status is not 304
* marc1706/ticket/13414:
[ticket/13414] Set Content-Length header only if status is not 304
2015-01-28 19:48:42 +01:00
Dhruv
35edd7a043
[ticket/12933] Add test cases for * wildcard searches
...
PHPBB3-12933
2015-01-28 21:46:38 +05:30
Dhruv
252018b813
Merge branch 'ticket/12933-olympus' into ticket/12933
2015-01-28 21:41:24 +05:30
Dhruv
be90e97452
[ticket/12933] Handle case when * is last character of word
...
PHPBB3-12933
2015-01-28 21:37:03 +05:30
Marc Alexander
a9fa20bb91
[ticket/13414] Set Content-Length header only if status is not 304
...
PHPBB3-13414
2015-01-28 15:50:48 +01:00
Tristan Darricau
0bdb4c1ed6
Merge pull request #3263 from MGaetan89/ticket/13468
...
[ticket/13468] Change add_log() calls with $phpbb_log->add()
* MGaetan89/ticket/13468:
[ticket/13468] Update calls to `add_log()`
2015-01-28 09:27:16 +01:00
Gaëtan Muller
7fc586080b
[ticket/13468] Update calls to add_log()
...
PHPBB3-13468
2015-01-27 18:34:33 +01:00
Nils Adermann
828aa34ff9
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[prep-release-3.0.13] Bump version numbers for 3.0.13 release
[prep-release-3.0.13] Highlight security relevant changes
2015-01-26 19:01:47 +01:00
Nils Adermann
1c6ebcf02b
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[prep-release-3.0.13] Bump version numbers for 3.0.13 release
[prep-release-3.0.13] Highlight security relevant changes
Conflicts:
build/build.xml
phpBB/install/database_update.php
2015-01-26 19:01:34 +01:00
Nils Adermann
ebd5aace3f
Merge branch 'prep-release-3.0.13' into develop-olympus
...
* prep-release-3.0.13:
[prep-release-3.0.13] Bump version numbers for 3.0.13 release
[prep-release-3.0.13] Highlight security relevant changes
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
2015-01-26 18:57:06 +01:00
Nils Adermann
5ce89ae82f
[prep-release-3.0.13] Bump version numbers for 3.0.13 release
2015-01-26 18:08:31 +01:00
Nils Adermann
4b42589cfa
[prep-release-3.0.13] Highlight security relevant changes
2015-01-26 17:53:43 +01:00
Andreas Fischer
7081b3e382
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12089] Add assert message on HTTP status code check
2015-01-26 02:47:39 +01:00
Andreas Fischer
ffbe8cdc96
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[ticket/12089] Add assert message on HTTP status code check
2015-01-26 02:47:38 +01:00
Andreas Fischer
4c11ea97d5
Merge pull request #3339 from nickvergessen/ticket/12089
...
[ticket/12089] Add assert message on HTTP status code check
* nickvergessen/ticket/12089:
[ticket/12089] Add assert message on HTTP status code check
2015-01-26 02:47:36 +01:00
Joas Schilling
ed2d080551
[ticket/12089] Add assert message on HTTP status code check
...
PHPBB3-12089
2015-01-25 23:06:56 +01:00
Marc Alexander
2e32fbd090
Merge branch 'develop-ascraeus' into develop
2015-01-24 21:53:20 +01:00
Marc Alexander
a2fbde44c0
Merge pull request #3336 from nickvergessen/ticket/13543
...
Ticket/13543
2015-01-24 21:52:56 +01:00
Joas Schilling
b2674cf1f6
[ticket/13543] Fix broken slow test
...
PHPBB3-13543
2015-01-24 21:10:53 +01:00
Joas Schilling
c423038587
[ticket/13543] Add slow tests to travis matrix
...
PHPBB3-13543
2015-01-24 21:10:35 +01:00
Marc Alexander
e2786c37dc
Merge pull request #3179 from Nicofuma/ticket/13372
...
[ticket/13372] Fix Url Generator/Matcher generation
2015-01-24 10:05:34 +01:00
Joas Schilling
fc91616fad
Merge branch 'develop-ascraeus' into develop
2015-01-23 17:32:57 +01:00
Joas Schilling
9cdbb69f9e
Merge pull request #3321 from marc1706/ticket/13282
...
[ticket/13282] Use 0 as default for integer type columns in postgresql
2015-01-23 17:32:28 +01:00
Marc Alexander
eb4594d8ee
[ticket/13282] Add unit test for adding integer column with default null
...
PHPBB3-13282
2015-01-22 23:17:59 +01:00
Marc Alexander
bcf13551be
Merge pull request #3275 from nickvergessen/ticket/13487
...
[ticket/13487] Add factory for db tool class
2015-01-22 18:16:30 +01:00
Nils Adermann
f9f43141a9
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13361] Rename exception to runtime_exception
[ticket/13361] Fix the JsonResponse in the exception listener
[ticket/13361] Add tests
[ticket/13361] Support ajax request (send a json response)
[ticket/13361] Improve the exception listener
2015-01-22 16:17:26 +01:00
Nils Adermann
40ab75478e
Merge pull request #3173 from Nicofuma/ticket/13361
...
[ticket/13361] Improve the exception listener
2015-01-22 16:16:21 +01:00
Marc Alexander
47f04d7620
[ticket/13282] Add functional tests for adding profilefields
...
PHPBB3-13282
2015-01-22 10:30:24 +01:00
Marc Alexander
816465bfe9
[ticket/13282] Use strpos() instead of preg_match()
...
PHPBB3-13282
2015-01-22 10:11:08 +01:00
Marc Alexander
1367fc234f
[ticket/13282] Use 0 as default for integer type columns in postgresql
...
PHPBB3-13282
2015-01-22 00:06:48 +01:00
Andreas Fischer
3bbddbb963
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13534] Set imagick path to empty string to prevent failing path check
2015-01-21 16:59:26 +01:00
Andreas Fischer
a737eeb6ce
Merge pull request #3320 from marc1706/ticket/13534
...
[ticket/13534] Set imagick path to empty string to prevent failing path ...
* marc1706/ticket/13534:
[ticket/13534] Set imagick path to empty string to prevent failing path check
2015-01-21 16:59:26 +01:00
Andreas Fischer
768d0a0641
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[develop-olympus] Increment version number to 3.0.14-dev.
[develop-olympus] Add changelog for 3.0.13 release.
[develop-olympus] Bump version numbers for 3.0.13-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.13 releases.
2015-01-21 16:07:22 +01:00
Andreas Fischer
7ed065a630
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[develop-olympus] Increment version number to 3.0.14-dev.
[develop-olympus] Add changelog for 3.0.13 release.
[develop-olympus] Bump version numbers for 3.0.13-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.13 releases.
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/docs/INSTALL.html
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg
2015-01-21 16:07:12 +01:00
Marc Alexander
7d6fdcfaa5
[ticket/13534] Set imagick path to empty string to prevent failing path check
...
The imagick path defaults to /usr/bin. If it doesn't exist for some reason,
for example on travis, the form won't be submitted and the settings won't be
changed.
PHPBB3-13534
2015-01-21 15:18:25 +01:00
Andreas Fischer
14585fcb4f
[develop-olympus] Increment version number to 3.0.14-dev.
2015-01-21 15:15:30 +01:00
Tristan Darricau
7fef91afd2
[ticket/13361] Rename exception to runtime_exception
...
PHPBB3-13361
2015-01-21 08:41:02 +01:00
Andreas Fischer
2c9e178a42
[develop-olympus] Add changelog for 3.0.13 release.
2015-01-21 01:45:23 +01:00
Andreas Fischer
9f7f366573
[develop-olympus] Bump version numbers for 3.0.13-RC1 release.
2015-01-21 01:32:18 +01:00
Andreas Fischer
c09023d1db
[develop-olympus] Bumping version numbers to final for 3.0.13 releases.
2015-01-21 01:25:50 +01:00
Nils Adermann
28b2bbca16
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13531] Send 404 Not Found.
[ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).
2015-01-21 01:07:46 +01:00
Nils Adermann
ddeb696b25
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[ticket/13531] Send 404 Not Found.
[ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).
2015-01-21 01:07:30 +01:00
Nils Adermann
eaeb88133f
Merge pull request #3316 from bantu/ticket/13531
...
[ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).
2015-01-21 01:05:13 +01:00
Andreas Fischer
e34b92882a
[ticket/13531] Send 404 Not Found.
...
PHPBB3-13531
2015-01-21 01:02:16 +01:00
Marc Alexander
4b9434bf1b
[ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).
...
PHPBB3-13531
2015-01-21 01:02:08 +01:00
Tristan Darricau
5307f47654
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13133] Fix variable name in set_custom_style()
2015-01-20 23:48:24 +01:00
