mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 21:13:50 +01:00
Code Issues Releases Wiki Activity
27,670 Commits 17 Branches 190 Tags
Commit Graph

27670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Erwan Nader
59481da9da [ticket/14386] Use of sys_get_temp_dir() 
PHPBB3-14386
 2016-01-06 13:16:03 +01:00
Marc Alexander
ffd6abdeaf Merge remote-tracking branch 'ErnadoO/ticket/14386' into ticket/14386 
Conflicts:
	phpBB/includes/functions_upload.php
 2016-01-06 13:15:43 +01:00
kasimi
a021956644 [ticket/14343] Added missing $phpbb_dispatcher 
PHPBB3-14343
 2016-01-06 11:38:22 +01:00
Oliver Schramm
e45ba44754 [ticket/14250] Update symfony dev-requirements to stable 
PHPBB3-14250
 2016-01-05 19:12:18 +01:00
Oliver Schramm
d90509bb31 [ticket/14250] Replace abandoned guzzle packages 
PHPBB3-14250
 2016-01-04 03:55:18 +01:00
Oliver Schramm
b9acf83653 [ticket/14250] Track version numbers instead of commit id 
PHPBB3-14250
 2016-01-04 03:47:38 +01:00
Oliver Schramm
0e94693089 [ticket/14250] Fix composer.json 
Symfony dependencies that aren't required by phpBB itself but by
one of its dependencies are now forced to be 2.8 LTS again.

PHPBB3-14250
 2016-01-04 03:44:33 +01:00
Oliver Schramm
8ed59fb82a [ticket/14250] Change token_storage class to fit changed interface 
PHPBB3-14250
 2016-01-04 03:38:28 +01:00
Oliver Schramm
e738dad729 [ticket/14250] Review/bump dependencies 
PHPBB3-14250
 2016-01-04 03:33:42 +01:00
Erwan Nader
73ca420029 [ticket/14386] Use of sys_get_temp_dir() 
PHPBB3-14386
 2016-01-03 10:01:00 +01:00
Marc Alexander
b3d64b3b59 [ticket/14387] Fix avatar tests after adding get_config_name method 
PHPBB3-14387
 2016-01-02 17:16:32 +01:00
javiexin
917c864bbf [ticket/14387] Extend avatar-driver by extension in ACP not possible 
Create two driver methods to provide the driver config name and the
driver ACP template name, and use them directly when required.
Default driver config name and template name are the same as now.
But new drivers are able to override the config name and template
name with their own, including @vendor_extension. Simplified manager
interface by reducing unneeded methods.

PHPBB3-14387
 2016-01-02 17:16:23 +01:00
javiexin
06f4b6926b [ticket/14387] Extend avatar-driver by extension in ACP not possible 
Create two driver methods to provide the driver config name and the
driver ACP template name, and use them within the manager method.
Default driver config name and template name are the same as now.
But new drivers are able to override the config name and template
name with their own, including @vendor_extension.

PHPBB3-14387
 2016-01-02 17:16:14 +01:00
javiexin
14dc274e9e [ticket/14387] Extend avatar-driver by extension in ACP not possible 
Create a driver method to provide the driver config name, and use it
within the manager method. Default driver config name is the same as now.
But new drivers are able to override the config name with their own.

PHPBB3-14387
 2016-01-02 17:16:03 +01:00
Marc Alexander
dfa88441de Merge pull request #4102 from JoshyPHP/ticket/10628 
[ticket/10628] http:// prepended to "www." urls
 2016-01-01 09:55:34 +01:00
Marc Alexander
e0529ecfe8 Merge pull request #4103 from JoshyPHP/ticket/12221 
[ticket/12221] URLs Containing javascript: are Garbled
 2016-01-01 09:53:59 +01:00
JoshyPHP
2eac5a0ddd [ticket/12221] Added test 
PHPBB3-12221
 2015-12-28 20:10:42 +01:00
JoshyPHP
7273e24101 [ticket/10628] Added test 
Tests that the textarea's content is preserved, that no "http://"
is added to the text or to the preview's HTML and that the www
URL is linkified

PHPBB3-10628
 2015-12-28 19:46:46 +01:00
JoshyPHP
bc5d976786 [ticket/14323] Added should_shorten() 
Explicitly tests a tag's markup to determine whether a link should be shortened

PHPBB3-14323
 2015-12-28 04:19:21 +01:00
JoshyPHP
bcd5d8b512 [ticket/14323] Added tests 
PHPBB3-14323
 2015-12-27 18:39:53 +01:00