mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-19 22:10:14 +02:00
Code Issues Releases Wiki Activity
27,647 Commits 18 Branches 192 Tags
Commit Graph

2766 Commits

Author SHA1 Message Date
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
Zoddo
fff6907a22 [ticket/14407] Fix removing users from Newly Registered Users group 
PHPBB3-14407
 2016-01-13 08:28:30 +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
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
3f40a89864 [ticket/14382] Specify the branch-alias in the composer.json files 
PHPBB3-14382
 2016-01-09 15:36:43 +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
Oliver Schramm
f6524f4902 Merge branch '3.1.x' 2016-01-08 18:22:40 +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
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
ca04f61b8a Merge pull request #4000 from Elsensee/ticket/14250 
[ticket/14250] Review/bump dependencies
 2016-01-07 13:56:42 +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
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
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
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
ea6bcdff52 Merge branch '3.1.x' 2016-01-06 13:26:23 +01:00
Erwan Nader
59481da9da [ticket/14386] Use of sys_get_temp_dir() 
PHPBB3-14386
 2016-01-06 13:16:03 +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
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
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
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
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
c02fc0f63f [ticket/14378] Use consistent template variable paths 
PHPBB3-14378
 2015-12-22 20:02:44 +01:00
Tristan Darricau
d44e34aa14 [ticket/14377] Allow extensions to register compiler pass 
PHPBB3-14377
 2015-12-22 18:48:49 +01: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
Tristan Darricau
8daeb6962a [prep-release-3.2.0-a2] Add migration for 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
e3acdfed92 [prep-release-3.1.7] Add migration to update the version 2015-12-19 12:21:25 +01:00
Tristan Darricau
6ffbd26377 [ticket/14177] CS 
PHPBB3-14177
 2015-12-15 19:55:55 +01:00
Joas Schilling
b2a26ab5f4 Merge branch '3.1.x' 
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2015-12-12 15:24:29 +01:00