1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

25123 Commits

Author SHA1 Message Date
Marc Alexander
91fbdd9ff8 Merge pull request #4135 from lavigor/ticket/14423
[ticket/14423] Display database size for Aria storage engine
2016-01-21 17:37:11 +01:00
lavigor
5832698f4f [ticket/14423] Display database size for Aria storage engine
PHPBB3-14423
2016-01-20 21:34:30 +03:00
Marc Alexander
0c34641abd Merge pull request #3718 from javiexin/ticket/13908
[ticket/13908] "After" clause in migration not working
2016-01-17 23:28:29 +01:00
Marc Alexander
12a10de0d1 Merge pull request #4122 from lavigor/ticket/12441
[ticket/12441] Correct database size detection in MariaDB 10
2016-01-16 23:18:13 +01:00
Marc Alexander
f34df97f8b Merge pull request #4125 from lavigor/ticket/14412
[ticket/14412] Comment fixes for PHPDoc in the events
2016-01-16 23:10:37 +01:00
lavigor
fef03a1946 [ticket/14412] Comment fixes for PHPDoc in the events
PHPBB3-14412
2016-01-15 14:07:50 +03:00
Marc Alexander
295a424fc7 Merge pull request #4117 from Elsensee/ticket/14403
[ticket/14403] Don't expect user_id and user_ip in phpbb\log
2016-01-15 11:15:56 +01:00
Oliver Schramm
d045822cd8 [ticket/14403] Set a default user id and ip in CLI
PHPBB3-14403
2016-01-14 20:31:54 +01:00
lavigor
b34dbc2e84 [ticket/12441] Correct database size detection in MariaDB 10
PHPBB3-12441
2016-01-14 12:29:17 +03:00
Marc Alexander
f979d2c7b2 Merge pull request #4119 from Zoddo/ticket/14407
[ticket/14407] Fix removing users from Newly Registered Users group
2016-01-13 09:27:31 +01:00
Zoddo
fff6907a22 [ticket/14407] Fix removing users from Newly Registered Users group
PHPBB3-14407
2016-01-13 08:28:30 +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
Oliver Schramm
0cc41b94b1 [ticket/14403] Don't expect user_id and user_ip in phpbb\log
PHPBB3-14403
2016-01-10 17:43:10 +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
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
3f40a89864 [ticket/14382] Specify the branch-alias in the composer.json files
PHPBB3-14382
2016-01-09 15:36:43 +01:00
Joas Schilling
85e98a9d70 [prep-release-3.1.7] Add changelog for 3.1.7-pl1 release-3.1.7-pl1 2016-01-09 09:46:32 +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
Joas Schilling
89da4e8bf7 [prep-release-3.1.7] Update version to 3.1.7-pl1 2016-01-09 09:35:03 +01:00
Joas Schilling
c2d59b3352 Merge pull request #24 from phpbb/ticket/security-188
[ticket/security-188] Check form key in acp_bbcodes
2016-01-09 09:13:50 +01:00
kasimi
80c32fb7ef [ticket/14343] Added missing $phpbb_dispatcher
PHPBB3-14343
2016-01-09 09:13:20 +01:00
Oliver Schramm
1f16421782 Merge pull request #4114 from marc1706/ticket/14396
[ticket/14396] Use VCHAR_UNI and correct depends_on() version
2016-01-08 18:22:00 +01:00
Marc Alexander
45d64c4486 Merge pull request #4115 from Elsensee/ticket/14397
[ticket/14397] Fix @since tag in event 'core.ucp_prefs_view_after'
2016-01-08 17:57:00 +01:00
Oliver Schramm
a7648b0eaa [ticket/14397] Fix @since tag in event 'core.ucp_prefs_view_after'
PHPBB3-14397
2016-01-08 17:04:18 +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
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
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
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
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
cf1fc20297 [ticket/14394] Only purge cache in functional tests if necessary
PHPBB3-14394
2016-01-07 10:46:43 +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
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
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
kasimi
a021956644 [ticket/14343] Added missing $phpbb_dispatcher
PHPBB3-14343
2016-01-06 11:38:22 +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
296243f34f Merge pull request #4100 from marc1706/ticket/14303
[ticket/14303] Use UTF8 quotes in app.php lang file
2015-12-26 22:10:38 +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
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
84ed888cb9 Merge pull request #4084 from exussum12/ticket/14046
[ticket/14046] Jabber message incorrect
2015-12-23 13:32:23 +01:00
Marc Alexander
a7ca311d6c Merge pull request #4093 from VSEphpbb/ticket/14374
[ticket/14374] Update dynamic fallback jquery CDN script tag
2015-12-22 19:34:22 +01:00
Matt Friedman
1654caf34b [ticket/14374] Update dynamic fallback jquery CDN script tag
PHPBB3-14374
2015-12-22 09:29:29 -08: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