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
Marc Alexander
96bd531701
Merge pull request #4087 from VSEphpbb/ticket/14368
...
[ticket/14368] Fix color of post editor input boxes
2015-12-20 11:03:44 +01:00
Matt Friedman
11ad71b381
[ticket/14368] Fix color of post editor input boxes
...
https://tracker.phpbb.com/browse/PHPBB3-14368
PHPBB3-14368
2015-12-19 10:29:22 -08:00
Tristan Darricau
5bbb6e1215
Merge pull request #4083 from RMcGirr83/ticket_14362
...
[ticket/14362] Missing lang var in install file
* RMcGirr83/ticket_14362:
[ticket/14362] Missing lang var in install file
2015-12-19 18:17:32 +01:00
Tristan Darricau
554b90b59f
[release-3.2.0-a2] Update version to 3.2.0-a3
2015-12-19 17:34:46 +01:00
Tristan Darricau
e23b48490c
Merge branch 'prep-release-3.2.0-a2'
...
* prep-release-3.2.0-a2:
[prep-release-3.2.0-a2] Add changelog for 3.2.0-a2
[prep-release-3.2.0-a2] Add migration for 3.2.0-a2
[prep-release-3.2.0-a2] Update version to 3.2.0-a2
2015-12-19 17:32:28 +01:00
Tristan Darricau
7381e99517
[prep-release-3.2.0-a2] Add changelog for 3.2.0-a2
2015-12-19 17:17:01 +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
Tristan Darricau
6b09dbe16c
[prep-release-3.2.0-a2] Update version to 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
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
Joas Schilling
e3acdfed92
[prep-release-3.1.7] Add migration to update the version
2015-12-19 12:21:25 +01:00
Joas Schilling
4ec32592a4
[prep-release-3.1.7] Increase version to 3.1.7
2015-12-19 12:21:04 +01:00
rxu
33db45edac
[ticket/14356] Add template events to viewtopic around back2top link
...
PHPBB3-14356
2015-12-17 23:18:37 +07:00
Scott Dutton
7ebbc69dbd
[ticket/14046] Jabber message incorrect
...
When making a Jabber message, the page says the message has been sent
when loading the page for the first time, This message should only be
shown after the message has actually been sent
PHPBB3-14046
2015-12-16 22:15:29 +00:00
Richard McGirr
6eaeb7ebef
[ticket/14362] Missing lang var in install file
...
PHPBB3-14362
2015-12-16 06:42:37 -05:00
Tristan Darricau
6ffbd26377
[ticket/14177] CS
...
PHPBB3-14177
2015-12-15 19:55:55 +01:00
Máté Bartus
28969511d2
Merge pull request #4081 from Nicofuma/ticket/14359
...
[ticket/14359] Fix console.command.reparser.reparse service definition
2015-12-14 22:34:58 +01:00
Tristan Darricau
3d6a6200d8
[ticket/14359] Fix console.command.reparser.reparse service definition
...
PHPBB3-14359
2015-12-14 22:32:16 +01:00
Máté Bartus
60587d77bb
Merge pull request #4080 from Nicofuma/ticket/14358
...
[ticket/14358] Includes the composer autoloader in create_schema_files.php
2015-12-14 22:16:32 +01:00
Tristan Darricau
54d3d4be30
[ticket/14358] Includes the composer autoloader in create_schema_files.php
...
PHPBB3-14358
2015-12-14 22:13:23 +01:00
Marc Alexander
71738ff099
Merge branch '3.1.x'
2015-12-13 11:19:01 +01:00
Marc Alexander
67f3017274
Merge pull request #4078 from VSEphpbb/ticket/14353
...
[ticket/14353] Complete [list] bbcode documentation/examples
2015-12-13 11:18:53 +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
Joas Schilling
1de3ede399
[3.1.x] Update version to 3.1.8-dev
2015-12-12 15:19:47 +01:00
Joas Schilling
c5a7643b72
Merge branch 'prep-release-3.1.7' into 3.1.x
2015-12-12 15:17:26 +01:00
Matt Friedman
627488da5b
[ticket/14353] Complete [list] bbcode documentation/examples
...
PHPBB3-14353
2015-12-11 17:14:22 -08:00
Joas Schilling
099a1b5f75
[prep-release-3.1.7] Add changelog for 3.1.7-RC1
2015-12-12 01:37:56 +01:00
Joas Schilling
69cf32613d
[prep-release-3.1.7] Add migration for 3.1.7-RC1
2015-12-12 01:35:05 +01:00
Joas Schilling
d2acccf92c
[prep-release-3.1.7] Update version to 3.1.7-RC1
2015-12-12 01:31:31 +01:00
Tristan Darricau
dee22f4a28
[ticket/14177] Uses Symfony's Debug ErrorHandler in development environment
...
PHPBB3-14177
2015-12-11 21:05:53 +01:00
Máté Bartus
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
Tristan Darricau
7c05b881c5
Merge pull request #4075 from marc1706/ticket/14350
...
[ticket/14350] Remove duplicate semi-colon in functions_user
* marc1706/ticket/14350:
[ticket/14350] Remove duplicate semi-colon in functions_user
2015-12-08 23:38:56 +01:00
Marc Alexander
416b25b324
[ticket/14350] Remove duplicate semi-colon in functions_user
...
PHPBB3-14350
2015-12-08 23:20:25 +01:00
Marc Alexander
2d3e340f19
[ticket/14349] Suppress output due to duplicate definition in installer
...
PHPBB3-14349
2015-12-08 22:14:25 +01:00
Marc Alexander
d99927d3a6
[ticket/14349] Add cli error message on missing or invalid data
...
PHPBB3-14349
2015-12-08 21:21:05 +01:00
Marc Alexander
3910ffd664
[ticket/14349] Do output suppressed errors
...
PHPBB3-14349
2015-12-08 20:34:10 +01:00
Tristan Darricau
4bcec475fe
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/14271] Properly use try_files in nginx sample config
[ticket/14271] Improve try_files and use split path info
[ticket/14271] Update sample config
2015-12-08 19:48:12 +01:00
Tristan Darricau
901785bc5e
Merge pull request #4018 from marc1706/ticket/14271
...
[ticket/14271] Update sample config
* marc1706/ticket/14271:
[ticket/14271] Properly use try_files in nginx sample config
[ticket/14271] Improve try_files and use split path info
[ticket/14271] Update sample config
2015-12-08 19:48:02 +01:00
Tristan Darricau
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
Tristan Darricau
81b3b38795
Merge pull request #4071 from marc1706/ticket/14213
...
[ticket/14213] Adding event after users have been added to a group
* marc1706/ticket/14213:
[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:46:34 +01:00
Tristan Darricau
9130f20cb6
Merge pull request #4072 from marc1706/ticket/14344
...
[ticket/14344] Improve output of HTML errors trigged during install
* marc1706/ticket/14344:
[ticket/14344] Improve output of HTML errors trigged during install
2015-12-08 19:45:43 +01:00
Marc Alexander
398590b7ab
Merge pull request #4073 from CHItA/ticket/14348
...
[ticket/14348] Add install/index.html
2015-12-08 19:02:45 +01:00
Mate Bartus
0229eb971d
[ticket/14348] Add install/index.html
...
PHPBB3-14348
2015-12-08 16:22:03 +01:00
Marc Alexander
0933338480
Merge pull request #4070 from VSEphpbb/ticket/14247
...
[ticket/14247] Use quotes around @ and % strings in YAML
2015-12-08 15:40:49 +01:00
Marc Alexander
d37d3ed3ed
[ticket/14213] Add pending to core.group_add_user_after
...
PHPBB3-14213
2015-12-08 15:32:45 +01:00
Marc Alexander
6188a87779
[ticket/14344] Improve output of HTML errors trigged during install
...
PHPBB3-14344
2015-12-07 23:36:49 +01:00
Wardormeur
e6d3ed5529
[ticket/14213] Mv event group_add_user_after after cache cleaning
...
In order to match with the rest of the event and to have appropriate info state
PHPBB3-14213
2015-12-07 22:35:08 +01:00
Wardormeur
ffbc2d02d7
[ticket/14213] Fix version number
...
for core.group_add_user_after event
PHPBB3-14213
2015-12-07 22:35:04 +01:00
