mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-29 14:36:28 +01:00
Code Issues Releases Wiki Activity
28,974 Commits 10 Branches 193 Tags
e030ddc1b28057e0ea0073a1e181644647c776e9
Commit Graph

24520 Commits

Author SHA1 Message Date
Máté Bartus
e030ddc1b2 Merge branch '3.2.x' 2016-10-20 18:35:40 +02:00
Máté Bartus
fd7244c892 Merge branch '3.1.x' into 3.2.x 2016-10-20 18:34:59 +02:00
Marc Alexander
d98a1c4bc4 [ticket/14821] Simplify regex for converting <strong> tags back to HTML 
PHPBB3-14821
 2016-10-18 22:07:54 +02:00
Marc Alexander
1f0c616974 [ticket/14821] Replace escaped strong tags with actual tags 
Everything else will still be escaped. This will however add back support for
bold text in exception messages.

PHPBB3-14821
 2016-10-14 22:47:43 +02:00
Marc Alexander
47b6e7edf4 Merge branch '3.2.x' 2016-10-12 21:44:07 +02: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
8f4ea4c495 Merge branch '3.2.x' 2016-10-10 21:39:21 +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
1100db7e86 [ticket/14807] Updates paragonie/random_compat 
PHPBB3-14807
 2016-10-09 22:03:50 +02:00
Marc Alexander
54ca672dde Merge branch '3.2.x' 2016-10-09 15:58:33 +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
d94c03d084 Merge branch '3.2.x' 
* 3.2.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:21:46 +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
Marc Alexander
40354f1f90 Merge pull request #27 from phpbb/ticket/security-196 
[ticket/security-196] Escapes the exception messages before displaying them
 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
10ae96c9b6 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14786] Add mcp_forum_actions_before/after events
 2016-10-02 18:13:13 +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
3375ce16eb Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters
 2016-10-02 18:08:26 +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
2602c2d29c Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14801] Highlighting utf8 strings in search results
 2016-10-02 17:44:59 +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
bd71c3d8e2 Merge branch '3.2.x' 
* 3.2.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:35 +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
Marc Alexander
c30a2b27a5 Merge branch '3.2.x' 2016-10-01 16:58:15 +01: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
89f3e5d29e Merge branch '3.2.x' 2016-10-01 11:07:46 +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
0b1d7cc53f Merge branch '3.2.x' 2016-09-30 21:49:41 +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
ab84605991 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14799] purge_notifications() should not leave open transactions.
 2016-09-28 20:58:39 +02: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
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