makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-19 01:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
30449 commits 18 branches 192 tags 207 MiB
Commit graph

30449 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Mate Bartus
02a9264780 [ticket/14269] Fix comments and language var names 
PHPBB3-14269
 2015-12-03 20:31:49 +01:00
Marc Alexander
91869cc43c [ticket/14334] Use phpbb_get_avatar() in user_loader 
PHPBB3-14334
 2015-12-03 16:43:00 +01:00
Marc Alexander
7705017f63 [ticket/14272] Make sure phpbb_avatar_manager was defined 
PHPBB3-14272
 2015-12-03 11:58:53 +01:00
Marc Alexander
b0dfca1dbf Merge pull request #4051 from CHItA/ticket/14311 
[ticket/14311] Show errors in installer invoked by trigger_error
 2015-12-03 10:52:32 +01:00
Marc Alexander
5d0e8eaf09 Merge pull request #4055 from CHItA/ticket/14326 
[ticket/14326] Decode diffed file's content during update
 2015-12-03 09:02:15 +01:00
Mate Bartus
e95414ed54 [ticket/14326] Decode diffed file's content during update 
PHPBB3-14326
 2015-12-02 12:16:32 +01:00
Mate Bartus
d1fc8f79e7 [ticket/14311] Use the iohandler for notices and warnings if possible 
PHPBB3-14311
 2015-12-01 18:50:20 +01:00
Marc Alexander
c2dddf296d Merge pull request #4053 from CHItA/ticket/14320 
[ticket/14320] Fix language selector in the installer
 2015-12-01 14:35:53 +01:00
Marc Alexander
d91762202a Merge pull request #4054 from CHItA/ticket/14325 
[ticket/14325] Preserve event variable BC
 2015-12-01 13:20:11 +01:00
Mate Bartus
fad26c97bc [ticket/14325] Fix variable names in docblocks 
PHPBB3-14325
 2015-11-30 18:27:06 +01:00
Mate Bartus
065b0a632f [ticket/14325] Preserve event variable BC 
PHPBB3-14325
 2015-11-30 18:05:46 +01:00
Mate Bartus
151535fdaf [ticket/14311] Show errors in installer invoked by trigger_error 
PHPBB3-14311
 2015-11-30 13:50:29 +01:00
Mate Bartus
4aac878ec7 [ticket/14320] Fix language selector in the installer 
PHPBB3-14320
 2015-11-29 15:49:18 +01:00
Joas Schilling
0c66d4816a [ticket/14317] Make it easier to change the language iso tag 
PHPBB3-14317
 2015-11-28 11:36:05 +01:00
Joas Schilling
941d138650 [ticket/14317] Run the script again 
PHPBB3-14317
 2015-11-28 11:34:55 +01:00
Mate Bartus
93b37b24c2 [ticket/14269] Use http_exceptions in the installer instead of die() 
PHPBB3-14269
 2015-11-27 14:50:21 +01:00
Marc Alexander
1316fe2084 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_group.html
 2015-11-26 14:45:36 +01:00
Marc Alexander
8899829752 Merge pull request #4030 from RMcGirr83/ticket_14283 
[ticket/14283] Add a Manage Group link on a group page
 2015-11-26 14:44:51 +01:00
Marc Alexander
9d4f52a5eb Merge branch '3.1.x' 2015-11-26 14:27:57 +01:00
Marc Alexander
1a367062d3 Merge pull request #4045 from RMcGirr83/ticket_14313 
[ticket/14313] Check for item approved explicitly
 2015-11-26 14:27:54 +01:00
Richard McGirr
4966d6c913 [ticket/14313] Check for item approved explicitly 
PHPBB3-14313
 2015-11-26 05:23:18 -05:00
Marc Alexander
e487ef42a2 Merge branch '3.1.x' 2015-11-25 21:06:54 +01:00
Marc Alexander
ea9b97c8a1 Merge pull request #4044 from RMcGirr83/ticket_14313 
[ticket/14313] Don't display quote button on unapproved posts
 2015-11-25 21:06:50 +01:00