mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-12 20:02:08 +02:00
Code Issues Releases Wiki Activity
27,626 Commits 18 Branches 192 Tags
Commit Graph

27626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
7f7b09fdeb Merge branch '3.1.x' 
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/acp/acp_bbcodes.php
 2016-01-09 18:45:32 +01:00
Joas Schilling
fd5e66cbf1 Merge branch 'prep-release-3.1.7' into 3.1.x 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
 2016-01-09 18:42:07 +01:00
Tristan Darricau
b2324607ad Merge pull request #4058 from marc1706/ticket/13454 
[ticket/13454] Remove unused variables, globals, and parameters

* marc1706/ticket/13454:
  [ticket/13454] Add excessively removed code back
  [ticket/13454] Remove more unused variables
  [ticket/13454] Remove double semi-colons
  [ticket/13454] Remove unused variables
  [ticket/13454] Fix code sniffer complaints
  [ticket/13454] Fix a few issues introduced by overdeleting stuff
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
 2016-01-09 17:53:04 +01:00
Marc Alexander
81cbabc1f6 Merge branch '3.1.x' 2016-01-09 16:30:43 +01:00
Marc Alexander
a86a6926ee Merge pull request #4098 from Nicofuma/ticket/14382-master 
[ticket/14382] Specify the branch-alias in the composer.json files
 2016-01-09 16:30:42 +01:00
Marc Alexander
d64680983a Merge pull request #4097 from Nicofuma/ticket/14382 
[ticket/14382] Specify the branch-alias in the composer.json files
 2016-01-09 16:30:11 +01:00
Tristan Darricau
e8a4526f4a [ticket/14382] Specify the branch-alias in the composer.json files 
PHPBB3-14382
 2016-01-09 15:42:42 +01:00
Tristan Darricau
c1eb721650 Merge branch 'ticket/14382' into ticket/14382-master 
* ticket/14382:
  [ticket/14382] Specify the branch-alias in the composer.json files
 2016-01-09 15:39:26 +01:00
Tristan Darricau
3f40a89864 [ticket/14382] Specify the branch-alias in the composer.json files 
PHPBB3-14382
 2016-01-09 15:36:43 +01:00
Joas Schilling
85e98a9d70 [prep-release-3.1.7] Add changelog for 3.1.7-pl1 release-3.1.7-pl1 2016-01-09 09:46:32 +01:00
Joas Schilling
29a239a4db [prep-release-3.1.7] Add migration for 3.1.7-pl1 2016-01-09 09:35:53 +01:00
Joas Schilling
89da4e8bf7 [prep-release-3.1.7] Update version to 3.1.7-pl1 2016-01-09 09:35:03 +01:00
Joas Schilling
c2d59b3352 Merge pull request #24 from phpbb/ticket/security-188 
[ticket/security-188] Check form key in acp_bbcodes
 2016-01-09 09:13:50 +01:00
kasimi
80c32fb7ef [ticket/14343] Added missing $phpbb_dispatcher 
PHPBB3-14343
 2016-01-09 09:13:20 +01:00
Oliver Schramm
f6524f4902 Merge branch '3.1.x' 2016-01-08 18:22:40 +01:00
Oliver Schramm
1f16421782 Merge pull request #4114 from marc1706/ticket/14396 
[ticket/14396] Use VCHAR_UNI and correct depends_on() version
 2016-01-08 18:22:00 +01:00
Marc Alexander
c6c7730e04 Merge branch '3.1.x' 2016-01-08 17:57:05 +01:00
Marc Alexander
45d64c4486 Merge pull request #4115 from Elsensee/ticket/14397 
[ticket/14397] Fix @since tag in event 'core.ucp_prefs_view_after'
 2016-01-08 17:57:00 +01:00
Oliver Schramm
a7648b0eaa [ticket/14397] Fix @since tag in event 'core.ucp_prefs_view_after' 
PHPBB3-14397
 2016-01-08 17:04:18 +01:00
Marc Alexander
9fe8d05d5b [ticket/14396] Use VCHAR_UNI and correct depends_on() version 
PHPBB3-14396
 2016-01-08 16:55:40 +01:00
Marc Alexander
0028ed3e95 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
 2016-01-08 16:39:33 +01:00
Marc Alexander
2ab7b12419 Merge pull request #4112 from marc1706/ticket/13180 
[ticket/13180] Increase dateformat field size
 2016-01-08 16:39:03 +01:00
Oliver Schramm
b6fee9f536 Merge branch '3.1.x' 2016-01-08 16:06:46 +01:00
Oliver Schramm
ae18f8b27c Merge pull request #3924 from Senky/ticket/14190 
[ticket/14190] Add core.ucp_prefs_view_after event
 2016-01-08 15:51:53 +01:00
Mate Bartus
2efab1cf5a Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14394] Only purge cache in functional tests if necessary
 2016-01-08 14:28:03 +01:00
Máté Bartus
2f7517a0fe Merge pull request #4111 from marc1706/ticket/14394 
[ticket/14394] Only purge cache in functional tests if necessary
 2016-01-08 14:24:24 +01:00
Saeed Hubaishan
a339b9e84f [ticket/13180] Increase dateformat field size 
remove empty line as marc1706 guided

PHPBB3-13180
 2016-01-07 20:03:35 +01:00
Saeed Hubaishan
678ca5dcdc [ticket/13180] Increase dateformat field size 
[ticket/13180] Increase dateformat field size

change field size to 64 in these files
add new migration file to update the database schema

PHPBB3-13180
 2016-01-07 17:36:02 +01:00
Marc Alexander
d3ca327f2c Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/prosilver/template/viewtopic_body.html
	phpBB/styles/subsilver2/template/viewtopic_body.html
 2016-01-07 16:28:44 +01:00
Marc Alexander
a7058d968f Merge pull request #4079 from rxu/ticket/14356 
[ticket/14356] Add template events to viewtopic around back2top link
 2016-01-07 16:26:16 +01:00
Marc Alexander
ca04f61b8a Merge pull request #4000 from Elsensee/ticket/14250 
[ticket/14250] Review/bump dependencies
 2016-01-07 13:56:42 +01:00
Marc Alexander
cf1fc20297 [ticket/14394] Only purge cache in functional tests if necessary 
PHPBB3-14394
 2016-01-07 10:46:43 +01:00
Oliver Schramm
529880f911 [ticket/14250] Added symfony/debug as requirement 
PHPBB3-14250
 2016-01-06 16:06:27 +01:00
Marc Alexander
3f44f36817 [ticket/13454] Add excessively removed code back 
PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
73900d1857 [ticket/13454] Remove more unused variables 
This should be the last part. Off to checking if the changes were correct.

PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
3b9a9bb04a [ticket/13454] Remove double semi-colons 
PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
7a6a16e3a5 [ticket/13454] Remove unused variables 
This is part 5 and there is more to come.

PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
915a141fc2 [ticket/13454] Fix code sniffer complaints 
PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
38f3688217 [ticket/13454] Fix a few issues introduced by overdeleting stuff 
PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
266576c6a4 [ticket/13454] Remove unused variables 
Part 4

PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
6c25ad4822 [ticket/13454] Remove unused variables 
Part 3 should fix tests up a little bit again.

PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
f50ba9ab4f [ticket/13454] Remove unused variables 
This is part 2 of the pr.

PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
73e6e5b77f [ticket/13454] Remove unused variables 
This is the first part of the changes. More to come.

PHPBB3-13454
 2016-01-06 13:51:19 +01:00
Marc Alexander
d0adbe94d5 Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/mcp/mcp_main.php
 2016-01-06 13:31:15 +01:00
Marc Alexander
e75c04f02a Merge pull request #4109 from marc1706/ticket/14343 
[ticket/14343] Added missing $phpbb_dispatcher
 2016-01-06 13:30:20 +01:00
Marc Alexander
ea6bcdff52 Merge branch '3.1.x' 2016-01-06 13:26:23 +01:00
Marc Alexander
11b79fec4d Merge pull request #4105 from marc1706/ticket/14387 
[ticket/14387] Allow extending avatars by extensions in ACP
 2016-01-06 13:26:19 +01:00
Marc Alexander
82b4eb6d3d Merge branch '3.1.x' 2016-01-06 13:22:16 +01:00
Marc Alexander
1a3f783807 Merge pull request #4110 from marc1706/ticket/14386 
[ticket/14386] Fix for open_basedir restriction in effect with remote upload avatar
 2016-01-06 13:22:16 +01:00
Marc Alexander
b340e45907 Merge pull request #4104 from ErnadoO/ticket/14386 
[ticket/14386] Fix for open_basedir restriction in effect with remote upload avatar
 2016-01-06 13:20:32 +01:00