mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00
Code Issues Releases Wiki Activity
27,648 Commits 17 Branches 190 Tags
Commit Graph

27648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lavigor
ef09b562db [ticket/13442] UTF-8 symbols for database host 
PHPBB3-13442
 2016-01-14 15:38:14 +03:00
Marc Alexander
08647781c0 Merge pull request #4059 from JoshyPHP/ticket/14323 
[ticket/14323] Added support for truncating long URLs
 2016-01-13 12:55:31 +01:00
Marc Alexander
d55a8a8cee Merge branch '3.1.x' 2016-01-13 09:27:35 +01:00
Marc Alexander
f979d2c7b2 Merge pull request #4119 from Zoddo/ticket/14407 
[ticket/14407] Fix removing users from Newly Registered Users group
 2016-01-13 09:27:31 +01:00
Zoddo
fff6907a22 [ticket/14407] Fix removing users from Newly Registered Users group 
PHPBB3-14407
 2016-01-13 08:28:30 +01:00
Marc Alexander
549e91354d Merge pull request #4118 from JoshyPHP/ticket/14405 
[ticket/14405] Force a lookahead check on [URL] BBCodes
 2016-01-12 17:32:14 +01:00
JoshyPHP
e4dae8ed4b [ticket/14405] Force a lookahead check on [URL] BBCodes 
PHPBB3-14405
 2016-01-12 11:54:20 +01:00
Marc Alexander
68d945e931 Merge branch '3.1.x' 2016-01-12 04:31:15 +01:00
Marc Alexander
826d6aac74 Merge pull request #3929 from kilianr/ticket/12618 
[ticket/12618] Allow extension author to use SSL for version-check.
 2016-01-12 04:11:56 +01:00
Kilian
ad34b87824 [ticket/12618] Change ssl:// to tls:// 
PHPBB3-12618
 2016-01-10 19:33:45 +01:00
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