mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity
28,742 Commits 17 Branches 190 Tags
Commit Graph

28742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kasimi
eceb36a546
[ticket/15035] Add phpinfo.php to 3.2.x install directory 
In 3.1.x there's a phpinfo.php in the /install folder which seems to be removed in 3.2.x, perhaps by accident?
https://github.com/phpbb/phpbb/commits/3.2.x/phpBB/install/phpinfo.php
Let's add it back for easier troubleshooting potential issues during installation.

PHPBB3-15035
 2017-01-20 22:09:42 +01:00
Marc Alexander
84a8cf00ad
Merge branch '3.1.x' into 3.2.x 2016-10-12 21:43:35 +02:00
Marc Alexander
1dd0ceabf6
Merge branch 'prep-release-3.1.10' into 3.1.x 2016-10-12 21:40:59 +02:00
Marc Alexander
322b86da1f
Merge pull request #4476 from Nicofuma/ticket/14807 
[ticket/14807] Updates dependencies
 2016-10-10 21:30:13 +02:00
Tristan Darricau
b2711371f1
[ticket/14807] s9e/textformatter 0.8.1 
PHPBB3-14807
 2016-10-10 20:07:33 +02:00
Tristan Darricau
35ad0f1249
[ticket/14807] Fix tests after symfony upgrade 
PHPBB3-14807
 2016-10-09 22:13:58 +02:00
Tristan Darricau
82105070ad
[ticket/14807] Updates s9e textformatter again 
PHPBB3-14807
 2016-10-09 22:10:16 +02:00
Tristan Darricau
1100db7e86
[ticket/14807] Updates paragonie/random_compat 
PHPBB3-14807
 2016-10-09 22:03:50 +02:00
Marc Alexander
8ce95413aa
Merge pull request #4478 from Nicofuma/ticket/14813 
[ticket/14813] Add missing functions_compatibiity in phpbbcli
 2016-10-09 15:58:31 +02:00
Tristan Darricau
4d4d3824f3
[ticket/14813] Add missing functions_compatibiity in phpbbcli 
PHPBB3-14813
 2016-10-09 10:47:56 +02:00
Tristan Darricau
7bb4e88acd
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14802] Add test for empty/blank lines in poll options
  [ticket/14802] Empty/blank lines should not be additional poll options
 2016-10-03 20:20:54 +02:00
Tristan Darricau
1ad64f89b8
Merge pull request #4471 from dsinn/ticket/14802 
[ticket/14802] Empty/blank lines should not be additional poll options

* dsinn/ticket/14802:
  [ticket/14802] Add test for empty/blank lines in poll options
  [ticket/14802] Empty/blank lines should not be additional poll options
 2016-10-03 20:05:49 +02:00
Daniel Sinn
bf8ee698f9 [ticket/14802] Add test for empty/blank lines in poll options 
PHPBB3-14802
 2016-10-03 12:24:02 -04:00
Marc Alexander
40354f1f90
Merge pull request #27 from phpbb/ticket/security-196 
[ticket/security-196] Escapes the exception messages before displaying them
release-3.1.10 		2016-10-02 22:25:30 +01:00
Marc Alexander
71e632b9f0
[prep-release-3.1.10] Add 3.1.10 migration 2016-10-02 21:07:18 +01:00
Marc Alexander
cb226f83be
[prep-release-3.1.10] Update version numbers for 3.1.10 2016-10-02 21:06:56 +01:00
Tristan Darricau
4c60995d7a
[ticket/14807] Updates everything else 
PHPBB3-14807
 2016-10-02 19:40:49 +02:00
Tristan Darricau
7a5fbd0257
[ticket/14807] Updates Twig 
PHPBB3-14807
 2016-10-02 19:24:45 +02:00
Tristan Darricau
b28fe0a7fa
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14786] Add mcp_forum_actions_before/after events
 2016-10-02 18:12:53 +02:00
Tristan Darricau
85e4566223
Merge pull request #4467 from Senky/ticket/14786 
[ticket/14786] Add mcp_forum_actions_before/after events

* Senky/ticket/14786:
  [ticket/14786] Add mcp_forum_actions_before/after events
 2016-10-02 18:11:48 +02:00
Tristan Darricau
722fe0ca48
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters
 2016-10-02 18:08:10 +02:00
Tristan Darricau
55a0570567
Merge pull request #4469 from rxu/ticket/14787-2 
[ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters

* rxu/ticket/14787-2:
  [ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters
 2016-10-02 18:08:09 +02:00
Tristan Darricau
89a564adb2
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14801] Highlighting utf8 strings in search results
 2016-10-02 17:43:55 +02:00
Tristan Darricau
b4e673acc1
Merge pull request #4470 from rxu/ticket/14801 
[ticket/14801] Highlighting utf8 strings in search results

* rxu/ticket/14801:
  [ticket/14801] Highlighting utf8 strings in search results
 2016-10-02 17:43:55 +02:00
Tristan Darricau
5075090d4f
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14789] Remove obsolete check_form_key() and add missing hashes
  [ticket/14789] Move form key checks to where they actually do something
 2016-10-02 17:18:32 +02:00
Tristan Darricau
cd4190a72d
Merge pull request #4474 from marc1706/ticket/14789 
[ticket/14789] Move form key checks to where they actually do something

* marc1706/ticket/14789:
  [ticket/14789] Remove obsolete check_form_key() and add missing hashes
  [ticket/14789] Move form key checks to where they actually do something
 2016-10-02 17:18:22 +02:00
Tristan Darricau
6b798d02fb
Merge branch 'prep-release-3.1.10' into 3.1.x 
* prep-release-3.1.10:
  [ticket/14789] Remove obsolete check_form_key() and add missing hashes
  [ticket/14789] Move form key checks to where they actually do something
 2016-10-02 17:18:22 +02:00
Tristan Darricau
78333e300c
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14805] Ignore platform requirements while building packages
 2016-10-02 17:14:52 +02:00
Tristan Darricau
cdaed8dabf
Merge pull request #4475 from marc1706/ticket/14805 
[ticket/14805] Ignore platform requirements while building packages

* marc1706/ticket/14805:
  [ticket/14805] Ignore platform requirements while building packages
  [ticket/8301] Add log_time index
 2016-10-02 17:14:49 +02:00
Tristan Darricau
165e0edb2a
Merge branch 'prep-release-3.1.10' into 3.1.x 
* prep-release-3.1.10:
  [ticket/14805] Ignore platform requirements while building packages
 2016-10-02 17:14:49 +02:00
Marc Alexander
328a7afcc3
Merge branch '3.1.x' into 3.2.x 2016-10-01 16:58:07 +01:00
Marc Alexander
5a6933fee7
Merge pull request #4466 from Senky/ticket/14795 
[ticket/14795] Merge topic views when merging topics
 2016-10-01 16:58:02 +01:00
Marc Alexander
047c7375a5
[ticket/14805] Ignore platform requirements while building packages 
PHPBB3-14805
 2016-10-01 16:46:48 +01:00
Marc Alexander
57fc321c4d
Merge branch '3.1.x' into 3.2.x 2016-10-01 11:07:43 +01:00
Marc Alexander
f1eda6868f
Merge pull request #4465 from Senky/ticket/8301 
[ticket/8301] Add log_time index
 2016-10-01 11:07:40 +01:00
Marc Alexander
4e5f29a21b
[ticket/14789] Remove obsolete check_form_key() and add missing hashes 
PHPBB3-14789
 2016-09-30 23:26:04 +01:00
Marc Alexander
88d7c4fe57
[ticket/14789] Move form key checks to where they actually do something 
PHPBB3-14789
 2016-09-30 22:32:54 +01:00
Marc Alexander
e362ff1f3c
Merge pull request #4473 from rxu/ticket/14799-1 
[ticket/14799] Remove accidentally added whitespaces into 3.2.x and master
 2016-09-30 21:49:22 +01:00
rxu
5b32019ad6 [ticket/14799] Remove accidentally added whitespaces into 3.2.x and master 
PHPBB3-14799
 2016-10-01 02:59:17 +07:00
Daniel Sinn
0b3951cb81 [ticket/14802] Empty/blank lines should not be additional poll options 
PHPBB3-14802
 2016-09-29 14:43:36 -04:00
rxu
ae76bfc99e [ticket/14801] Highlighting utf8 strings in search results 
PHPBB3-14801
 2016-09-29 17:18:58 +07:00
rxu
cc62b68243 [ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters 
PHPBB3-14787
 2016-09-29 01:59:16 +07:00
Tristan Darricau
737ef92a1e
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14799] purge_notifications() should not leave open transactions.
 2016-09-28 20:56:51 +02:00
Tristan Darricau
6972d06f59
Merge branch 'prep-release-3.1.10' into 3.1.x 
* prep-release-3.1.10:
  [ticket/14799] purge_notifications() should not leave open transactions.
 2016-09-28 20:53:10 +02:00
Tristan Darricau
2fd2fb94cf
Merge pull request #4468 from markshawtoronto/ticket/14799 
[ticket/14799] purge_notifications() should not leave open transactions.

* markshawtoronto/ticket/14799:
  [ticket/14799] purge_notifications() should not leave open transactions.
  [3.1.x] Increase version for 3.1.11 development
 2016-09-28 20:50:06 +02:00
markshawtoronto
06c980f1ec [ticket/14799] purge_notifications() should not leave open transactions. 
When running purge_notifications(), if a notification type does not exist
then a db transaction is started but never completed.

On an error in get_notification_type_id(), end the transaction.

PHPBB3-14799
 2016-09-27 11:45:23 -04:00
Jakub Senko
f66ca6a9cc [ticket/14786] Add mcp_forum_actions_before/after events 
PHPBB3-14786
 2016-09-26 11:13:11 +02:00
Jakub Senko
ec24f739e8 [ticket/8301] Add log_time index 
PHPBB3-8301
 2016-09-25 19:51:37 +02:00
Jakub Senko
c588332aa5 [ticket/14795] Merge topic views when merging topics 
PHPBB3-14795
 2016-09-25 19:49:01 +02:00
Tristan Darricau
ef755ffd38
Merge pull request #4463 from marc1706/ticket/14797 
[ticket/14797] Support PHP 7.1 and clearly state support for latest versions

* marc1706/ticket/14797:
  [ticket/14797] Support PHP 7.1 and clearly state support for latest versions
 2016-09-25 17:22:26 +02:00