mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-07 16:15:22 +02:00
Code Issues Releases Wiki Activity
25,001 Commits 18 Branches 192 Tags
e2786c37dc
Commit Graph

25001 Commits

Author SHA1 Message Date
Marc Alexander
e2786c37dc Merge pull request 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 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 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 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 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. release-3.0.13-RC1 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 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
Tristan Darricau
08e186af8e Merge pull request from VSEphpbb/ticket/13133 
[ticket/13133] Fix variable name in set_custom_style()

* VSEphpbb/ticket/13133:
  [ticket/13133] Fix variable name in set_custom_style()
 2015-01-20 23:47:44 +01:00
Tristan Darricau
fd25d00fac Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13530] Fix undefined variables
 2015-01-20 23:44:17 +01:00
Tristan Darricau
f6057c5eab Merge pull request from nickvergessen/ticket/13530 
[ticket/13530] Fix undefined variables

* nickvergessen/ticket/13530:
  [ticket/13530] Fix undefined variables
 2015-01-20 23:43:57 +01:00
Tristan Darricau
f8c3440344 Merge pull request from nickvergessen/ticket/13528 
[ticket/13528] Return correct translation instead of is_set()

* nickvergessen/ticket/13528:
  [ticket/13528] Return correct translation instead of is_set()
 2015-01-20 23:37:38 +01:00
Joas Schilling
ed6b8f84ad [ticket/13530] Fix undefined variables 
PHPBB3-13530
 2015-01-20 23:36:45 +01:00
Tristan Darricau
9334100cb3 Merge pull request from nickvergessen/ticket/13528 
[ticket/13528] Return correct translation instead of is_set()

* nickvergessen/ticket/13528:
  [ticket/13528] Return correct translation instead of is_set()
 2015-01-20 23:36:23 +01:00
Joas Schilling
b566686b51 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php
	phpBB/phpbb/db/migration/profilefield_base_migration.php
	phpBB/phpbb/db/migrator.php
 2015-01-20 23:32:36 +01:00
Joas Schilling
a5fae1b1f0 Merge pull request from Nicofuma/ticket/13489 
[ticket/13489] Disable the event dispatcher in the migrator
 2015-01-20 23:27:54 +01:00
Matt Friedman
41966c481f [ticket/13133] Fix variable name in set_custom_style() 
PHPBB3-13133
 2015-01-20 14:21:02 -08:00
Andreas Fischer
c71e8ffb29 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13527] Apply htmlspecialchars() to data from version server.
  [ticket/13527] Remove two unused variables.
  [ticket/13526] Correctly validate the ucp_pm_options form key.
 2015-01-20 23:15:29 +01:00
Andreas Fischer
d0e5c0a187 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13527] Apply htmlspecialchars() to data from version server.
  [ticket/13527] Remove two unused variables.

Conflicts:
	phpBB/includes/acp/acp_update.php
 2015-01-20 23:15:21 +01:00
Andreas Fischer
d17904884e Merge pull request from bantu/ticket/13527 
[ticket/13527] Escape information received from version server

* bantu/ticket/13527:
  [ticket/13527] Apply htmlspecialchars() to data from version server.
  [ticket/13527] Remove two unused variables.
 2015-01-20 23:14:38 +01:00
Andreas Fischer
6e00529f36 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13526] Correctly validate the ucp_pm_options form key.
 2015-01-20 23:12:53 +01:00
Andreas Fischer
a8027c542f Merge pull request from bantu/ticket/13526 
[ticket/13526] Correctly validate the ucp_pm_options form key.

* bantu/ticket/13526:
  [ticket/13526] Correctly validate the ucp_pm_options form key.
 2015-01-20 23:12:00 +01:00
Andreas Fischer
5069da8d52 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13519] Correctly validate imagick path as path and not string
 2015-01-20 23:11:40 +01:00
Andreas Fischer
4d0b04a397 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13519] Correctly validate imagick path as path and not string

Conflicts:
	phpBB/includes/acp/acp_attachments.php
 2015-01-20 23:11:29 +01:00
Andreas Fischer
3134b6b70e Merge pull request from marc1706/ticket/13519 
[ticket/13519] Correctly validate imagick path as path and not string

* marc1706/ticket/13519:
  [ticket/13519] Correctly validate imagick path as path and not string
 2015-01-20 23:10:19 +01:00
Joas Schilling
d1bff80dd1 [ticket/13528] Return correct translation instead of is_set() 
PHPBB3-13528
 2015-01-20 22:56:33 +01:00
Joas Schilling
5d69f6159c Merge branch 'develop-ascraeus' into develop 2015-01-20 22:50:30 +01:00
Joas Schilling
f02dc44a23 Merge pull request from prototech/ticket/12642 
[ticket/12642] Ensure CPF type specific options are set when editing booleans.
 2015-01-20 22:46:08 +01:00
Andreas Fischer
92b5222295 [ticket/13527] Apply htmlspecialchars() to data from version server. 
PHPBB3-13527
 2015-01-20 22:40:39 +01:00
Andreas Fischer
251868dd7e [ticket/13527] Remove two unused variables. 
PHPBB3-13527
 2015-01-20 22:34:14 +01:00
Joas Schilling
23069a13e2 [ticket/13526] Correctly validate the ucp_pm_options form key. 
PHPBB3-13526
 2015-01-20 22:16:24 +01:00
Joas Schilling
358ca14ade Merge branch 'develop-ascraeus' into develop 2015-01-20 20:58:21 +01:00