Commit graph

25179 commits

Author SHA1 Message Date
kasimi
a35fbdb3e9 [ticket/13540] Updated @since version to 3.4.1-RC1, fixed @var indentations
PHPBB3-13540
2015-01-24 12:23:10 +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
kasimi
40798ae616 [ticket/13540] Add core event for modifying topic review block data
Added event core.topic_review_modify_row in function topic_review() in
functions_posting for modifying template data blocks for topic reviews.

PHPBB3-13540
2015-01-24 02:09:29 +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
Wolfsblvt
8a0c227bf9 [ticket/13537] Add core events on mcp_queue for approval and disapproval
Events added for the functions approve_posts(), approve_topics()
and disapprove_posts() in mcp_queue.php, so that you can send notifications
during approval and disapproval.

PHPBB3-13537
2015-01-23 13:01:34 +01:00
Wolfsblvt
b88b8305fd [ticket/13518] Add core event to markread() in functions.php
Adding core event core.markread_before to to funtion markread()
in functions.php, so that you now are able to add additional
stuff inside the markread process, for example notifications designed
in extensions.

PHPBB3-13518
2015-01-23 12:53:46 +01:00
Wolfsblvt
1dce9576e9 [ticket/13532] Add core event to get_unread_topics() in functions.php
Adding core event core.get_unread_topics_modify_sql to to funtion
get_unread_topics() in functions.php, so that you now are able to modify
the sql query that retrieves the unread topics.

PHPBB3-13532
2015-01-23 12:48:57 +01:00
rxu
25b013f781 [ticket/13336] Add core events to the function user_active_flip()
Add core events to the function user_active_flip() in
includes/functions_user.php to allow checking/modifying data while
activating/deactivating users.

PHPBB3-13336
2015-01-23 08:20:00 +07:00
rxu
be1b114114 [ticket/13536] Add core events to allow modifying user profile data on editing
Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=33744

PHPBB3-13536
2015-01-23 00:35:02 +07: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
rxu
e08cd70a89 [ticket/13535] Add core event to allow modifying account settings on editing
Add ucp_profile.php core event to allow modifying account settings on editing.

PHPBB3-13535
2015-01-22 23:10:05 +07: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
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
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
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
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 #3314 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 #3315 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 #3313 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 #3313 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 #3293 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
d17904884e Merge pull request #3312 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
a8027c542f Merge pull request #3311 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 #3306 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 #3138 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
Joas Schilling
40006376f2 Merge pull request #3226 from prototech/ticket/13420
[ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.
2015-01-20 20:58:12 +01:00
Joas Schilling
2dcce57806 Merge branch 'develop-ascraeus' into develop 2015-01-20 17:31:24 +01:00
Joas Schilling
d99cd2d02e Merge pull request #3278 from rxu/ticket/13492
[ticket/13492] Fix IDN support for custom BBCode URL tokens
2015-01-20 17:31:06 +01:00