mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 04:52:36 +01:00
Code Issues Releases Wiki Activity
27,519 Commits 17 Branches 190 Tags
Commit Graph

27519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JoshyPHP
eb6ceb963e [ticket/14323] Added support for truncating long URLs 
PHPBB3-14323
 2015-12-26 14:19:22 +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 release-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
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
Wardormeur
2419f63aab [ticket/14213] Adding missing reference to event dispatcher 
Required to dispatch event, wasn't included into global

PHPBB3-14213
 2015-12-07 22:34:59 +01:00
Wardormeur
20e26a3920 [ticket/14213] Adding event after users have been added to a group 
Allow mapping with others CMS by exposing user configuration & changes

PHPBB3-14213
 2015-12-07 22:34:25 +01:00
Matt Friedman
d9d89cad94 [ticket/14247] Use quotes around @ and % strings in YAML 
PHPBB3-14247
 2015-12-07 13:11:22 -08:00
Tristan Darricau
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
Tristan Darricau
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
Tristan Darricau
91df35e81e Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14346] Do not turn version red if update status is unknown
 2015-12-07 21:42:17 +01:00
Tristan Darricau
a4c1daa259 Merge pull request #4069 from marc1706/ticket/14346 
[ticket/14346] Do not turn version red if update status is unknown

* marc1706/ticket/14346:
  [ticket/14346] Do not turn version red if update status is unknown
 2015-12-07 21:42:13 +01:00
Tristan Darricau
c5d286e3fb Merge branch '3.1.x' 
* 3.1.x:
 2015-12-07 21:38:53 +01:00
Tristan Darricau
fd533f4214 Merge pull request #4064 from marc1706/ticket/14339-master 
[ticket/14339] Properly state PHP version support

* marc1706/ticket/14339-master:
  [ticket/14339] Specify that PHP 7.0 is supported instead of "prior versions"
  [ticket/14339] Properly state PHP version support
 2015-12-07 21:38:48 +01:00
Tristan Darricau
ab8dc92d26 Merge pull request #4063 from marc1706/ticket/14339 
[ticket/14339] Properly state PHP version support

* marc1706/ticket/14339:
  [ticket/14339] Properly state PHP version support
 2015-12-07 21:38:37 +01:00
Marc Alexander
61255a8982 [ticket/14339] Specify that PHP 7.0 is supported instead of "prior versions" 
PHPBB3-14339
 2015-12-07 21:35:23 +01:00
Marc Alexander
1dba763e09 Merge branch 'ticket/14339' into ticket/14339-master 
Conflicts:
	phpBB/composer.json
	phpBB/docs/INSTALL.html
	phpBB/docs/README.html
 2015-12-07 21:33:59 +01:00
Tristan Darricau
434a04344e Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14343] Add event when locking/unlocking posts/topics
 2015-12-07 21:06:39 +01:00
Tristan Darricau
07ae3e997c Merge pull request #4066 from kasimi/ticket/14343 
[ticket/14343] Add event when locking/unlocking posts/topics

* kasimi/ticket/14343:
  [ticket/14343] Add event when locking/unlocking posts/topics
 2015-12-07 21:06:22 +01:00
Tristan Darricau
f08c774485 Merge pull request #4068 from marc1706/ticket/14310 
[ticket/14310] Put progress percentage inside span and make more visible

* marc1706/ticket/14310:
  [ticket/14310] Put progress percentage inside span and make more visible
 2015-12-07 21:05:03 +01:00
Tristan Darricau
5285f22442 Merge pull request #4067 from marc1706/ticket/14345 
[ticket/14345] Check if description exists in message ary

* marc1706/ticket/14345:
  [ticket/14345] Move new line to ternary comparison
  [ticket/14345] Check if description exists in message ary
 2015-12-07 20:58:34 +01:00
Marc Alexander
4a92b85cad [ticket/14346] Do not turn version red if update status is unknown 
PHPBB3-14346
 2015-12-07 20:00:13 +01:00
Marc Alexander
41b4fee655 [ticket/14345] Move new line to ternary comparison 
PHPBB3-14345
 2015-12-07 16:59:04 +01:00