makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
27587 commits 18 branches 192 tags 206 MiB
Commit graph

23433 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
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
0efbb78afa Merge branch '3.1.x' 2015-12-26 22:10:41 +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
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
Marc Alexander
c02fc0f63f [ticket/14378] Use consistent template variable paths 
PHPBB3-14378
 2015-12-22 20:02:44 +01:00
Marc Alexander
d033597c5d Merge branch '3.1.x' 
Conflicts:
	phpBB/adm/style/installer_footer.html
 2015-12-22 19:51:21 +01:00
Tristan Darricau
d44e34aa14 [ticket/14377] Allow extensions to register compiler pass 
PHPBB3-14377
 2015-12-22 18:48:49 +01:00
Matt Friedman
1654caf34b [ticket/14374] Update dynamic fallback jquery CDN script tag 
PHPBB3-14374
 2015-12-22 09:29:29 -08:00
Marc Alexander
2fe81c1ccb [ticket/14373] Do not pass arrays to strpos() 
PHPBB3-14373
 2015-12-20 22:20:56 +01:00
Marc Alexander
c2a5411dcb Merge pull request #4076 from Nicofuma/ticket/14177 
[ticket/14177] Uses Symfony's Debug ErrorHandler in development environment
 2015-12-20 12:59:23 +01:00
Marc Alexander
96bd531701 Merge pull request #4087 from VSEphpbb/ticket/14368 
[ticket/14368] Fix color of post editor input boxes
 2015-12-20 11:03:44 +01:00
Matt Friedman
11ad71b381 [ticket/14368] Fix color of post editor input boxes 
https://tracker.phpbb.com/browse/PHPBB3-14368

PHPBB3-14368
 2015-12-19 10:29:22 -08:00
Tristan Darricau
5bbb6e1215 Merge pull request #4083 from RMcGirr83/ticket_14362 
[ticket/14362] Missing lang var in install file

* RMcGirr83/ticket_14362:
  [ticket/14362] Missing lang var in install file
 2015-12-19 18:17:32 +01:00
Tristan Darricau
554b90b59f [release-3.2.0-a2] Update version to 3.2.0-a3 2015-12-19 17:34:46 +01:00
Tristan Darricau
7381e99517 [prep-release-3.2.0-a2] Add changelog for 3.2.0-a2 2015-12-19 17:17:01 +01:00
Tristan Darricau
8daeb6962a [prep-release-3.2.0-a2] Add migration for 3.2.0-a2 2015-12-19 17:17:01 +01:00
Tristan Darricau
6b09dbe16c [prep-release-3.2.0-a2] Update version to 3.2.0-a2 2015-12-19 17:17:01 +01:00
Joas Schilling
9a814e21aa Merge branch '3.1.x' 
Conflicts:
	build/build.xml
 2015-12-19 14:23:12 +01:00
Joas Schilling
9af2dc0b6b 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
 2015-12-19 14:21:57 +01:00
Joas Schilling
e3acdfed92 [prep-release-3.1.7] Add migration to update the version 2015-12-19 12:21:25 +01:00
Joas Schilling
4ec32592a4 [prep-release-3.1.7] Increase version to 3.1.7 2015-12-19 12:21:04 +01:00
rxu
33db45edac [ticket/14356] Add template events to viewtopic around back2top link 
PHPBB3-14356
 2015-12-17 23:18:37 +07:00
Scott Dutton
7ebbc69dbd [ticket/14046] Jabber message incorrect 
When making a Jabber message, the page says the message has been sent
when loading the page for the first time, This message should only be
shown after the message has actually been sent

PHPBB3-14046
 2015-12-16 22:15:29 +00:00
Richard McGirr
6eaeb7ebef [ticket/14362] Missing lang var in install file 
PHPBB3-14362
 2015-12-16 06:42:37 -05:00
Tristan Darricau
6ffbd26377 [ticket/14177] CS 
PHPBB3-14177
 2015-12-15 19:55:55 +01:00
Tristan Darricau
3d6a6200d8 [ticket/14359] Fix console.command.reparser.reparse service definition 
PHPBB3-14359
 2015-12-14 22:32:16 +01:00
Máté Bartus
60587d77bb Merge pull request #4080 from Nicofuma/ticket/14358 
[ticket/14358] Includes the composer autoloader in create_schema_files.php
 2015-12-14 22:16:32 +01:00