a98f12d1fc
Merge branch '3.1.x'
2016-01-16 23:18:13 +01:00
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
8e5b5a5c07
Merge branch '3.1.x'
2016-01-16 23:10:37 +01:00
8e584dfa6b
Merge pull request #4077 from Nicofuma/ticket/14306
...
[ticket/14306] Automatically enable a safe mode when container building fails
2016-01-15 18:13:34 +01:00
fef03a1946
[ticket/14412] Comment fixes for PHPDoc in the events
...
PHPBB3-14412
2016-01-15 14:07:50 +03:00
b34dbc2e84
[ticket/12441] Correct database size detection in MariaDB 10
...
PHPBB3-12441
2016-01-14 12:29:17 +03:00
68d945e931
Merge branch '3.1.x'
2016-01-12 04:31:15 +01:00
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
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
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
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
78349ed80f
[ticket/14306] Automatically enable a safe mode when container building fails
...
PHPBB3-14306
2016-01-09 15:35:17 +01:00
89da4e8bf7
[prep-release-3.1.7] Update version to 3.1.7-pl1
2016-01-09 09:35:03 +01:00
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
80c32fb7ef
[ticket/14343] Added missing $phpbb_dispatcher
...
PHPBB3-14343
2016-01-09 09:13:20 +01:00
c6c7730e04
Merge branch '3.1.x'
2016-01-08 17:57:05 +01:00
a7648b0eaa
[ticket/14397] Fix @since tag in event 'core.ucp_prefs_view_after'
...
PHPBB3-14397
2016-01-08 17:04:18 +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
2ab7b12419
Merge pull request #4112 from marc1706/ticket/13180
...
[ticket/13180] Increase dateformat field size
2016-01-08 16:39:03 +01:00
b6fee9f536
Merge branch '3.1.x'
2016-01-08 16:06:46 +01:00
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
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
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
3b9a9bb04a
[ticket/13454] Remove double semi-colons
...
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
915a141fc2
[ticket/13454] Fix code sniffer complaints
...
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
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
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
d0adbe94d5
Merge branch '3.1.x'
...
Conflicts:
phpBB/includes/mcp/mcp_main.php
2016-01-06 13:31:15 +01:00
e75c04f02a
Merge pull request #4109 from marc1706/ticket/14343
...
[ticket/14343] Added missing $phpbb_dispatcher
2016-01-06 13:30:20 +01:00
ea6bcdff52
Merge branch '3.1.x'
2016-01-06 13:26:23 +01:00
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
a021956644
[ticket/14343] Added missing $phpbb_dispatcher
...
PHPBB3-14343
2016-01-06 11:38:22 +01:00
73ca420029
[ticket/14386] Use of sys_get_temp_dir()
...
PHPBB3-14386
2016-01-03 10:01:00 +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
87345807de
[ticket/security-188] Remove unused form key from acp_extensions
...
SECURITY-188
2015-12-23 17:32:31 +01:00
18abef716e
[ticket/security-188] Check form key in acp_bbcodes
...
SECURITY-188
2015-12-23 17:31:43 +01:00
554b90b59f
[release-3.2.0-a2] Update version to 3.2.0-a3
2015-12-19 17:34:46 +01:00
6b09dbe16c
[prep-release-3.2.0-a2] Update version to 3.2.0-a2
2015-12-19 17:17:01 +01:00
4ec32592a4
[prep-release-3.1.7] Increase version to 3.1.7
2015-12-19 12:21:04 +01:00
1de3ede399
[3.1.x] Update version to 3.1.8-dev
2015-12-12 15:19:47 +01:00
d2acccf92c
[prep-release-3.1.7] Update version to 3.1.7-RC1
2015-12-12 01:31:31 +01:00
18377d63ee
Merge pull request #4074 from marc1706/ticket/14349
...
[ticket/14349] Improve error messages and remove output of suppressed messages
2015-12-09 19:14:48 +01:00
416b25b324
[ticket/14350] Remove duplicate semi-colon in functions_user
...
PHPBB3-14350
2015-12-08 23:20:25 +01:00
2d3e340f19
[ticket/14349] Suppress output due to duplicate definition in installer
...
PHPBB3-14349
2015-12-08 22:14:25 +01:00
8ef8f49c9a
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/14213] Add pending to core.group_add_user_after
[ticket/14213] Mv event group_add_user_after after cache cleaning
[ticket/14213] Fix version number
[ticket/14213] Adding missing reference to event dispatcher
[ticket/14213] Adding event after users have been added to a group
2015-12-08 19:47:20 +01:00
