makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-19 17:58:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
29713 commits 18 branches 192 tags 207 MiB
Commit graph

25179 commits

Author SHA1 Message Date
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
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
Erwan Nader
59481da9da [ticket/14386] Use of sys_get_temp_dir() 
PHPBB3-14386
 2016-01-06 13:16:03 +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
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
c9541e0795 [ticket/14272] Use input type number instead of text in avatars 
PHPBB3-14272
 2016-01-01 17:26:14 +01:00
Marc Alexander
f3c2c497d8 [ticket/14272] Assign min and max values for avatar driver settings 
PHPBB3-14272
 2016-01-01 17:26:14 +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
909f8653ec [ticket/14323] Renamed AUTOLINK_TEXT to LINK_TEXT 
Expanded link text shortening to [url] BBCodes with no parameters

PHPBB3-14323
 2015-12-27 16:43:45 +01:00
Marc Alexander
805b084607 [ticket/14272] Define min and max values for avatar width and height 
PHPBB3-14272
 2015-12-27 08:39:07 +01:00
Marc Alexander
74ec6f4e9a [ticket/14272] Disable not toggled form elements 
PHPBB3-14272
 2015-12-27 08:39:06 +01:00
Marc Alexander
0efbb78afa Merge branch '3.1.x' 2015-12-26 22:10:41 +01:00
JoshyPHP
5c8373dc20 [ticket/14323] Added comment [ci skip] 
PHPBB3-14323
 2015-12-26 17:01:37 +01:00
JoshyPHP
ad2c032d3b [ticket/14323] Moved autolink-related functions to a separate helper 
PHPBB3-14323
 2015-12-26 14:20:39 +01:00
JoshyPHP
9a8fb2e1df [ticket/14323] Stylistic change [ci skip] 
PHPBB3-14323
 2015-12-26 14:19:22 +01:00
JoshyPHP
8fe94a19b4 [ticket/14323] Added support for truncating local URLs 
PHPBB3-14323
 2015-12-26 14:19:22 +01:00
JoshyPHP
eb6ceb963e [ticket/14323] Added support for truncating long URLs 
PHPBB3-14323
 2015-12-26 14:19:22 +01:00
phpBB España
bb5a171674 [ticket/14303] Use UTF8 quotes in app.php lang file 
PHPBB3-14303
 2015-12-26 08:14:33 +01:00
Melvin García
5e8105a1cd [ticket/14371] Small fix for the quick links alignment 
PHPBB3-14371
 2015-12-24 14:00:34 +01:00
Marc Alexander
b1e4a3e1b7 Merge pull request #4094 from Nicofuma/ticket/14377 
[ticket/14377] Allow extensions to register compiler pass
 2015-12-23 19:27:19 +01:00
Marc Alexander
87345807de [ticket/security-188] Remove unused form key from acp_extensions 
SECURITY-188
 2015-12-23 17:32:31 +01:00
Marc Alexander
18abef716e [ticket/security-188] Check form key in acp_bbcodes 
SECURITY-188
 2015-12-23 17:31:43 +01:00
Marc Alexander
6a4e296c43 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_im.html
 2015-12-23 13:32:44 +01:00
Marc Alexander
84ed888cb9 Merge pull request #4084 from exussum12/ticket/14046 
[ticket/14046] Jabber message incorrect
 2015-12-23 13:32:23 +01:00
Mate Bartus
84171c5776 [ticket/14380] Maintain consistent template var paths in 3.2 installer 
PHPBB3-14380
 2015-12-22 21:52:05 +01:00