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

27500 Commits

Author SHA1 Message Date
Marc Alexander
416b25b324 [ticket/14350] Remove duplicate semi-colon in functions_user
PHPBB3-14350
2015-12-08 23:20:25 +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
Marc Alexander
d7317c9b25 [ticket/14310] Put progress percentage inside span and make more visible
PHPBB3-14310
2015-12-07 16:51:39 +01:00
Marc Alexander
1b9ae803c5 [ticket/14345] Check if description exists in message ary
PHPBB3-14345
2015-12-07 13:53:44 +01:00
Tristan Darricau
a740befb02 Merge pull request #4046 from CHItA/ticket/14269
[ticket/14269] Use http_exceptions in the installer instead of die()

* CHItA/ticket/14269:
  [ticket/14269] Change HTTP status codes to 403
  [ticket/14269] Fix comments and language var names
  [ticket/14269] Use http_exceptions in the installer instead of die()
2015-12-07 00:28:20 +01:00
Tristan Darricau
d0779e6fda Merge pull request #4065 from michaelcullum/ticket/14341
[ticket/14341] Update dependencies to Symfony 2.8 stable

* michaelcullum/ticket/14341:
  [ticket/14341] Update dependencies to Symfony 2.8 stable
2015-12-06 20:30:20 +01:00
kasimi
94c073672d [ticket/14343] Add event when locking/unlocking posts/topics
PHPBB3-14343
2015-12-06 20:05:27 +01:00
MichaelC
d9b107d2a3 [ticket/14341] Update dependencies to Symfony 2.8 stable
PHPBB3-14341
2015-12-06 16:21:14 +01:00
Mate Bartus
44a90c9812 [ticket/14269] Change HTTP status codes to 403
PHPBB3-14269
2015-12-05 15:42:22 +01:00
Marc Alexander
e8247faacc [ticket/14339] Properly state PHP version support
PHPBB3-14339
2015-12-05 13:54:39 +01:00
Tristan Darricau
ecb98ce81f Merge pull request #4006 from brunoais/feature/sql-bool-builder
[feature/sql-bool-builder] New syntax for DBAL query builder for boolean generation

* brunoais/feature/sql-bool-builder:
  [feature/sql-bool-builder] Fixing misuse of LOGICAL_OP instead of STATEMENTS
  [feature/sql-bool-builder] Fixing typos in previous commit
  [feature/sql-bool-builder] Changing syntax pt3. Don't use magic numbers
  [feature/sql-bool-builder] Changing syntax pt2. Fix tests
  [feature/sql-bool-builder] Changing syntax
2015-12-05 11:23:27 +01:00
Tristan Darricau
b4bbc7056a Merge pull request #4005 from Elsensee/ticket/14257
[ticket/14257] Reparse after update

* Elsensee/ticket/14257:
  [ticket/14257] Add tests for reparser manager
  [ticket/14257] Fix CLI reparser and set cron interval
  [ticket/14257] Fix CLI error message
  [ticket/14257] Fix phpdoc in CLI command
  [ticket/14257] Add text_reparser manager
  [ticket/14257] Use migrations instead of cron job for some reparsers
  [ticket/14257] Fix lock acquire in CLI command
  [ticket/14257] Fix if condition
  [ticket/14257] Add reparse_lock to CLI command
  [ticket/14257] Add cron tasks for reparsing text
2015-12-05 11:21:40 +01:00
Tristan Darricau
cfd0ec7e09 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14334] Use phpbb_get_avatar() in user_loader
2015-12-05 11:07:29 +01:00
Tristan Darricau
7eef7b2ea2 Merge pull request #4057 from marc1706/ticket/14334
[ticket/14334] Use phpbb_get_avatar() in user_loader

* marc1706/ticket/14334:
  [ticket/14334] Use phpbb_get_avatar() in user_loader
2015-12-05 11:02:55 +01:00
Tristan Darricau
7afc7ba3b4 Merge pull request #4050 from nickvergessen/ticket/14317
Ticket/14317 Update language help files

* nickvergessen/ticket/14317:
  [ticket/14317] Make it easier to change the language iso tag
  [ticket/14317] Run the script again
2015-12-05 11:01:42 +01:00
Tristan Darricau
0b5f4922e1 Merge pull request #4060 from rxu/ticket/14340
[ticket/14340] Revert fix for segmentation fault error on phpBB 3.2 PHP7 tests

* rxu/ticket/14340:
  [ticket/14340] Revert fix for segmentation fault error on phpBB 3.2 PHP7 tests
2015-12-05 10:58:45 +01:00
Tristan Darricau
79ee7f3641 Merge pull request #4061 from JoshyPHP/ticket/9791
[ticket/9791] Added regression test

* JoshyPHP/ticket/9791:
  [ticket/9791] Added regression test
2015-12-05 10:56:32 +01:00
Tristan Darricau
c1543618f8 Merge pull request #4062 from JoshyPHP/ticket/13451
[ticket/13451] Added regression test

* JoshyPHP/ticket/13451:
  [ticket/13451] Added regression test
2015-12-05 10:55:34 +01:00
JoshyPHP
4b8acefc6c [ticket/13451] Added regression test
PHPBB3-13451
2015-12-05 09:53:26 +01:00
JoshyPHP
ba83745795 [ticket/9791] Added regression test
PHPBB3-9791
2015-12-05 08:05:43 +01:00
rxu
8916072a2a [ticket/14340] Revert fix for segmentation fault error on phpBB 3.2 PHP7 tests
The fix was introduces with #3826, now the PHP core bug has been fixed:
https://bugs.php.net/bug.php?id=70249

PHPBB3-14340
2015-12-05 00:01:27 +07:00