Marc Alexander
|
6e465c01bf
|
[ticket/14419] Update composer dependencies and lock file
PHPBB3-14419
|
2016-01-18 21:39:51 +01:00 |
|
Marc Alexander
|
a30ecb81f8
|
Merge branch '3.1.x'
|
2016-01-17 23:28:33 +01: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
|
a98f12d1fc
|
Merge branch '3.1.x'
|
2016-01-16 23:18:13 +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
|
8e5b5a5c07
|
Merge branch '3.1.x'
|
2016-01-16 23:10:37 +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 |
|
Marc Alexander
|
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 |
|
lavigor
|
fef03a1946
|
[ticket/14412] Comment fixes for PHPDoc in the events
PHPBB3-14412
|
2016-01-15 14:07:50 +03:00 |
|
Marc Alexander
|
97e002cc3d
|
Merge branch '3.1.x'
Conflicts:
phpBB/phpbb/log/log.php
|
2016-01-15 11:18:13 +01: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 |
|
Marc Alexander
|
254291b644
|
Merge pull request #4123 from lavigor/ticket/13442
[ticket/13442] UTF-8 symbols for database host
|
2016-01-15 11:11:44 +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
|
ef09b562db
|
[ticket/13442] UTF-8 symbols for database host
PHPBB3-13442
|
2016-01-14 15:38:14 +03:00 |
|
lavigor
|
b34dbc2e84
|
[ticket/12441] Correct database size detection in MariaDB 10
PHPBB3-12441
|
2016-01-14 12:29:17 +03:00 |
|
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 |
|
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
|
549e91354d
|
Merge pull request #4118 from JoshyPHP/ticket/14405
[ticket/14405] Force a lookahead check on [URL] BBCodes
|
2016-01-12 17:32:14 +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 |
|
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
|
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
|
1e0340b0cf
|
[ticket/14306] Improves Error display
PHPBB3-14306
|
2016-01-09 18:03:21 +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
|
81cbabc1f6
|
Merge branch '3.1.x'
|
2016-01-09 16:30:43 +01:00 |
|
Marc Alexander
|
a86a6926ee
|
Merge pull request #4098 from Nicofuma/ticket/14382-master
[ticket/14382] Specify the branch-alias in the composer.json files
|
2016-01-09 16:30:42 +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
|
c1eb721650
|
Merge branch 'ticket/14382' into ticket/14382-master
* ticket/14382:
[ticket/14382] Specify the branch-alias in the composer.json files
|
2016-01-09 15:39:26 +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 |
|
Tristan Darricau
|
6594ef8b1e
|
[ticket/14306] CS and correctly handle exception loop
PHPBB3-14306
|
2016-01-09 15:35:17 +01:00 |
|
Tristan Darricau
|
7f8b6c02c6
|
[ticket/14306] Update the error message
PHPBB3-14306
|
2016-01-09 15:35:17 +01:00 |
|
Tristan Darricau
|
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 |
|
Tristan Darricau
|
78349ed80f
|
[ticket/14306] Automatically enable a safe mode when container building fails
PHPBB3-14306
|
2016-01-09 15:35:17 +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
|
f6524f4902
|
Merge branch '3.1.x'
|
2016-01-08 18:22:40 +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
|
c6c7730e04
|
Merge branch '3.1.x'
|
2016-01-08 17:57:05 +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 |
|