makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
24129 commits 18 branches 192 tags 206 MiB
Commit graph

24129 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
kasimi
33d7eb69ef [ticket/13540] Added var row to both events 
PHPBB3-13540
 2015-01-25 13:01:02 +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
paulsohier
0cfa977953 [ticket/13542] Added sentenence of what is changed in the event 
PHPBB3-13542
 2015-01-24 20:26:51 +01:00
kasimi
12fba95892 [ticket/13540] Add core event for MCP topic review block data 
Similar to the previous event, this event triggers for each post in the
MCP topic review.

PHPBB3-13540
 2015-01-24 19:41:27 +01:00
paulsohier
c86e5e8514 [ticket/13542] Merge result of validation into existing $error 
Because extensions can set a entry in $error, the result of the validate
needs to be merged into it.

PHPBB3-13542
 2015-01-24 19:04:26 +01:00
paulsohier
b0383a90e1 [ticket/13542] Update core.ucp_prefs_personal_data to include $error 
Update the event so extensions will be able to validate (and deny) changes.

PHPBB3-13542
 2015-01-24 18:53:33 +01:00
Marc Alexander
a5c65449de [ticket/13538] Add tests for double nested pagination loop 
PHPBB3-13538
 2015-01-24 14:35:49 +01:00
Marc Alexander
ee03b4f1ef [ticket/13538] Fix tests for pagination in nested loop 
PHPBB3-13538
 2015-01-24 14:27:04 +01:00
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
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
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
Marc Alexander
7014d824f0 [ticket/13538] Add test for pagination in nested loop 
PHPBB3-13538
 2015-01-23 11:48:05 +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
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
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
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
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
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
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
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
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
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
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
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
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