1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-15 14:16:28 +02:00
Commit Graph

3518 Commits

Author SHA1 Message Date
7f8b6c02c6 [ticket/14306] Update the error message
PHPBB3-14306
2016-01-09 15:35:17 +01:00
761fa9da52 [ticket/14306] Doesn't try to build a "safe" container in the dev env
PHPBB3-14306
2016-01-09 15:35:17 +01:00
78349ed80f [ticket/14306] Automatically enable a safe mode when container building fails
PHPBB3-14306
2016-01-09 15:35:17 +01:00
29a239a4db [prep-release-3.1.7] Add migration for 3.1.7-pl1 2016-01-09 09:35:53 +01:00
f6524f4902 Merge branch '3.1.x' 2016-01-08 18:22:40 +01:00
9fe8d05d5b [ticket/14396] Use VCHAR_UNI and correct depends_on() version
PHPBB3-14396
2016-01-08 16:55:40 +01:00
0028ed3e95 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
2016-01-08 16:39:33 +01:00
a339b9e84f [ticket/13180] Increase dateformat field size
remove empty line as marc1706 guided

PHPBB3-13180
2016-01-07 20:03:35 +01:00
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
ca04f61b8a Merge pull request #4000 from Elsensee/ticket/14250
[ticket/14250] Review/bump dependencies
2016-01-07 13:56:42 +01:00
3f44f36817 [ticket/13454] Add excessively removed code back
PHPBB3-13454
2016-01-06 13:52:11 +01:00
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
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
38f3688217 [ticket/13454] Fix a few issues introduced by overdeleting stuff
PHPBB3-13454
2016-01-06 13:52:11 +01:00
266576c6a4 [ticket/13454] Remove unused variables
Part 4

PHPBB3-13454
2016-01-06 13:52:11 +01:00
f50ba9ab4f [ticket/13454] Remove unused variables
This is part 2 of the pr.

PHPBB3-13454
2016-01-06 13:52:11 +01:00
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
ea6bcdff52 Merge branch '3.1.x' 2016-01-06 13:26:23 +01:00
59481da9da [ticket/14386] Use of sys_get_temp_dir()
PHPBB3-14386
2016-01-06 13:16:03 +01:00
8ed59fb82a [ticket/14250] Change token_storage class to fit changed interface
PHPBB3-14250
2016-01-04 03:38:28 +01:00
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
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
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
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
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
5c8373dc20 [ticket/14323] Added comment [ci skip]
PHPBB3-14323
2015-12-26 17:01:37 +01:00
ad2c032d3b [ticket/14323] Moved autolink-related functions to a separate helper
PHPBB3-14323
2015-12-26 14:20:39 +01:00
9a8fb2e1df [ticket/14323] Stylistic change [ci skip]
PHPBB3-14323
2015-12-26 14:19:22 +01:00
8fe94a19b4 [ticket/14323] Added support for truncating local URLs
PHPBB3-14323
2015-12-26 14:19:22 +01:00
eb6ceb963e [ticket/14323] Added support for truncating long URLs
PHPBB3-14323
2015-12-26 14:19:22 +01:00
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
c02fc0f63f [ticket/14378] Use consistent template variable paths
PHPBB3-14378
2015-12-22 20:02:44 +01:00
d44e34aa14 [ticket/14377] Allow extensions to register compiler pass
PHPBB3-14377
2015-12-22 18:48:49 +01:00
2fe81c1ccb [ticket/14373] Do not pass arrays to strpos()
PHPBB3-14373
2015-12-20 22:20:56 +01:00
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
8daeb6962a [prep-release-3.2.0-a2] Add migration for 3.2.0-a2 2015-12-19 17:17:01 +01:00
9a814e21aa Merge branch '3.1.x'
Conflicts:
	build/build.xml
2015-12-19 14:23:12 +01:00
e3acdfed92 [prep-release-3.1.7] Add migration to update the version 2015-12-19 12:21:25 +01:00
6ffbd26377 [ticket/14177] CS
PHPBB3-14177
2015-12-15 19:55:55 +01:00
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
69cf32613d [prep-release-3.1.7] Add migration for 3.1.7-RC1 2015-12-12 01:35:05 +01:00
dee22f4a28 [ticket/14177] Uses Symfony's Debug ErrorHandler in development environment
PHPBB3-14177
2015-12-11 21:05:53 +01:00
6188a87779 [ticket/14344] Improve output of HTML errors trigged during install
PHPBB3-14344
2015-12-07 23:36:49 +01:00
f14a9b7069 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14261] Fix tests by removing old code.
  [ticket/14261] Move the update of session informations to page_footer()
2015-12-07 21:52:38 +01:00
4989df66a2 Merge pull request #4008 from Zoddo/ticket/14261
[ticket/14261] Move the update of session informations to page_footer()

* Zoddo/ticket/14261:
  [ticket/14261] Fix tests by removing old code.
  [ticket/14261] Move the update of session informations to page_footer()
2015-12-07 21:52:17 +01:00
41b4fee655 [ticket/14345] Move new line to ternary comparison
PHPBB3-14345
2015-12-07 16:59:04 +01:00
1b9ae803c5 [ticket/14345] Check if description exists in message ary
PHPBB3-14345
2015-12-07 13:53:44 +01:00
a740befb02 Merge pull request #4046 from CHItA/ticket/14269
[ticket/14269] Use http_exceptions in the installer instead of die()

* CHItA/ticket/14269:
  [ticket/14269] Change HTTP status codes to 403
  [ticket/14269] Fix comments and language var names
  [ticket/14269] Use http_exceptions in the installer instead of die()
2015-12-07 00:28:20 +01:00
44a90c9812 [ticket/14269] Change HTTP status codes to 403
PHPBB3-14269
2015-12-05 15:42:22 +01:00
ecb98ce81f Merge pull request #4006 from brunoais/feature/sql-bool-builder
[feature/sql-bool-builder] New syntax for DBAL query builder for boolean generation

* brunoais/feature/sql-bool-builder:
  [feature/sql-bool-builder] Fixing misuse of LOGICAL_OP instead of STATEMENTS
  [feature/sql-bool-builder] Fixing typos in previous commit
  [feature/sql-bool-builder] Changing syntax pt3. Don't use magic numbers
  [feature/sql-bool-builder] Changing syntax pt2. Fix tests
  [feature/sql-bool-builder] Changing syntax
2015-12-05 11:23:27 +01:00